Title: [117153] branches/safari-536-branch/Source/WebCore
Diff
Modified: branches/safari-536-branch/Source/WebCore/ChangeLog (117152 => 117153)
--- branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:08:25 UTC (rev 117152)
+++ branches/safari-536-branch/Source/WebCore/ChangeLog 2012-05-15 21:10:13 UTC (rev 117153)
@@ -1,5 +1,22 @@
2012-05-15 Lucas Forschler <[email protected]>
+ Merge 116824
+
+ 2012-05-11 Anders Carlsson <[email protected]>
+
+ Can't scroll on webpage after following links from Blogger
+ https://bugs.webkit.org/show_bug.cgi?id=86274
+ <rdar://problem/11431352>
+
+ Reviewed by Beth Dakin.
+
+ When committing a new scroll layer, make sure to reset the scroll position.
+
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::commitNewTreeState):
+
+2012-05-15 Lucas Forschler <[email protected]>
+
Merge 116821
2012-05-10 Timothy Hatcher <[email protected]>
Modified: branches/safari-536-branch/Source/WebCore/page/scrolling/ScrollingTree.cpp (117152 => 117153)
--- branches/safari-536-branch/Source/WebCore/page/scrolling/ScrollingTree.cpp 2012-05-15 21:08:25 UTC (rev 117152)
+++ branches/safari-536-branch/Source/WebCore/page/scrolling/ScrollingTree.cpp 2012-05-15 21:10:13 UTC (rev 117153)
@@ -128,9 +128,11 @@
{
ASSERT(ScrollingThread::isCurrentThread());
- if (scrollingTreeState->changedProperties() & (ScrollingTreeState::WheelEventHandlerCount | ScrollingTreeState::NonFastScrollableRegion)) {
+ if (scrollingTreeState->changedProperties() & (ScrollingTreeState::WheelEventHandlerCount | ScrollingTreeState::NonFastScrollableRegion | ScrollingTreeState::ScrollLayer)) {
MutexLocker lock(m_mutex);
+ if (scrollingTreeState->changedProperties() & ScrollingTreeState::ScrollLayer)
+ m_mainFrameScrollPosition = IntPoint();
if (scrollingTreeState->changedProperties() & ScrollingTreeState::WheelEventHandlerCount)
m_hasWheelEventHandlers = scrollingTreeState->wheelEventHandlerCount();
if (scrollingTreeState->changedProperties() & ScrollingTreeState::NonFastScrollableRegion)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
