diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-06 15:09:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:34 +0100 |
| commit | 5784d8266fdc4ac16b990ac0c8e981ad5ee2c340 (patch) | |
| tree | 1c1122bfe9f62f8386c8e7f5a7716ee9226a9513 /WebCore/platform | |
| parent | 559e8b5e40d6fdd5897bbf576376f92a029a5828 (diff) | |
| download | external_webkit-5784d8266fdc4ac16b990ac0c8e981ad5ee2c340.zip external_webkit-5784d8266fdc4ac16b990ac0c8e981ad5ee2c340.tar.gz external_webkit-5784d8266fdc4ac16b990ac0c8e981ad5ee2c340.tar.bz2 | |
Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (setPlatformCompositeOperation)
Implement new setPlatformCompositeOperation method from
upstream.
See http://trac.webkit.org/changeset/73729
Change-Id: Ic87c3b8beec48c6b4c7bef5db61c6082f7e53639
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/GraphicsContextAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |