summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/rendering
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2011-12-12 11:48:30 -0800
committerMichael Kolb <kolby@google.com>2011-12-16 13:14:33 -0800
commit5b0a8b4c05b332cd6cac21d4dae8fac868f81ec8 (patch)
treed9cf8c9836ed160a3b223eaf1488544995222727 /Source/WebCore/rendering
parent84cfd72cfe2fecd8faea83ea3511f3ce343e7c02 (diff)
downloadexternal_webkit-5b0a8b4c05b332cd6cac21d4dae8fac868f81ec8.zip
external_webkit-5b0a8b4c05b332cd6cac21d4dae8fac868f81ec8.tar.gz
external_webkit-5b0a8b4c05b332cd6cac21d4dae8fac868f81ec8.tar.bz2
fix layer scrolling
Bug: 5774119 Add support for layer scrolling; also fixes the scrollTop demo referenced in bug: 5748199 Change-Id: Id04a3d52bb1e75e9ee24a4f1b8aa9b0334369ba1
Diffstat (limited to 'Source/WebCore/rendering')
-rw-r--r--Source/WebCore/rendering/RenderLayer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp
index cdc4c05..0932224 100644
--- a/Source/WebCore/rendering/RenderLayer.cpp
+++ b/Source/WebCore/rendering/RenderLayer.cpp
@@ -64,6 +64,7 @@
#include "HTMLNames.h"
#if ENABLE(ANDROID_OVERFLOW_SCROLL)
#include "HTMLTextAreaElement.h"
+#include "GraphicsLayerAndroid.h"
#endif
#include "HitTestRequest.h"
#include "HitTestResult.h"
@@ -1424,6 +1425,8 @@ void RenderLayer::scrollTo(int x, int y)
// do not need to repaint simply because we are scrolling
if (view && !hasOverflowScroll())
renderer()->repaintUsingContainer(repaintContainer, rectForRepaint);
+ if (view && hasOverflowScroll() && backing() && backing()->graphicsLayer())
+ static_cast<GraphicsLayerAndroid*>(backing()->graphicsLayer())->updateScrollOffset();
#else
if (view)
renderer()->repaintUsingContainer(repaintContainer, rectForRepaint);