Title: [165301] trunk/Source/WebCore
- Revision
- 165301
- Author
- [email protected]
- Date
- 2014-03-07 16:41:36 -0800 (Fri, 07 Mar 2014)
Log Message
Fix the regression introduced by r165288
https://bugs.webkit.org/show_bug.cgi?id=129934
Patch by Benjamin Poulain <[email protected]> on 2014-03-07
Reviewed by Ryosuke Niwa.
* page/DOMWindow.cpp:
(WebCore::DOMWindow::scrollX):
(WebCore::DOMWindow::scrollY):
We need to return the new value after layout, not the value from the dirty tree.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (165300 => 165301)
--- trunk/Source/WebCore/ChangeLog 2014-03-08 00:40:11 UTC (rev 165300)
+++ trunk/Source/WebCore/ChangeLog 2014-03-08 00:41:36 UTC (rev 165301)
@@ -1,3 +1,15 @@
+2014-03-07 Benjamin Poulain <[email protected]>
+
+ Fix the regression introduced by r165288
+ https://bugs.webkit.org/show_bug.cgi?id=129934
+
+ Reviewed by Ryosuke Niwa.
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::scrollX):
+ (WebCore::DOMWindow::scrollY):
+ We need to return the new value after layout, not the value from the dirty tree.
+
2014-03-07 Benjamin Poulain <[email protected]>
Traversal failure in a direct adjacent chain with tail backtracking lacks the path to clear the tail
Modified: trunk/Source/WebCore/page/DOMWindow.cpp (165300 => 165301)
--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-03-08 00:40:11 UTC (rev 165300)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-03-08 00:41:36 UTC (rev 165301)
@@ -1203,7 +1203,11 @@
m_frame->document()->updateLayoutIgnorePendingStylesheets();
- return view->mapFromLayoutToCSSUnits(scrollX);
+#if PLATFORM(IOS)
+ return view->mapFromLayoutToCSSUnits(view->actualScrollX());
+#else
+ return view->mapFromLayoutToCSSUnits(view->scrollX());
+#endif
}
int DOMWindow::scrollY() const
@@ -1226,7 +1230,11 @@
m_frame->document()->updateLayoutIgnorePendingStylesheets();
- return view->mapFromLayoutToCSSUnits(scrollY);
+#if PLATFORM(IOS)
+ return view->mapFromLayoutToCSSUnits(view->actualScrollY());
+#else
+ return view->mapFromLayoutToCSSUnits(view->scrollY());
+#endif
}
bool DOMWindow::closed() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
