summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-01-05 14:40:31 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-05 14:40:31 -0800
commitadb2294ad0d25b191c3cb387c30dcd00f3c5141d (patch)
tree1bbcf1f63df5e52e65d417309a5c10daad7876e7
parent2ad505c45c73f9d19131d6086a713c0fa5e2108a (diff)
parentd5fb0f1dd2265f0d472df761b1017ba891bc1951 (diff)
downloadexternal_webkit-adb2294ad0d25b191c3cb387c30dcd00f3c5141d.zip
external_webkit-adb2294ad0d25b191c3cb387c30dcd00f3c5141d.tar.gz
external_webkit-adb2294ad0d25b191c3cb387c30dcd00f3c5141d.tar.bz2
Merge "Fix off-by-border RTL initial scrolling."
-rw-r--r--Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 3369118..fc2eddd 100644
--- a/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -616,9 +616,8 @@ bool GraphicsLayerAndroid::repaint()
m_foregroundClipLayer->setSize(width, height);
int rtlOffset = 0; // LTR uses no offset.
- if (!layer->renderer()->style()->isLeftToRightDirection()) {
- rtlOffset = layer->scrollWidth() - clip.width(); // Scroll all the way right.
- }
+ if (!layer->renderer()->style()->isLeftToRightDirection())
+ rtlOffset = layer->scrollWidth() - width; // Scroll all the way right.
m_foregroundLayer->setScrollOffset(IntPoint(scroll.width() + rtlOffset,
scroll.height()));
// Need to offset the foreground layer by the clip layer in order