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

[Luboš Luňák (via logerrit)]

Rebased ref, commits from common ancestor:
commit 189959c0b09daa26298b70b3d4d22aced1d7b247
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Oct 22 12:01:31 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Oct 22 12:45:41 2019 +0200

    remove some obsolete Skia TODO's
    
    Change-Id: I11ec226a627e98552bd35753aa5a8fbcfca66186

diff --git a/vcl/inc/skia/win/gdiimpl.hxx b/vcl/inc/skia/win/gdiimpl.hxx
index 05cacb69d230..bc177337b3de 100644
--- a/vcl/inc/skia/win/gdiimpl.hxx
+++ b/vcl/inc/skia/win/gdiimpl.hxx
@@ -53,7 +53,6 @@ public:
 
     virtual void Init() override;
     virtual void DeInit() override;
-    virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override;
 
     virtual void freeResources() override;
 
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 8d5a61d32e83..dfe12f57db91 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -216,7 +216,6 @@ BitmapBuffer* SkiaSalBitmap::AcquireBuffer(BitmapAccessMode nMode)
             break;
         }
         case 32:
-            // TODO are these correct?
             buffer->mnFormat = mBitmap.colorType() == kRGBA_8888_SkColorType
                                    ? ScanlineFormat::N32BitTcRgba
                                    : ScanlineFormat::N32BitTcBgra;
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index 92af2fcad42f..9a41ffc7da27 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -19,13 +19,6 @@ WinSkiaSalGraphicsImpl::WinSkiaSalGraphicsImpl(WinSalGraphics& rGraphics,
 {
 }
 
-void WinSkiaSalGraphicsImpl::copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics)
-{
-    (void)rPosAry;
-    (void)pSrcGraphics;
-    // TODO
-}
-
 void WinSkiaSalGraphicsImpl::Init()
 {
 #if 0 // TODO
diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx
index 36dc8d5ecf13..d1eee613501f 100644
--- a/vcl/skia/x11/gdiimpl.cxx
+++ b/vcl/skia/x11/gdiimpl.cxx
@@ -18,10 +18,6 @@
 
 #include <skia/x11/gdiimpl.hxx>
 
-// TODO
-#define SK_ASSUME_GL 1
-#define SK_ASSUME_GL_ES 0
-
 #include <tools/sk_app/unix/WindowContextFactory_unix.h>
 #include <tools/sk_app/WindowContext.h>