From: achristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon, 19 Oct 2015 18:50:26 +0000 (+0000)
Subject: Unreviewed build fix after r191295.
X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=2d2d6ca7464c3b373233d5b882d7b984c393ffb7

Unreviewed build fix after r191295.

* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::translatePlatformCTM):
(WebCore::GraphicsContext::setPlatformFillColor):
(WebCore::GraphicsContext::concatPlatformCTM):
(WebCore::GraphicsContext::setPlatformCTM):
(WebCore::GraphicsContext::setPlatformShadow):
(WebCore::GraphicsContext::rotatePlatformCTM):
(WebCore::GraphicsContext::scalePlatformCTM):
(WebCore::GraphicsContext::clipOut):
* platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
(WebCore::GraphicsContextPlatformPrivate::save):
(WebCore::GraphicsContextPlatformPrivate::restore):
(WebCore::GraphicsContextPlatformPrivate::flush):
(WebCore::GraphicsContextPlatformPrivate::clip):
(WebCore::GraphicsContextPlatformPrivate::scalePlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::rotatePlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::translatePlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::concatPlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::setPlatformCTM):
(WebCore::GraphicsContextPlatformPrivate::syncContext):
(WebCore::GraphicsContextPlatformPrivate::scale): Deleted.
(WebCore::GraphicsContextPlatformPrivate::rotate): Deleted.
(WebCore::GraphicsContextPlatformPrivate::translate): Deleted.
(WebCore::GraphicsContextPlatformPrivate::concatCTM): Deleted.
(WebCore::GraphicsContextPlatformPrivate::setCTM): Deleted.



git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191301 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8e843e8..0db5a8b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,33 @@
+2015-10-19  Alex Christensen  <achristensen@webkit.org>
+
+        Unreviewed build fix after r191295.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::translatePlatformCTM):
+        (WebCore::GraphicsContext::setPlatformFillColor):
+        (WebCore::GraphicsContext::concatPlatformCTM):
+        (WebCore::GraphicsContext::setPlatformCTM):
+        (WebCore::GraphicsContext::setPlatformShadow):
+        (WebCore::GraphicsContext::rotatePlatformCTM):
+        (WebCore::GraphicsContext::scalePlatformCTM):
+        (WebCore::GraphicsContext::clipOut):
+        * platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h:
+        (WebCore::GraphicsContextPlatformPrivate::save):
+        (WebCore::GraphicsContextPlatformPrivate::restore):
+        (WebCore::GraphicsContextPlatformPrivate::flush):
+        (WebCore::GraphicsContextPlatformPrivate::clip):
+        (WebCore::GraphicsContextPlatformPrivate::scalePlatformCTM):
+        (WebCore::GraphicsContextPlatformPrivate::rotatePlatformCTM):
+        (WebCore::GraphicsContextPlatformPrivate::translatePlatformCTM):
+        (WebCore::GraphicsContextPlatformPrivate::concatPlatformCTM):
+        (WebCore::GraphicsContextPlatformPrivate::setPlatformCTM):
+        (WebCore::GraphicsContextPlatformPrivate::syncContext):
+        (WebCore::GraphicsContextPlatformPrivate::scale): Deleted.
+        (WebCore::GraphicsContextPlatformPrivate::rotate): Deleted.
+        (WebCore::GraphicsContextPlatformPrivate::translate): Deleted.
+        (WebCore::GraphicsContextPlatformPrivate::concatCTM): Deleted.
+        (WebCore::GraphicsContextPlatformPrivate::setCTM): Deleted.
+
 2015-10-19  Tim Horton  <timothy_horton@apple.com>
 
         Add magnify and rotate gesture event support for Mac
diff --git a/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp b/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
index ca99e55..bc842f9 100644
--- a/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
+++ b/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp
@@ -726,7 +726,7 @@ void GraphicsContext::translatePlatformCTM(float x, float y)
 
     cairo_t* cr = platformContext()->cr();
     cairo_translate(cr, x, y);
-    m_data->translate(x, y);
+    m_data->translatePlatformCTM(x, y);
 }
 
 void GraphicsContext::setPlatformFillColor(const Color&, ColorSpace)
@@ -789,7 +789,7 @@ void GraphicsContext::concatPlatformCTM(const AffineTransform& transform)
     cairo_t* cr = platformContext()->cr();
     const cairo_matrix_t matrix = cairo_matrix_t(transform);
     cairo_transform(cr, &matrix);
-    m_data->concatCTM(transform);
+    m_data->concatPlatformCTM(transform);
 }
 
 void GraphicsContext::setPlatformCTM(const AffineTransform& transform)
@@ -800,7 +800,7 @@ void GraphicsContext::setPlatformCTM(const AffineTransform& transform)
     cairo_t* cr = platformContext()->cr();
     const cairo_matrix_t matrix = cairo_matrix_t(transform);
     cairo_set_matrix(cr, &matrix);
-    m_data->setCTM(transform);
+    m_data->setPlatformCTM(transform);
 }
 
 void GraphicsContext::setPlatformShadow(FloatSize const& size, float, Color const&, ColorSpace)
@@ -1017,7 +1017,7 @@ void GraphicsContext::rotatePlatformCTM(float radians)
         return;
 
     cairo_rotate(platformContext()->cr(), radians);
-    m_data->rotate(radians);
+    m_data->rotatePlatformCTM(radians);
 }
 
 void GraphicsContext::scalePlatformCTM(float x, float y)
@@ -1026,7 +1026,7 @@ void GraphicsContext::scalePlatformCTM(float x, float y)
         return;
 
     cairo_scale(platformContext()->cr(), x, y);
-    m_data->scale(FloatSize(x, y));
+    m_data->scalePlatformCTM(x, y);
 }
 
 void GraphicsContext::clipOut(const FloatRect& r)
diff --git a/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h b/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
index b2d25d6..38cdeb3 100644
--- a/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
+++ b/Source/WebCore/platform/graphics/cairo/GraphicsContextPlatformPrivateCairo.h
@@ -67,24 +67,24 @@ public:
     void flush();
     void clip(const FloatRect&);
     void clip(const Path&);
-    void scale(const FloatSize&);
-    void rotate(float);
-    void translate(float, float);
-    void concatCTM(const AffineTransform&);
-    void setCTM(const AffineTransform&);
+    void scalePlatformCTM(float, float);
+    void rotatePlatformCTM(float);
+    void translatePlatformCTM(float, float);
+    void concatPlatformCTM(const AffineTransform&);
+    void setPlatformCTM(const AffineTransform&);
     void syncContext(cairo_t* cr);
 #else
     // On everything else, we do nothing.
-    void save() {}
-    void restore() {}
-    void flush() {}
-    void clip(const FloatRect&) {}
-    void clip(const Path&) {}
-    void scale(const FloatSize&) {}
-    void rotate(float) {}
-    void translate(float, float) {}
-    void concatCTM(const AffineTransform&) {}
-    void setCTM(const AffineTransform&) {}
+    void save() { }
+    void restore() { }
+    void flush() { }
+    void clip(const FloatRect&) { }
+    void clip(const Path&) { }
+    void scalePlatformCTM(float, float) { }
+    void rotatePlatformCTM(float) { }
+    void translatePlatformCTM(float, float) { }
+    void concatPlatformCTM(const AffineTransform&) { }
+    void setPlatformCTM(const AffineTransform&) { }
     void syncContext(cairo_t*) { }
 #endif