diff options
| author | Michael Kolb <kolby@google.com> | 2012-01-13 15:25:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-13 15:25:24 -0800 |
| commit | 8c55905e1c130fb07d5f04421239a6bdb0184c04 (patch) | |
| tree | c38edd501e9ed418d43c025ef6f51ac0581976c4 | |
| parent | 124446075161928aaa2ce278592c5f8f0616b238 (diff) | |
| parent | 214a577b46bd12110c42f4a88dd087cfbaa4fd38 (diff) | |
| download | external_webkit-8c55905e1c130fb07d5f04421239a6bdb0184c04.zip external_webkit-8c55905e1c130fb07d5f04421239a6bdb0184c04.tar.gz external_webkit-8c55905e1c130fb07d5f04421239a6bdb0184c04.tar.bz2 | |
Merge "fix jumpy scrolling on layers"
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp index fc2eddd..779eb36 100644 --- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp @@ -588,8 +588,10 @@ bool GraphicsLayerAndroid::repaint() RenderBox* box = layer->renderBox(); int outline = box->view()->maximalOutlineSize(); IntRect contentsRect(0, 0, - box->borderLeft() + box->borderRight() + layer->scrollWidth(), - box->borderTop() + box->borderBottom() + layer->scrollHeight()); + box->borderLeft() + box->borderRight() + layer->scrollWidth() + + layer->verticalScrollbarWidth(), + box->borderTop() + box->borderBottom() + layer->scrollHeight() + + layer->horizontalScrollbarHeight()); contentsRect.inflate(outline); // Update the foreground layer size. m_foregroundLayer->setSize(contentsRect.width(), contentsRect.height()); |