Title: [156335] branches/safari-537.60-branch/Source/WebCore
- Revision
- 156335
- Author
- [email protected]
- Date
- 2013-09-24 09:22:56 -0700 (Tue, 24 Sep 2013)
Log Message
Merge patch for <rdar://problem/15056974>. Build fix after r156221.
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (156334 => 156335)
--- branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-09-24 16:20:20 UTC (rev 156334)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-09-24 16:22:56 UTC (rev 156335)
@@ -1,3 +1,10 @@
+2013-09-24 Roger Fong <[email protected]>
+
+ Unreviewed. Build fix for Windows following r156221.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollByRecursively):
+
2013-09-23 Lucas Forschler <[email protected]>
Merge r156223
Modified: branches/safari-537.60-branch/Source/WebCore/rendering/RenderLayer.cpp (156334 => 156335)
--- branches/safari-537.60-branch/Source/WebCore/rendering/RenderLayer.cpp 2013-09-24 16:20:20 UTC (rev 156334)
+++ branches/safari-537.60-branch/Source/WebCore/rendering/RenderLayer.cpp 2013-09-24 16:22:56 UTC (rev 156335)
@@ -2140,7 +2140,7 @@
IntSize newScrollOffset = scrollOffset() + delta;
scrollToOffset(newScrollOffset, clamp);
if (scrolledView)
- *scrolledView = &renderer().view().frameView();
+ *scrolledView = &renderer()->view()->frameView();
// If this layer can't do the scroll we ask the next layer up that can scroll to try
IntSize remainingScrollOffset = newScrollOffset - scrollOffset();
@@ -2157,7 +2157,7 @@
// have an overflow clip. Which means that it is a document node that can be scrolled.
renderer()->view()->frameView()->scrollBy(delta);
if (scrolledView)
- *scrolledView = &renderer().view().frameView();
+ *scrolledView = &renderer()->view()->frameView();
// FIXME: If we didn't scroll the whole way, do we want to try looking at the frames ownerElement?
// https://bugs.webkit.org/show_bug.cgi?id=28237
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
