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

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

 vcl/qa/cppunit/BackendTest.cxx |    4 ++--
 vcl/skia/gdiimpl.cxx           |   10 +---------
 2 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 3b108e2856bb9f1ef7c9bffa9981da80033eebe0
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Oct 30 12:21:25 2019 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Wed Oct 30 12:21:25 2019 +0100

    fix SkiaSalGraphicsImpl::drawPixel()
    
    Change-Id: I2fa0853ba2593583a479747460f77f2ced67fd6a

diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index db75583a981f..50e3981cc591 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -379,7 +379,7 @@ public:
 
     CPPUNIT_TEST_SUITE(BackendTest);
     CPPUNIT_TEST(testDrawRectWithRectangle);
-    //    CPPUNIT_TEST(testDrawRectWithPixel); TODO SKIA
+    CPPUNIT_TEST(testDrawRectWithPixel);
     CPPUNIT_TEST(testDrawRectWithLine);
     CPPUNIT_TEST(testDrawRectWithPolygon);
     CPPUNIT_TEST(testDrawRectWithPolyLine);
@@ -388,7 +388,7 @@ public:
     CPPUNIT_TEST(testDrawRectWithPolyPolygonB2D);
 
     CPPUNIT_TEST(testDrawRectAAWithRectangle);
-    //    CPPUNIT_TEST(testDrawRectAAWithPixel); TODO SKIA
+    CPPUNIT_TEST(testDrawRectAAWithPixel);
     CPPUNIT_TEST(testDrawRectAAWithLine);
     CPPUNIT_TEST(testDrawRectAAWithPolygon);
     CPPUNIT_TEST(testDrawRectAAWithPolyLine);
diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx
index a90b40bd9e09..8f1447c0d9ac 100644
--- a/vcl/skia/gdiimpl.cxx
+++ b/vcl/skia/gdiimpl.cxx
@@ -337,15 +337,7 @@ void SkiaSalGraphicsImpl::SetROPLineColor(SalROPColor nROPColor) { (void)nROPCol
 
 void SkiaSalGraphicsImpl::SetROPFillColor(SalROPColor nROPColor) { (void)nROPColor; }
 
-void SkiaSalGraphicsImpl::drawPixel(long nX, long nY)
-{
-    if (mLineColor == SALCOLOR_NONE)
-        return;
-    preDraw();
-    SkCanvas* canvas = mSurface->getCanvas();
-    canvas->drawPoint(nX, nY, SkPaint());
-    postDraw();
-}
+void SkiaSalGraphicsImpl::drawPixel(long nX, long nY) { drawPixel(nX, nY, mLineColor); }
 
 void SkiaSalGraphicsImpl::drawPixel(long nX, long nY, Color nColor)
 {