[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/quartz

[Tor Lillqvist (via logerrit)]

 vcl/quartz/salgdicommon.cxx |   15 ---------------
 1 file changed, 15 deletions(-)

New commits:
commit f5cc065bd485842b2e967be452611283b3b03a04
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 15 18:32:50 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 23 09:43:28 2019 +0200

    tdf#124042: Remove unnecessary code for iOS
    
    We don't need to pop the Core Graphics context state stack completely
    before releasing the context. The code that tried to do that failed
    anyway when the context was a "foreign" one (from doc_paintWindowDPI()
    in core's init.cxx) thad had already been released there.
    
    Also removed another apparently unnecessary ifndef for iOS.
    
    Reviewed-on: https://gerrit.libreoffice.org/76263
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 8d5164463a77f7957c26bc922689f45b394a2cf6)
    
    Change-Id: Idcd1e6edd06ab259ec850fd66fcbabc3df0ae3af
    Reviewed-on: https://gerrit.libreoffice.org/77081
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 30ff4a8a7ea6..e43e75caad2e 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -2077,26 +2077,11 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContex
     mbPrinter = false;
     mbVirDev = true;
 
-#ifdef IOS
-    (void) nBitmapDepth;
-
-    if( !xContext )
-    {
-        // We will return early a few lines lower.
-        // Undo the "stack initialization" done at the initial call of
-        // this method, see end.
-        SAL_INFO( "vcl.cg", "CGContextRestoreGState(" << mrContext << ") " << mnContextStackDepth--);
-        CGContextRestoreGState( mrContext );
-    }
-#endif
-
     // set graphics properties
     mxLayer = xLayer;
     mrContext = xContext;
 
-#ifndef IOS
     mnBitmapDepth = nBitmapDepth;
-#endif
 
 #ifdef IOS
     mbForeignContext = xContext != NULL;