From 332faf48295b89d410548a80c30979a9641491d1 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Wed, 11 Apr 2012 16:07:20 -0700 Subject: Fix ImageTexture drawing in software path bug:6317028 Change-Id: Ibec896f64371c29a25aaae2490a4e5cf97b5b54a --- Source/WebCore/platform/graphics/android/layers/LayerAndroid.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/platform/graphics/android/layers') 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... -- cgit v1.1