[Libreoffice-commits] core.git: vcl/quartz

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Wed Dec 30 13:10:16 UTC 2020


 vcl/quartz/salvd.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2e42a85fe0d7a1a7d0a1778f1a6d3625fc3c9d79
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Dec 30 15:08:20 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Dec 30 15:09:02 2020 +0200

    tdf#138122: Add comment wondering what the code does
    
    Change-Id: I0caea1297404e7970571085cc787ff23e614e500

diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 6462a51573ce..1e6e5b2536d0 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -295,6 +295,11 @@ bool AquaSalVirtualDevice::SetSize( tools::Long nDX, tools::Long nDY )
     {
         // get the matching Quartz context
         CGContextRef xDrawContext = CGLayerGetContext( maLayer.get() );
+
+        // Here we pass the CGLayerRef that the CGLayerHolder maLayer holds as the first parameter
+        // to SetVirDevGraphics(). That parameter is of type CGLayerHolder, so what we actually pass
+        // is an implicitly constructed *separate* CGLayerHolder. Is that what we want? No idea.
+        // Possibly we could pass just maLayer as such? But doing that does not fix tdf#138122.
         mpGraphics->SetVirDevGraphics(maLayer.get(), xDrawContext, mnBitmapDepth);
     }
 


More information about the Libreoffice-commits mailing list