Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp

Update our platform GraphicsContext after upstream refactoring.

See http://trac.webkit.org/changeset/73492
See http://trac.webkit.org/changeset/73728

Change-Id: I1d5ea12a57e7b96a90c1df250c716647bc4e0f26

1 files changed, 9 insertions, 12 deletions

diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index c5da517..429c2f1 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -27,7 +27,6 @@
 
 #include "AffineTransform.h"
 #include "Gradient.h"
-#include "GraphicsContextPrivate.h"
 #include "NotImplemented.h"
 #include "Path.h"
 #include "Pattern.h"
@@ -502,17 +501,15 @@ GraphicsContext* GraphicsContext::createOffscreenContext(int width, int height)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
-GraphicsContext::GraphicsContext(PlatformGraphicsContext* gc)
-    : m_common(createGraphicsContextPrivate())
-    , m_data(new GraphicsContextPlatformPrivate(this, gc))
+void GraphicsContext::platformInit(PlatformGraphicsContext* gc)
 {
+    m_data = new GraphicsContextPlatformPrivate(this, gc);
     setPaintingDisabled(!gc || !gc->mCanvas);
 }
 
-GraphicsContext::~GraphicsContext()
+void GraphicsContext::platformDestroy()
 {
     delete m_data;
-    this->destroyGraphicsContextPrivate(m_common);
 }
 
 void GraphicsContext::savePlatformState()
@@ -813,8 +810,8 @@ void GraphicsContext::fillRect(const FloatRect& rect)
     m_data->setupPaintFill(&paint);
 
     extactShader(&paint,
-                 m_common->state.fillPattern.get(),
-                 m_common->state.fillGradient.get());
+                 m_state.fillPattern.get(),
+                 m_state.fillGradient.get());
 
     GC2CANVAS(this)->drawRect(rect, paint);
 }
@@ -1258,8 +1255,8 @@ void GraphicsContext::fillPath()
     m_data->setupPaintFill(&paint);
 
     extactShader(&paint,
-                 m_common->state.fillPattern.get(),
-                 m_common->state.fillGradient.get());
+                 m_state.fillPattern.get(),
+                 m_state.fillGradient.get());
 
     GC2CANVAS(this)->drawPath(*path, paint);
 }
@@ -1274,8 +1271,8 @@ void GraphicsContext::strokePath()
     m_data->setupPaintStroke(&paint, 0);
 
     extactShader(&paint,
-                 m_common->state.strokePattern.get(),
-                 m_common->state.strokeGradient.get());
+                 m_state.strokePattern.get(),
+                 m_state.strokeGradient.get());
 
     GC2CANVAS(this)->drawPath(*path, paint);
 }