[Libreoffice-commits] core.git: Branch 'feature/skia' - vcl/skia

Tomaž Vajngerl (via logerrit) logerrit at kemper.freedesktop.org
Mon Oct 14 12:30:05 UTC 2019


 vcl/skia/gdiimpl.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f307e9cf24489de160b3e599365aff6dd1bab217
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Mon Oct 14 14:26:49 2019 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Mon Oct 14 14:26:49 2019 +0200

    fix warning
    
    Change-Id: I6f0f278bae75bb5e0cd49523b4ce6c4918092412
    warning: declaration of ‘graphics’ shadows a member of ‘SkiaFlushIdle’ [-Wshadow]

diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index c9936d675d66..246826b5f124 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -35,12 +35,12 @@
 // Class that triggers flushing the backing buffer when idle.
 class SkiaFlushIdle : public Idle
 {
-    SkiaSalGraphicsImpl* graphics;
+    SkiaSalGraphicsImpl* mpGraphics;
 
 public:
-    explicit SkiaFlushIdle(SkiaSalGraphicsImpl* graphics)
+    explicit SkiaFlushIdle(SkiaSalGraphicsImpl* pGraphics)
         : Idle("skia idle swap")
-        , graphics(graphics)
+        , mpGraphics(pGraphics)
     {
         // We don't want to be swapping before we've painted.
         SetPriority(TaskPriority::POST_PAINT);
@@ -48,7 +48,7 @@ public:
 
     virtual void Invoke() override
     {
-        graphics->performFlush();
+        mpGraphics->performFlush();
         Stop();
         SetPriority(TaskPriority::HIGHEST);
     }


More information about the Libreoffice-commits mailing list