diff options
| author | Chris Craik <ccraik@google.com> | 2012-04-12 09:46:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 09:46:42 -0700 |
| commit | 2c76a5a518095a481c7e028570087128b13f0c49 (patch) | |
| tree | 45ff0909d1666aa520467bb883c9beb942653fd6 /Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp | |
| parent | 615ac999e6dcab2b8ea3acd117c3ef6914e0e71b (diff) | |
| parent | 332faf48295b89d410548a80c30979a9641491d1 (diff) | |
| download | external_webkit-2c76a5a518095a481c7e028570087128b13f0c49.zip external_webkit-2c76a5a518095a481c7e028570087128b13f0c49.tar.gz external_webkit-2c76a5a518095a481c7e028570087128b13f0c49.tar.bz2 | |
Merge "Fix ImageTexture drawing in software path"
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 81427b8..a02759d 100644 --- a/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp @@ -884,7 +884,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... |