From 5784d8266fdc4ac16b990ac0c8e981ad5ee2c340 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 6 May 2011 15:09:25 +0100 Subject: Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (setPlatformCompositeOperation) Implement new setPlatformCompositeOperation method from upstream. See http://trac.webkit.org/changeset/73729 Change-Id: Ic87c3b8beec48c6b4c7bef5db61c6082f7e53639 --- WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'WebCore/platform/graphics/android/GraphicsContextAndroid.cpp') diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp index 3744796..888be5b 100644 --- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp +++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp @@ -1050,7 +1050,7 @@ void GraphicsContext::setAlpha(float alpha) m_data->getState()->alpha = alpha; } -void GraphicsContext::setCompositeOperation(CompositeOperator op) +void GraphicsContext::setPlatformCompositeOperation(CompositeOperator op) { m_data->getState()->mode = WebCoreCompositeToSkiaComposite(op); } -- cgit v1.1