diff options
| author | John Reck <jreck@google.com> | 2012-05-03 13:40:56 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-05-03 13:40:56 -0700 |
| commit | 24aa26c6339dd710d9349515a5a413fd4fe986f2 (patch) | |
| tree | b312e5bbb8e9339ff20611dc17570885f58eb340 | |
| parent | e859a34171f2a36877d95197d118d962078f8aa0 (diff) | |
| download | external_webkit-24aa26c6339dd710d9349515a5a413fd4fe986f2.zip external_webkit-24aa26c6339dd710d9349515a5a413fd4fe986f2.tar.gz external_webkit-24aa26c6339dd710d9349515a5a413fd4fe986f2.tar.bz2 | |
Respect clipping for CanvasLayer
Bug: 6422177
Change-Id: I04bb713bd217f1c8776b2aa46f329ef413b7d36b
| -rw-r--r-- | Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp b/Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp index 1813903..b563609 100644 --- a/Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp +++ b/Source/WebCore/platform/graphics/android/layers/CanvasLayer.cpp @@ -178,13 +178,13 @@ IntSize CanvasLayer::offsetFromRenderer() const bool CanvasLayer::needsTexture() { - return m_bitmap || LayerAndroid::needsTexture(); + return (m_bitmap && !masksToBounds()) || LayerAndroid::needsTexture(); } void CanvasLayer::contentDraw(SkCanvas* canvas, PaintStyle style) { LayerAndroid::contentDraw(canvas, style); - if (!m_bitmap) + if (!m_bitmap || masksToBounds()) return; SkBitmap& bitmap = m_bitmap->bitmap(); SkRect dst = SkRect::MakeXYWH(m_contentRect.x() - m_offsetFromRenderer.width(), |