summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2012-08-10 10:39:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-10 10:39:59 -0700
commita04b9dccdbde1cd374c69fd51cf7c3d10fb54d51 (patch)
tree81410100a94d609b12fcd90b722c9514580aba77 /Source
parentfae34be5c51ed83fa7eecd9026263c949fed2078 (diff)
parent3417c786a7a3f3231796bbab9ccce4c66535d142 (diff)
downloadexternal_webkit-a04b9dccdbde1cd374c69fd51cf7c3d10fb54d51.zip
external_webkit-a04b9dccdbde1cd374c69fd51cf7c3d10fb54d51.tar.gz
external_webkit-a04b9dccdbde1cd374c69fd51cf7c3d10fb54d51.tar.bz2
Merge "Paint with requested size instead of layer size" into jb-mr1-dev
Diffstat (limited to 'Source')
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 25441f4..7f4352b 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -847,7 +847,7 @@ bool GraphicsLayerAndroid::paintContext(LayerAndroid* layer,
// we can't do that because of transparency -- for now, we just create
// a new picture every time.
WebCore::PicturePile picture;
- picture.setSize(IntSize(m_size.width(), m_size.height()));
+ picture.setSize(IntSize(rect.width(), rect.height()));
// TODO: add content checks (text, opacity, etc.)
picture.updatePicturesIfNeeded(this);