diff options
| author | Chris Craik <ccraik@google.com> | 2012-04-11 16:07:20 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2012-04-11 16:50:09 -0700 |
| commit | 332faf48295b89d410548a80c30979a9641491d1 (patch) | |
| tree | 977e6e625da76290065f7d71188c70dba6aadd3f /Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp | |
| parent | 5d119b85382480f33eefb397ef6b34a4331671b9 (diff) | |
| download | external_webkit-332faf48295b89d410548a80c30979a9641491d1.zip external_webkit-332faf48295b89d410548a80c30979a9641491d1.tar.gz external_webkit-332faf48295b89d410548a80c30979a9641491d1.tar.bz2 | |
Fix ImageTexture drawing in software path
bug:6317028
Change-Id: Ibec896f64371c29a25aaae2490a4e5cf97b5b54a
Diffstat (limited to 'Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp index df3fa42..55a43e7 100644 --- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp @@ -930,7 +930,8 @@ void LayerAndroid::onDraw(SkCanvas* canvas, SkScalar opacity, return; } - if (masksToBounds() || !m_content) + // only continue drawing if layer is drawable + if (!m_content && !m_imageCRC) return; // we just have this save/restore for opacity... |