<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[182132] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/182132">182132</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-29 21:13:45 -0700 (Sun, 29 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert arguments to ScrollingCoordinator functions to references
https://bugs.webkit.org/show_bug.cgi?id=143198
Reviewed by Darin Adler.
Convert all the FrameView* and ScrollableArea* arguments to ScrollingCoordinator functions to
references, and use references in a few other places.
Source/WebCore:
* dom/Document.cpp:
(WebCore::wheelEventHandlerCountChanged):
* loader/HistoryController.cpp:
(WebCore::HistoryController::restoreScrollPositionAndViewState):
* page/DebugPageOverlays.cpp:
(WebCore::NonFastScrollableRegionOverlay::updateRegion):
* page/Frame.cpp:
(WebCore::Frame::willDetachPage):
* page/FrameView.cpp:
(WebCore::FrameView::prepareForDetach):
(WebCore::FrameView::addSlowRepaintObject):
(WebCore::FrameView::removeSlowRepaintObject):
(WebCore::FrameView::addViewportConstrainedObject):
(WebCore::FrameView::removeViewportConstrainedObject):
(WebCore::FrameView::requestScrollPositionUpdate):
(WebCore::FrameView::performPostLayoutTasks):
(WebCore::FrameView::scrollableAreaSetChanged):
(WebCore::FrameView::wheelEvent):
* page/Page.cpp:
(WebCore::Page::nonFastScrollableRects):
* page/Page.h:
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
(WebCore::AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged):
(WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):
(WebCore::AsyncScrollingCoordinator::requestScrollPositionUpdate):
(WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
(WebCore::AsyncScrollingCoordinator::scrollableAreaScrollbarLayerDidChange):
(WebCore::AsyncScrollingCoordinator::ensureRootStateNodeForFrameView):
(WebCore::AsyncScrollingCoordinator::updateMainFrameScrollLayerPosition):
(WebCore::AsyncScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView):
* page/scrolling/AsyncScrollingCoordinator.h:
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::pageDestroyed):
(WebCore::ScrollingCoordinator::coordinatesScrollingForFrameView):
(WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
(WebCore::ScrollingCoordinator::frameViewWheelEventHandlerCountChanged):
(WebCore::ScrollingCoordinator::frameViewHasSlowRepaintObjectsDidChange):
(WebCore::ScrollingCoordinator::frameViewFixedObjectsDidChange):
(WebCore::ScrollingCoordinator::scrollLayerForScrollableArea):
(WebCore::ScrollingCoordinator::scrollLayerForFrameView):
(WebCore::ScrollingCoordinator::headerLayerForFrameView):
(WebCore::ScrollingCoordinator::footerLayerForFrameView):
(WebCore::ScrollingCoordinator::counterScrollingLayerForFrameView):
(WebCore::ScrollingCoordinator::insetClipLayerForFrameView):
(WebCore::ScrollingCoordinator::contentShadowLayerForFrameView):
(WebCore::ScrollingCoordinator::rootContentLayerForFrameView):
(WebCore::ScrollingCoordinator::frameViewRootLayerDidChange):
(WebCore::ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects):
(WebCore::ScrollingCoordinator::synchronousScrollingReasons):
(WebCore::ScrollingCoordinator::updateSynchronousScrollingReasons):
(WebCore::ScrollingCoordinator::setForceSynchronousScrollLayerPositionUpdates):
(WebCore::ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously):
(WebCore::ScrollingCoordinator::replaySessionStateDidChange):
(WebCore::ScrollingCoordinator::synchronousScrollingReasonsAsText):
* page/scrolling/ScrollingCoordinator.h: Align the bitmask enums to make mistakes easier to spot.
(WebCore::ScrollingCoordinator::frameViewLayoutUpdated):
(WebCore::ScrollingCoordinator::frameViewNonFastScrollableRegionChanged):
(WebCore::ScrollingCoordinator::requestScrollPositionUpdate):
(WebCore::ScrollingCoordinator::handleWheelEvent):
(WebCore::ScrollingCoordinator::willDestroyScrollableArea):
(WebCore::ScrollingCoordinator::scrollableAreaScrollLayerDidChange):
(WebCore::ScrollingCoordinator::scrollableAreaScrollbarLayerDidChange):
(WebCore::ScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView):
* page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
(WebCore::ScrollingCoordinatorCoordinatedGraphics::scrollableAreaScrollLayerDidChange):
(WebCore::ScrollingCoordinatorCoordinatedGraphics::willDestroyScrollableArea):
(WebCore::ScrollingCoordinatorCoordinatedGraphics::requestScrollPositionUpdate):
* page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.h:
* page/scrolling/mac/ScrollingCoordinatorMac.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::handleWheelEvent):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::~RenderLayer):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateOverflowControlsLayers):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateBacking):
(WebCore::RenderLayerCompositor::hasCoordinatedScrolling):
(WebCore::RenderLayerCompositor::scrollingLayerDidChange):
(WebCore::RenderLayerCompositor::updateLayerForHeader):
(WebCore::RenderLayerCompositor::updateLayerForFooter):
(WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
(WebCore::RenderLayerCompositor::destroyRootLayer):
(WebCore::RenderLayerCompositor::updateScrollCoordinationForThisFrame):
(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):
(WebCore::RenderLayerCompositor::willRemoveScrollingLayerWithBacking):
(WebCore::RenderLayerCompositor::didAddScrollingLayer):
* testing/Internals.cpp:
(WebCore::Internals::nonFastScrollableRects):
Source/WebKit2:
* WebProcess/Scrolling/RemoteScrollingCoordinator.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
(WebKit::RemoteScrollingCoordinator::coordinatesScrollingForFrameView):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderHistoryControllercpp">trunk/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDebugPageOverlayscpp">trunk/Source/WebCore/page/DebugPageOverlays.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicscpp">trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicsh">trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatorh">trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm">trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/ChangeLog 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -1,3 +1,105 @@
</span><ins>+2015-03-29 Simon Fraser <simon.fraser@apple.com>
+
+ Convert arguments to ScrollingCoordinator functions to references
+ https://bugs.webkit.org/show_bug.cgi?id=143198
+
+ Reviewed by Darin Adler.
+
+ Convert all the FrameView* and ScrollableArea* arguments to ScrollingCoordinator functions to
+ references, and use references in a few other places.
+
+ * dom/Document.cpp:
+ (WebCore::wheelEventHandlerCountChanged):
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::restoreScrollPositionAndViewState):
+ * page/DebugPageOverlays.cpp:
+ (WebCore::NonFastScrollableRegionOverlay::updateRegion):
+ * page/Frame.cpp:
+ (WebCore::Frame::willDetachPage):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::prepareForDetach):
+ (WebCore::FrameView::addSlowRepaintObject):
+ (WebCore::FrameView::removeSlowRepaintObject):
+ (WebCore::FrameView::addViewportConstrainedObject):
+ (WebCore::FrameView::removeViewportConstrainedObject):
+ (WebCore::FrameView::requestScrollPositionUpdate):
+ (WebCore::FrameView::performPostLayoutTasks):
+ (WebCore::FrameView::scrollableAreaSetChanged):
+ (WebCore::FrameView::wheelEvent):
+ * page/Page.cpp:
+ (WebCore::Page::nonFastScrollableRects):
+ * page/Page.h:
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
+ (WebCore::AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged):
+ (WebCore::AsyncScrollingCoordinator::frameViewRootLayerDidChange):
+ (WebCore::AsyncScrollingCoordinator::requestScrollPositionUpdate):
+ (WebCore::AsyncScrollingCoordinator::updateScrollPositionAfterAsyncScroll):
+ (WebCore::AsyncScrollingCoordinator::scrollableAreaScrollbarLayerDidChange):
+ (WebCore::AsyncScrollingCoordinator::ensureRootStateNodeForFrameView):
+ (WebCore::AsyncScrollingCoordinator::updateMainFrameScrollLayerPosition):
+ (WebCore::AsyncScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView):
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::pageDestroyed):
+ (WebCore::ScrollingCoordinator::coordinatesScrollingForFrameView):
+ (WebCore::ScrollingCoordinator::computeNonFastScrollableRegion):
+ (WebCore::ScrollingCoordinator::frameViewWheelEventHandlerCountChanged):
+ (WebCore::ScrollingCoordinator::frameViewHasSlowRepaintObjectsDidChange):
+ (WebCore::ScrollingCoordinator::frameViewFixedObjectsDidChange):
+ (WebCore::ScrollingCoordinator::scrollLayerForScrollableArea):
+ (WebCore::ScrollingCoordinator::scrollLayerForFrameView):
+ (WebCore::ScrollingCoordinator::headerLayerForFrameView):
+ (WebCore::ScrollingCoordinator::footerLayerForFrameView):
+ (WebCore::ScrollingCoordinator::counterScrollingLayerForFrameView):
+ (WebCore::ScrollingCoordinator::insetClipLayerForFrameView):
+ (WebCore::ScrollingCoordinator::contentShadowLayerForFrameView):
+ (WebCore::ScrollingCoordinator::rootContentLayerForFrameView):
+ (WebCore::ScrollingCoordinator::frameViewRootLayerDidChange):
+ (WebCore::ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects):
+ (WebCore::ScrollingCoordinator::synchronousScrollingReasons):
+ (WebCore::ScrollingCoordinator::updateSynchronousScrollingReasons):
+ (WebCore::ScrollingCoordinator::setForceSynchronousScrollLayerPositionUpdates):
+ (WebCore::ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously):
+ (WebCore::ScrollingCoordinator::replaySessionStateDidChange):
+ (WebCore::ScrollingCoordinator::synchronousScrollingReasonsAsText):
+ * page/scrolling/ScrollingCoordinator.h: Align the bitmask enums to make mistakes easier to spot.
+ (WebCore::ScrollingCoordinator::frameViewLayoutUpdated):
+ (WebCore::ScrollingCoordinator::frameViewNonFastScrollableRegionChanged):
+ (WebCore::ScrollingCoordinator::requestScrollPositionUpdate):
+ (WebCore::ScrollingCoordinator::handleWheelEvent):
+ (WebCore::ScrollingCoordinator::willDestroyScrollableArea):
+ (WebCore::ScrollingCoordinator::scrollableAreaScrollLayerDidChange):
+ (WebCore::ScrollingCoordinator::scrollableAreaScrollbarLayerDidChange):
+ (WebCore::ScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView):
+ * page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp:
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::scrollableAreaScrollLayerDidChange):
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::willDestroyScrollableArea):
+ (WebCore::ScrollingCoordinatorCoordinatedGraphics::requestScrollPositionUpdate):
+ * page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.h:
+ * page/scrolling/ios/ScrollingCoordinatorIOS.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::handleWheelEvent):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::~RenderLayer):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateOverflowControlsLayers):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateBacking):
+ (WebCore::RenderLayerCompositor::hasCoordinatedScrolling):
+ (WebCore::RenderLayerCompositor::scrollingLayerDidChange):
+ (WebCore::RenderLayerCompositor::updateLayerForHeader):
+ (WebCore::RenderLayerCompositor::updateLayerForFooter):
+ (WebCore::RenderLayerCompositor::updateOverflowControlsLayers):
+ (WebCore::RenderLayerCompositor::destroyRootLayer):
+ (WebCore::RenderLayerCompositor::updateScrollCoordinationForThisFrame):
+ (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):
+ (WebCore::RenderLayerCompositor::willRemoveScrollingLayerWithBacking):
+ (WebCore::RenderLayerCompositor::didAddScrollingLayer):
+ * testing/Internals.cpp:
+ (WebCore::Internals::nonFastScrollableRects):
+
</ins><span class="cx"> 2015-03-29 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use :matches() instead of :-webkit-any() for the sections and headings default style
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -5995,7 +5995,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // FIXME: Why doesn't this need to be called in didBecomeCurrentDocumentInFrame?
</span><del>- scrollingCoordinator->frameViewWheelEventHandlerCountChanged(frameView);
</del><ins>+ scrollingCoordinator->frameViewWheelEventHandlerCountChanged(*frameView);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::didAddWheelEventHandler(Node&)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/HistoryController.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/HistoryController.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/loader/HistoryController.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> Page* page = m_frame.page();
</span><span class="cx"> if (page && m_frame.isMainFrame()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewRootLayerDidChange(view);
</del><ins>+ scrollingCoordinator->frameViewRootLayerDidChange(*view);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageDebugPageOverlayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DebugPageOverlays.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> if (Page* page = m_frame.page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- *region = scrollingCoordinator->computeNonFastScrollableRegion(&m_frame, IntPoint());
</del><ins>+ *region = scrollingCoordinator->computeNonFastScrollableRegion(m_frame, IntPoint());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // computeNonFastScrollableRegion() applies topContentInset.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/Frame.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -791,7 +791,7 @@
</span><span class="cx"> page()->focusController().setFocusedFrame(0);
</span><span class="cx">
</span><span class="cx"> if (page() && page()->scrollingCoordinator() && m_view)
</span><del>- page()->scrollingCoordinator()->willDestroyScrollableArea(m_view.get());
</del><ins>+ page()->scrollingCoordinator()->willDestroyScrollableArea(*m_view);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (WebThreadCountOfObservedContentModifiers() > 0 && m_page)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx">
</span><span class="cx"> if (frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = frame().page()->scrollingCoordinator())
</span><del>- scrollingCoordinator->willDestroyScrollableArea(this);
</del><ins>+ scrollingCoordinator->willDestroyScrollableArea(*this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1548,7 +1548,7 @@
</span><span class="cx">
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewHasSlowRepaintObjectsDidChange(this);
</del><ins>+ scrollingCoordinator->frameViewHasSlowRepaintObjectsDidChange(*this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1565,7 +1565,7 @@
</span><span class="cx">
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewHasSlowRepaintObjectsDidChange(this);
</del><ins>+ scrollingCoordinator->frameViewHasSlowRepaintObjectsDidChange(*this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1582,7 +1582,7 @@
</span><span class="cx">
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewFixedObjectsDidChange(this);
</del><ins>+ scrollingCoordinator->frameViewFixedObjectsDidChange(*this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1592,7 +1592,7 @@
</span><span class="cx"> if (m_viewportConstrainedObjects && m_viewportConstrainedObjects->remove(object)) {
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewFixedObjectsDidChange(this);
</del><ins>+ scrollingCoordinator->frameViewFixedObjectsDidChange(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: In addFixedObject() we only call this if there's a platform widget,
</span><span class="lines">@@ -2230,7 +2230,7 @@
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING) || USE(TILED_BACKING_STORE)
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- return scrollingCoordinator->requestScrollPositionUpdate(this, position);
</del><ins>+ return scrollingCoordinator->requestScrollPositionUpdate(*this, position);
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(position);
</span><span class="lines">@@ -2963,7 +2963,7 @@
</span><span class="cx">
</span><span class="cx"> if (auto* page = frame().page()) {
</span><span class="cx"> if (auto* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewLayoutUpdated(this);
</del><ins>+ scrollingCoordinator->frameViewLayoutUpdated(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (RenderView* renderView = this->renderView()) {
</span><span class="lines">@@ -4377,7 +4377,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (auto* page = frame().page()) {
</span><span class="cx"> if (auto* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewNonFastScrollableRegionChanged(this);
</del><ins>+ scrollingCoordinator->frameViewNonFastScrollableRegionChanged(*this);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4429,8 +4429,8 @@
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
</span><del>- if (scrollingCoordinator->coordinatesScrollingForFrameView(this))
- return scrollingCoordinator->handleWheelEvent(this, wheelEvent);
</del><ins>+ if (scrollingCoordinator->coordinatesScrollingForFrameView(*this))
+ return scrollingCoordinator->handleWheelEvent(*this, wheelEvent);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/Page.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<ClientRectList> Page::nonFastScrollableRects(const Frame* frame)
</del><ins>+Ref<ClientRectList> Page::nonFastScrollableRects(const Frame& frame)
</ins><span class="cx"> {
</span><span class="cx"> if (Document* document = m_mainFrame->document())
</span><span class="cx"> document->updateLayout();
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/Page.h 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT String scrollingStateTreeAsText();
</span><span class="cx"> WEBCORE_EXPORT String synchronousScrollingReasonsAsText();
</span><del>- WEBCORE_EXPORT Ref<ClientRectList> nonFastScrollableRects(const Frame*);
</del><ins>+ WEBCORE_EXPORT Ref<ClientRectList> nonFastScrollableRects(const Frame&);
</ins><span class="cx">
</span><span class="cx"> Settings& settings() const { return *m_settings; }
</span><span class="cx"> ProgressTracker& progress() const { return *m_progress; }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> node.setVerticalSnapOffsets(snapOffsetsAsFloat);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::frameViewLayoutUpdated(FrameView* frameView)
</del><ins>+void AsyncScrollingCoordinator::frameViewLayoutUpdated(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="lines">@@ -87,58 +87,58 @@
</span><span class="cx"> // frame view whose layout was updated is not the main frame.
</span><span class="cx"> // In the future, we may want to have the ability to set non-fast scrolling regions for more than
</span><span class="cx"> // just the root node. But right now, this concept only applies to the root.
</span><del>- m_scrollingStateTree->rootStateNode()->setNonFastScrollableRegion(computeNonFastScrollableRegion(&m_page->mainFrame(), IntPoint()));
</del><ins>+ m_scrollingStateTree->rootStateNode()->setNonFastScrollableRegion(computeNonFastScrollableRegion(m_page->mainFrame(), IntPoint()));
</ins><span class="cx">
</span><span class="cx"> if (!coordinatesScrollingForFrameView(frameView))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</del><ins>+ ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView.scrollLayerID()));
</ins><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Scrollbar* verticalScrollbar = frameView->verticalScrollbar();
- Scrollbar* horizontalScrollbar = frameView->horizontalScrollbar();
</del><ins>+ Scrollbar* verticalScrollbar = frameView.verticalScrollbar();
+ Scrollbar* horizontalScrollbar = frameView.horizontalScrollbar();
</ins><span class="cx"> node->setScrollbarPaintersFromScrollbars(verticalScrollbar, horizontalScrollbar);
</span><span class="cx">
</span><del>- node->setFrameScaleFactor(frameView->frame().frameScaleFactor());
- node->setHeaderHeight(frameView->headerHeight());
- node->setFooterHeight(frameView->footerHeight());
- node->setTopContentInset(frameView->topContentInset());
</del><ins>+ node->setFrameScaleFactor(frameView.frame().frameScaleFactor());
+ node->setHeaderHeight(frameView.headerHeight());
+ node->setFooterHeight(frameView.footerHeight());
+ node->setTopContentInset(frameView.topContentInset());
</ins><span class="cx">
</span><del>- node->setScrollOrigin(frameView->scrollOrigin());
- node->setScrollableAreaSize(frameView->visibleContentRect().size());
- node->setTotalContentsSize(frameView->totalContentsSize());
- node->setReachableContentsSize(frameView->totalContentsSize());
</del><ins>+ node->setScrollOrigin(frameView.scrollOrigin());
+ node->setScrollableAreaSize(frameView.visibleContentRect().size());
+ node->setTotalContentsSize(frameView.totalContentsSize());
+ node->setReachableContentsSize(frameView.totalContentsSize());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><del>- frameView->updateSnapOffsets();
- if (const Vector<LayoutUnit>* horizontalSnapOffsets = frameView->horizontalSnapOffsets())
</del><ins>+ frameView.updateSnapOffsets();
+ if (const Vector<LayoutUnit>* horizontalSnapOffsets = frameView.horizontalSnapOffsets())
</ins><span class="cx"> setStateScrollingNodeSnapOffsetsAsFloat(*node, ScrollEventAxis::Horizontal, *horizontalSnapOffsets, m_page->deviceScaleFactor());
</span><span class="cx">
</span><del>- if (const Vector<LayoutUnit>* verticalSnapOffsets = frameView->verticalSnapOffsets())
</del><ins>+ if (const Vector<LayoutUnit>* verticalSnapOffsets = frameView.verticalSnapOffsets())
</ins><span class="cx"> setStateScrollingNodeSnapOffsetsAsFloat(*node, ScrollEventAxis::Vertical, *verticalSnapOffsets, m_page->deviceScaleFactor());
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ScrollableAreaParameters scrollParameters;
</span><del>- scrollParameters.horizontalScrollElasticity = frameView->horizontalScrollElasticity();
- scrollParameters.verticalScrollElasticity = frameView->verticalScrollElasticity();
</del><ins>+ scrollParameters.horizontalScrollElasticity = frameView.horizontalScrollElasticity();
+ scrollParameters.verticalScrollElasticity = frameView.verticalScrollElasticity();
</ins><span class="cx"> scrollParameters.hasEnabledHorizontalScrollbar = horizontalScrollbar && horizontalScrollbar->enabled();
</span><span class="cx"> scrollParameters.hasEnabledVerticalScrollbar = verticalScrollbar && verticalScrollbar->enabled();
</span><del>- scrollParameters.horizontalScrollbarMode = frameView->horizontalScrollbarMode();
- scrollParameters.verticalScrollbarMode = frameView->verticalScrollbarMode();
</del><ins>+ scrollParameters.horizontalScrollbarMode = frameView.horizontalScrollbarMode();
+ scrollParameters.verticalScrollbarMode = frameView.verticalScrollbarMode();
</ins><span class="cx">
</span><span class="cx"> node->setScrollableAreaParameters(scrollParameters);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged(FrameView*)
</del><ins>+void AsyncScrollingCoordinator::frameViewNonFastScrollableRegionChanged(FrameView&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_scrollingStateTree->rootStateNode())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_scrollingStateTree->rootStateNode()->setNonFastScrollableRegion(computeNonFastScrollableRegion(&m_page->mainFrame(), IntPoint()));
</del><ins>+ m_scrollingStateTree->rootStateNode()->setNonFastScrollableRegion(computeNonFastScrollableRegion(m_page->mainFrame(), IntPoint()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView)
</del><ins>+void AsyncScrollingCoordinator::frameViewRootLayerDidChange(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: In some navigation scenarios, the FrameView has no RenderView or that RenderView has not been composited.
</span><span class="cx"> // This needs cleaning up: https://bugs.webkit.org/show_bug.cgi?id=132724
</span><del>- if (!frameView->scrollLayerID())
</del><ins>+ if (!frameView.scrollLayerID())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If the root layer does not have a ScrollingStateNode, then we should create one.
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingCoordinator::frameViewRootLayerDidChange(frameView);
</span><span class="cx">
</span><del>- ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</del><ins>+ ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView.scrollLayerID()));
</ins><span class="cx"> node->setLayer(scrollLayerForFrameView(frameView));
</span><span class="cx"> node->setScrolledContentsLayer(rootContentLayerForFrameView(frameView));
</span><span class="cx"> node->setCounterScrollingLayer(counterScrollingLayerForFrameView(frameView));
</span><span class="lines">@@ -165,10 +165,10 @@
</span><span class="cx"> node->setContentShadowLayer(contentShadowLayerForFrameView(frameView));
</span><span class="cx"> node->setHeaderLayer(headerLayerForFrameView(frameView));
</span><span class="cx"> node->setFooterLayer(footerLayerForFrameView(frameView));
</span><del>- node->setScrollBehaviorForFixedElements(frameView->scrollBehaviorForFixedElements());
</del><ins>+ node->setScrollBehaviorForFixedElements(frameView.scrollBehaviorForFixedElements());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool AsyncScrollingCoordinator::requestScrollPositionUpdate(FrameView* frameView, const IntPoint& scrollPosition)
</del><ins>+bool AsyncScrollingCoordinator::requestScrollPositionUpdate(FrameView& frameView, const IntPoint& scrollPosition)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="lines">@@ -176,16 +176,16 @@
</span><span class="cx"> if (!coordinatesScrollingForFrameView(frameView))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- bool isProgrammaticScroll = frameView->inProgrammaticScroll();
- if (isProgrammaticScroll || frameView->frame().document()->inPageCache())
- updateScrollPositionAfterAsyncScroll(frameView->scrollLayerID(), scrollPosition, isProgrammaticScroll, SetScrollingLayerPosition);
</del><ins>+ bool isProgrammaticScroll = frameView.inProgrammaticScroll();
+ if (isProgrammaticScroll || frameView.frame().document()->inPageCache())
+ updateScrollPositionAfterAsyncScroll(frameView.scrollLayerID(), scrollPosition, isProgrammaticScroll, SetScrollingLayerPosition);
</ins><span class="cx">
</span><span class="cx"> // If this frame view's document is being put into the page cache, we don't want to update our
</span><span class="cx"> // main frame scroll position. Just let the FrameView think that we did.
</span><del>- if (frameView->frame().document()->inPageCache())
</del><ins>+ if (frameView.frame().document()->inPageCache())
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- ScrollingStateScrollingNode* stateNode = downcast<ScrollingStateScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</del><ins>+ ScrollingStateScrollingNode* stateNode = downcast<ScrollingStateScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView.scrollLayerID()));
</ins><span class="cx"> if (!stateNode)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -262,20 +262,22 @@
</span><span class="cx"> if (!m_page)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- FrameView* frameView = frameViewForScrollingNode(scrollingNodeID);
- if (!frameView)
</del><ins>+ FrameView* frameViewPtr = frameViewForScrollingNode(scrollingNodeID);
+ if (!frameViewPtr)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (scrollingNodeID == frameView->scrollLayerID()) {
- bool oldProgrammaticScroll = frameView->inProgrammaticScroll();
- frameView->setInProgrammaticScroll(programmaticScroll);
</del><ins>+ FrameView& frameView = *frameViewPtr;
</ins><span class="cx">
</span><del>- frameView->setConstrainsScrollingToContentEdge(false);
- frameView->notifyScrollPositionChanged(roundedIntPoint(scrollPosition));
- frameView->setConstrainsScrollingToContentEdge(true);
</del><ins>+ if (scrollingNodeID == frameView.scrollLayerID()) {
+ bool oldProgrammaticScroll = frameView.inProgrammaticScroll();
+ frameView.setInProgrammaticScroll(programmaticScroll);
</ins><span class="cx">
</span><del>- frameView->setInProgrammaticScroll(oldProgrammaticScroll);
</del><ins>+ frameView.setConstrainsScrollingToContentEdge(false);
+ frameView.notifyScrollPositionChanged(roundedIntPoint(scrollPosition));
+ frameView.setConstrainsScrollingToContentEdge(true);
</ins><span class="cx">
</span><ins>+ frameView.setInProgrammaticScroll(oldProgrammaticScroll);
+
</ins><span class="cx"> if (GraphicsLayer* scrollLayer = scrollLayerForFrameView(frameView)) {
</span><span class="cx"> GraphicsLayer* counterScrollingLayer = counterScrollingLayerForFrameView(frameView);
</span><span class="cx"> GraphicsLayer* insetClipLayer = insetClipLayerForFrameView(frameView);
</span><span class="lines">@@ -283,18 +285,18 @@
</span><span class="cx"> GraphicsLayer* scrolledContentsLayer = rootContentLayerForFrameView(frameView);
</span><span class="cx"> GraphicsLayer* headerLayer = headerLayerForFrameView(frameView);
</span><span class="cx"> GraphicsLayer* footerLayer = footerLayerForFrameView(frameView);
</span><del>- LayoutSize scrollOffsetForFixed = frameView->scrollOffsetForFixedPosition();
</del><ins>+ LayoutSize scrollOffsetForFixed = frameView.scrollOffsetForFixedPosition();
</ins><span class="cx">
</span><del>- float topContentInset = frameView->topContentInset();
</del><ins>+ float topContentInset = frameView.topContentInset();
</ins><span class="cx"> FloatPoint positionForInsetClipLayer = FloatPoint(0, FrameView::yPositionForInsetClipLayer(scrollPosition, topContentInset));
</span><span class="cx"> FloatPoint positionForContentsLayer = FloatPoint(scrolledContentsLayer->position().x(),
</span><del>- FrameView::yPositionForRootContentLayer(scrollPosition, topContentInset, frameView->headerHeight()));
</del><ins>+ FrameView::yPositionForRootContentLayer(scrollPosition, topContentInset, frameView.headerHeight()));
</ins><span class="cx"> FloatPoint positionForHeaderLayer = FloatPoint(scrollOffsetForFixed.width(), FrameView::yPositionForHeaderLayer(scrollPosition, topContentInset));
</span><span class="cx"> FloatPoint positionForFooterLayer = FloatPoint(scrollOffsetForFixed.width(),
</span><del>- FrameView::yPositionForFooterLayer(scrollPosition, topContentInset, frameView->totalContentsSize().height(), frameView->footerHeight()));
</del><ins>+ FrameView::yPositionForFooterLayer(scrollPosition, topContentInset, frameView.totalContentsSize().height(), frameView.footerHeight()));
</ins><span class="cx">
</span><span class="cx"> if (programmaticScroll || scrollingLayerPositionAction == SetScrollingLayerPosition) {
</span><del>- scrollLayer->setPosition(-frameView->scrollPosition());
</del><ins>+ scrollLayer->setPosition(-frameView.scrollPosition());
</ins><span class="cx"> if (counterScrollingLayer)
</span><span class="cx"> counterScrollingLayer->setPosition(toLayoutPoint(scrollOffsetForFixed));
</span><span class="cx"> if (insetClipLayer)
</span><span class="lines">@@ -308,7 +310,7 @@
</span><span class="cx"> if (footerLayer)
</span><span class="cx"> footerLayer->setPosition(positionForFooterLayer);
</span><span class="cx"> } else {
</span><del>- scrollLayer->syncPosition(-frameView->scrollPosition());
</del><ins>+ scrollLayer->syncPosition(-frameView.scrollPosition());
</ins><span class="cx"> if (counterScrollingLayer)
</span><span class="cx"> counterScrollingLayer->syncPosition(toLayoutPoint(scrollOffsetForFixed));
</span><span class="cx"> if (insetClipLayer)
</span><span class="lines">@@ -322,7 +324,7 @@
</span><span class="cx"> if (footerLayer)
</span><span class="cx"> footerLayer->syncPosition(positionForFooterLayer);
</span><span class="cx">
</span><del>- LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect();
</del><ins>+ LayoutRect viewportRect = frameView.viewportConstrainedVisibleContentRect();
</ins><span class="cx"> syncChildPositions(viewportRect);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -331,7 +333,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Overflow-scroll area.
</span><del>- if (ScrollableArea* scrollableArea = frameView->scrollableAreaForScrollLayerID(scrollingNodeID)) {
</del><ins>+ if (ScrollableArea* scrollableArea = frameView.scrollableAreaForScrollLayerID(scrollingNodeID)) {
</ins><span class="cx"> scrollableArea->setIsUserScroll(scrollingLayerPositionAction == SyncScrollingLayerPosition);
</span><span class="cx"> scrollableArea->scrollToOffsetWithoutAnimation(scrollPosition);
</span><span class="cx"> scrollableArea->setIsUserScroll(false);
</span><span class="lines">@@ -340,18 +342,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::scrollableAreaScrollbarLayerDidChange(ScrollableArea* scrollableArea, ScrollbarOrientation orientation)
</del><ins>+void AsyncScrollingCoordinator::scrollableAreaScrollbarLayerDidChange(ScrollableArea& scrollableArea, ScrollbarOrientation orientation)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="cx">
</span><del>- if (scrollableArea != static_cast<ScrollableArea*>(m_page->mainFrame().view()))
</del><ins>+ if (&scrollableArea != static_cast<ScrollableArea*>(m_page->mainFrame().view()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (orientation == VerticalScrollbar)
</span><del>- scrollableArea->verticalScrollbarLayerDidChange();
</del><ins>+ scrollableArea.verticalScrollbarLayerDidChange();
</ins><span class="cx"> else
</span><del>- scrollableArea->horizontalScrollbarLayerDidChange();
</del><ins>+ scrollableArea.horizontalScrollbarLayerDidChange();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingNodeID AsyncScrollingCoordinator::attachToStateTree(ScrollingNodeType nodeType, ScrollingNodeID newNodeID, ScrollingNodeID parentID)
</span><span class="lines">@@ -383,10 +385,10 @@
</span><span class="cx"> child->syncLayerPositionForViewportRect(viewportRect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::ensureRootStateNodeForFrameView(FrameView* frameView)
</del><ins>+void AsyncScrollingCoordinator::ensureRootStateNodeForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><del>- ASSERT(frameView->scrollLayerID());
- attachToStateTree(FrameScrollingNode, frameView->scrollLayerID(), 0);
</del><ins>+ ASSERT(frameView.scrollLayerID());
+ attachToStateTree(FrameScrollingNode, frameView.scrollLayerID(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AsyncScrollingCoordinator::updateFrameScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, GraphicsLayer* insetClipLayer, const ScrollingGeometry* scrollingGeometry)
</span><span class="lines">@@ -481,13 +483,13 @@
</span><span class="cx"> if (!frameView)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (GraphicsLayer* scrollLayer = scrollLayerForFrameView(frameView))
</del><ins>+ if (GraphicsLayer* scrollLayer = scrollLayerForFrameView(*frameView))
</ins><span class="cx"> scrollLayer->setPosition(-frameView->scrollPosition());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView(FrameView* frameView)
</del><ins>+void AsyncScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><del>- ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView->scrollLayerID()));
</del><ins>+ ScrollingStateFrameScrollingNode* node = downcast<ScrollingStateFrameScrollingNode>(m_scrollingStateTree->stateNodeForID(frameView.scrollLayerID()));
</ins><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx"> node->setWheelEventHandlerCount(computeCurrentWheelEventHandlerCount());
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -73,13 +73,13 @@
</span><span class="cx"> virtual bool isAsyncScrollingCoordinator() const override { return true; }
</span><span class="cx">
</span><span class="cx"> virtual bool supportsFixedPositionLayers() const override { return true; }
</span><del>- virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const override { return false; }
</del><ins>+ virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(const FrameView&) const override { return false; }
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT virtual void frameViewLayoutUpdated(FrameView*) override;
- WEBCORE_EXPORT virtual void frameViewRootLayerDidChange(FrameView*) override;
- WEBCORE_EXPORT virtual void frameViewNonFastScrollableRegionChanged(FrameView*) override;
</del><ins>+ WEBCORE_EXPORT virtual void frameViewLayoutUpdated(FrameView&) override;
+ WEBCORE_EXPORT virtual void frameViewRootLayerDidChange(FrameView&) override;
+ WEBCORE_EXPORT virtual void frameViewNonFastScrollableRegionChanged(FrameView&) override;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT virtual bool requestScrollPositionUpdate(FrameView*, const IntPoint&) override;
</del><ins>+ WEBCORE_EXPORT virtual bool requestScrollPositionUpdate(FrameView&, const IntPoint&) override;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT virtual ScrollingNodeID attachToStateTree(ScrollingNodeType, ScrollingNodeID newNodeID, ScrollingNodeID parentID) override;
</span><span class="cx"> WEBCORE_EXPORT virtual void detachFromStateTree(ScrollingNodeID) override;
</span><span class="lines">@@ -94,14 +94,14 @@
</span><span class="cx"> virtual void setScrollPinningBehavior(ScrollPinningBehavior) override;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT virtual void syncChildPositions(const LayoutRect& viewportRect) override;
</span><del>- WEBCORE_EXPORT virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea*, ScrollbarOrientation) override;
</del><ins>+ WEBCORE_EXPORT virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea&, ScrollbarOrientation) override;
</ins><span class="cx">
</span><del>- WEBCORE_EXPORT virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*) override;
</del><ins>+ WEBCORE_EXPORT virtual void recomputeWheelEventHandlerCountForFrameView(FrameView&) override;
</ins><span class="cx"> WEBCORE_EXPORT virtual void setSynchronousScrollingReasons(SynchronousScrollingReasons) override;
</span><span class="cx">
</span><span class="cx"> virtual void scheduleTreeStateCommit() = 0;
</span><span class="cx">
</span><del>- void ensureRootStateNodeForFrameView(FrameView*);
</del><ins>+ void ensureRootStateNodeForFrameView(FrameView&);
</ins><span class="cx"> void updateMainFrameScrollLayerPosition();
</span><span class="cx">
</span><span class="cx"> void updateScrollPositionAfterAsyncScrollTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -79,15 +79,15 @@
</span><span class="cx"> void ScrollingCoordinator::pageDestroyed()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_page);
</span><del>- m_page = 0;
</del><ins>+ m_page = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScrollingCoordinator::coordinatesScrollingForFrameView(FrameView* frameView) const
</del><ins>+bool ScrollingCoordinator::coordinatesScrollingForFrameView(const FrameView& frameView) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="cx">
</span><del>- if (!frameView->frame().isMainFrame() && !m_page->settings().scrollingTreeIncludesFrames())
</del><ins>+ if (!frameView.frame().isMainFrame() && !m_page->settings().scrollingTreeIncludesFrames())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> RenderView* renderView = m_page->mainFrame().contentRenderer();
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> return renderView->usesCompositing();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame* frame, const IntPoint& frameLocation) const
</del><ins>+Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame& frame, const IntPoint& frameLocation) const
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> // On iOS, we use nonFastScrollableRegion to represent the region covered by elements with touch event handlers.
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> return touchRegion;
</span><span class="cx"> #else
</span><span class="cx"> Region nonFastScrollableRegion;
</span><del>- FrameView* frameView = frame->view();
</del><ins>+ FrameView* frameView = frame.view();
</ins><span class="cx"> if (!frameView)
</span><span class="cx"> return nonFastScrollableRegion;
</span><span class="cx">
</span><span class="lines">@@ -145,8 +145,8 @@
</span><span class="cx"> nonFastScrollableRegion.unite(pluginViewBase.frameRect());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (Frame* subframe = frame->tree().firstChild(); subframe; subframe = subframe->tree().nextSibling())
- nonFastScrollableRegion.unite(computeNonFastScrollableRegion(subframe, offset));
</del><ins>+ for (Frame* subframe = frame.tree().firstChild(); subframe; subframe = subframe->tree().nextSibling())
+ nonFastScrollableRegion.unite(computeNonFastScrollableRegion(*subframe, offset));
</ins><span class="cx">
</span><span class="cx"> return nonFastScrollableRegion;
</span><span class="cx"> #endif
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> return wheelEventHandlerCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinator::frameViewWheelEventHandlerCountChanged(FrameView* frameView)
</del><ins>+void ScrollingCoordinator::frameViewWheelEventHandlerCountChanged(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> recomputeWheelEventHandlerCountForFrameView(frameView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinator::frameViewHasSlowRepaintObjectsDidChange(FrameView* frameView)
</del><ins>+void ScrollingCoordinator::frameViewHasSlowRepaintObjectsDidChange(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> updateSynchronousScrollingReasons(frameView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinator::frameViewFixedObjectsDidChange(FrameView* frameView)
</del><ins>+void ScrollingCoordinator::frameViewFixedObjectsDidChange(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="lines">@@ -194,22 +194,22 @@
</span><span class="cx"> updateSynchronousScrollingReasons(frameView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayer* ScrollingCoordinator::scrollLayerForScrollableArea(ScrollableArea* scrollableArea)
</del><ins>+GraphicsLayer* ScrollingCoordinator::scrollLayerForScrollableArea(ScrollableArea& scrollableArea)
</ins><span class="cx"> {
</span><del>- return scrollableArea->layerForScrolling();
</del><ins>+ return scrollableArea.layerForScrolling();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView* frameView)
</del><ins>+GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><del>- if (RenderView* renderView = frameView->frame().contentRenderer())
</del><ins>+ if (RenderView* renderView = frameView.frame().contentRenderer())
</ins><span class="cx"> return renderView->compositor().scrollLayer();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayer* ScrollingCoordinator::headerLayerForFrameView(FrameView* frameView)
</del><ins>+GraphicsLayer* ScrollingCoordinator::headerLayerForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- if (RenderView* renderView = frameView->frame().contentRenderer())
</del><ins>+ if (RenderView* renderView = frameView.frame().contentRenderer())
</ins><span class="cx"> return renderView->compositor().headerLayer();
</span><span class="cx"> return nullptr;
</span><span class="cx"> #else
</span><span class="lines">@@ -218,10 +218,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayer* ScrollingCoordinator::footerLayerForFrameView(FrameView* frameView)
</del><ins>+GraphicsLayer* ScrollingCoordinator::footerLayerForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- if (RenderView* renderView = frameView->frame().contentRenderer())
</del><ins>+ if (RenderView* renderView = frameView.frame().contentRenderer())
</ins><span class="cx"> return renderView->compositor().footerLayer();
</span><span class="cx"> return nullptr;
</span><span class="cx"> #else
</span><span class="lines">@@ -230,24 +230,24 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayer* ScrollingCoordinator::counterScrollingLayerForFrameView(FrameView* frameView)
</del><ins>+GraphicsLayer* ScrollingCoordinator::counterScrollingLayerForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><del>- if (RenderView* renderView = frameView->frame().contentRenderer())
</del><ins>+ if (RenderView* renderView = frameView.frame().contentRenderer())
</ins><span class="cx"> return renderView->compositor().fixedRootBackgroundLayer();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayer* ScrollingCoordinator::insetClipLayerForFrameView(FrameView* frameView)
</del><ins>+GraphicsLayer* ScrollingCoordinator::insetClipLayerForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><del>- if (RenderView* renderView = frameView->frame().contentRenderer())
</del><ins>+ if (RenderView* renderView = frameView.frame().contentRenderer())
</ins><span class="cx"> return renderView->compositor().clipLayer();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayer* ScrollingCoordinator::contentShadowLayerForFrameView(FrameView* frameView)
</del><ins>+GraphicsLayer* ScrollingCoordinator::contentShadowLayerForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><del>- if (RenderView* renderView = frameView->frame().contentRenderer())
</del><ins>+ if (RenderView* renderView = frameView.frame().contentRenderer())
</ins><span class="cx"> return renderView->compositor().layerForContentShadow();
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -257,14 +257,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GraphicsLayer* ScrollingCoordinator::rootContentLayerForFrameView(FrameView* frameView)
</del><ins>+GraphicsLayer* ScrollingCoordinator::rootContentLayerForFrameView(FrameView& frameView)
</ins><span class="cx"> {
</span><del>- if (RenderView* renderView = frameView->frame().contentRenderer())
</del><ins>+ if (RenderView* renderView = frameView.frame().contentRenderer())
</ins><span class="cx"> return renderView->compositor().rootContentLayer();
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView)
</del><ins>+void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span><span class="lines">@@ -293,9 +293,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects(FrameView* frameView) const
</del><ins>+bool ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects(const FrameView& frameView) const
</ins><span class="cx"> {
</span><del>- const FrameView::ViewportConstrainedObjectSet* viewportConstrainedObjects = frameView->viewportConstrainedObjects();
</del><ins>+ const FrameView::ViewportConstrainedObjectSet* viewportConstrainedObjects = frameView.viewportConstrainedObjects();
</ins><span class="cx"> if (!viewportConstrainedObjects)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -311,11 +311,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SynchronousScrollingReasons ScrollingCoordinator::synchronousScrollingReasons(FrameView* frameView) const
</del><ins>+SynchronousScrollingReasons ScrollingCoordinator::synchronousScrollingReasons(const FrameView& frameView) const
</ins><span class="cx"> {
</span><del>- if (!frameView)
- return static_cast<SynchronousScrollingReasons>(0);
-
</del><span class="cx"> SynchronousScrollingReasons synchronousScrollingReasons = (SynchronousScrollingReasons)0;
</span><span class="cx">
</span><span class="cx"> if (m_forceSynchronousScrollLayerPositionUpdates)
</span><span class="lines">@@ -325,23 +322,23 @@
</span><span class="cx"> if (cursor.isCapturing() || cursor.isReplaying())
</span><span class="cx"> synchronousScrollingReasons |= ForcedOnMainThread;
</span><span class="cx"> #endif
</span><del>- if (frameView->hasSlowRepaintObjects())
</del><ins>+ if (frameView.hasSlowRepaintObjects())
</ins><span class="cx"> synchronousScrollingReasons |= HasSlowRepaintObjects;
</span><del>- if (!supportsFixedPositionLayers() && frameView->hasViewportConstrainedObjects())
</del><ins>+ if (!supportsFixedPositionLayers() && frameView.hasViewportConstrainedObjects())
</ins><span class="cx"> synchronousScrollingReasons |= HasViewportConstrainedObjectsWithoutSupportingFixedLayers;
</span><span class="cx"> if (supportsFixedPositionLayers() && hasVisibleSlowRepaintViewportConstrainedObjects(frameView))
</span><span class="cx"> synchronousScrollingReasons |= HasNonLayerViewportConstrainedObjects;
</span><del>- if (frameView->frame().mainFrame().document() && frameView->frame().document()->isImageDocument())
</del><ins>+ if (frameView.frame().mainFrame().document() && frameView.frame().document()->isImageDocument())
</ins><span class="cx"> synchronousScrollingReasons |= IsImageDocument;
</span><span class="cx">
</span><span class="cx"> return synchronousScrollingReasons;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinator::updateSynchronousScrollingReasons(FrameView* frameView)
</del><ins>+void ScrollingCoordinator::updateSynchronousScrollingReasons(FrameView& frameView)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Once we support async scrolling of iframes, we'll have to track the synchronous scrolling
</span><span class="cx"> // reasons per frame (maybe on scrolling tree nodes).
</span><del>- if (!frameView->frame().isMainFrame())
</del><ins>+ if (!frameView.frame().isMainFrame())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> setSynchronousScrollingReasons(synchronousScrollingReasons(frameView));
</span><span class="lines">@@ -353,19 +350,23 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_forceSynchronousScrollLayerPositionUpdates = forceSynchronousScrollLayerPositionUpdates;
</span><del>- updateSynchronousScrollingReasons(m_page->mainFrame().view());
</del><ins>+ if (FrameView* frameView = m_page->mainFrame().view())
+ updateSynchronousScrollingReasons(*frameView);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously() const
</span><span class="cx"> {
</span><del>- return synchronousScrollingReasons(m_page->mainFrame().view());
</del><ins>+ if (FrameView* frameView = m_page->mainFrame().view())
+ return synchronousScrollingReasons(*frameView);
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_REPLAY)
</span><span class="cx"> void ScrollingCoordinator::replaySessionStateDidChange()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Once we support async scrolling of iframes, this should go through all subframes.
</span><del>- updateSynchronousScrollingReasons(m_page->mainFrame().view());
</del><ins>+ if (FrameView* frameView = m_page->mainFrame().view())
+ updateSynchronousScrollingReasons(*frameView);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -402,7 +403,10 @@
</span><span class="cx">
</span><span class="cx"> String ScrollingCoordinator::synchronousScrollingReasonsAsText() const
</span><span class="cx"> {
</span><del>- return synchronousScrollingReasonsAsText(synchronousScrollingReasons(m_page->mainFrame().view()));
</del><ins>+ if (FrameView* frameView = m_page->mainFrame().view())
+ return synchronousScrollingReasonsAsText(synchronousScrollingReasons(*frameView));
+
+ return String();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -115,26 +115,26 @@
</span><span class="cx"> virtual bool isRemoteScrollingCoordinator() const { return false; }
</span><span class="cx">
</span><span class="cx"> // Return whether this scrolling coordinator handles scrolling for the given frame view.
</span><del>- virtual bool coordinatesScrollingForFrameView(FrameView*) const;
</del><ins>+ virtual bool coordinatesScrollingForFrameView(const FrameView&) const;
</ins><span class="cx">
</span><span class="cx"> // Should be called whenever the given frame view has been laid out.
</span><del>- virtual void frameViewLayoutUpdated(FrameView*) { }
</del><ins>+ virtual void frameViewLayoutUpdated(FrameView&) { }
</ins><span class="cx">
</span><span class="cx"> // Should be called whenever a wheel event handler is added or removed in the
</span><span class="cx"> // frame view's underlying document.
</span><del>- void frameViewWheelEventHandlerCountChanged(FrameView*);
</del><ins>+ void frameViewWheelEventHandlerCountChanged(FrameView&);
</ins><span class="cx">
</span><span class="cx"> // Should be called whenever the slow repaint objects counter changes between zero and one.
</span><del>- void frameViewHasSlowRepaintObjectsDidChange(FrameView*);
</del><ins>+ void frameViewHasSlowRepaintObjectsDidChange(FrameView&);
</ins><span class="cx">
</span><span class="cx"> // Should be called whenever the set of fixed objects changes.
</span><del>- void frameViewFixedObjectsDidChange(FrameView*);
</del><ins>+ void frameViewFixedObjectsDidChange(FrameView&);
</ins><span class="cx">
</span><span class="cx"> // Called whenever the non-fast scrollable region changes for reasons other than layout.
</span><del>- virtual void frameViewNonFastScrollableRegionChanged(FrameView*) { }
</del><ins>+ virtual void frameViewNonFastScrollableRegionChanged(FrameView&) { }
</ins><span class="cx">
</span><span class="cx"> // Should be called whenever the root layer for the given frame view changes.
</span><del>- virtual void frameViewRootLayerDidChange(FrameView*);
</del><ins>+ virtual void frameViewRootLayerDidChange(FrameView&);
</ins><span class="cx">
</span><span class="cx"> // Return whether this scrolling coordinator can keep fixed position layers fixed to their
</span><span class="cx"> // containers while scrolling.
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> // These virtual functions are currently unique to the threaded scrolling architecture.
</span><span class="cx"> // Their meaningful implementations are in ScrollingCoordinatorMac.
</span><span class="cx"> virtual void commitTreeStateIfNeeded() { }
</span><del>- virtual bool requestScrollPositionUpdate(FrameView*, const IntPoint&) { return false; }
- virtual bool handleWheelEvent(FrameView*, const PlatformWheelEvent&) { return true; }
</del><ins>+ virtual bool requestScrollPositionUpdate(FrameView&, const IntPoint&) { return false; }
+ virtual bool handleWheelEvent(FrameView&, const PlatformWheelEvent&) { return true; }
</ins><span class="cx"> virtual ScrollingNodeID attachToStateTree(ScrollingNodeType, ScrollingNodeID newNodeID, ScrollingNodeID /*parentID*/) { return newNodeID; }
</span><span class="cx"> virtual void detachFromStateTree(ScrollingNodeID) { }
</span><span class="cx"> virtual void clearStateTree() { }
</span><span class="lines">@@ -186,47 +186,47 @@
</span><span class="cx"> ScrollingNodeID uniqueScrollLayerID();
</span><span class="cx">
</span><span class="cx"> enum MainThreadScrollingReasonFlags {
</span><del>- ForcedOnMainThread = 1 << 0,
- HasSlowRepaintObjects = 1 << 1,
- HasViewportConstrainedObjectsWithoutSupportingFixedLayers = 1 << 2,
- HasNonLayerViewportConstrainedObjects = 1 << 3,
- IsImageDocument = 1 << 4
</del><ins>+ ForcedOnMainThread = 1 << 0,
+ HasSlowRepaintObjects = 1 << 1,
+ HasViewportConstrainedObjectsWithoutSupportingFixedLayers = 1 << 2,
+ HasNonLayerViewportConstrainedObjects = 1 << 3,
+ IsImageDocument = 1 << 4
</ins><span class="cx"> };
</span><span class="cx">
</span><del>- SynchronousScrollingReasons synchronousScrollingReasons(FrameView*) const;
</del><ins>+ SynchronousScrollingReasons synchronousScrollingReasons(const FrameView&) const;
</ins><span class="cx"> bool shouldUpdateScrollLayerPositionSynchronously() const;
</span><span class="cx">
</span><del>- virtual void willDestroyScrollableArea(ScrollableArea*) { }
- virtual void scrollableAreaScrollLayerDidChange(ScrollableArea*) { }
- virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea*, ScrollbarOrientation) { }
</del><ins>+ virtual void willDestroyScrollableArea(ScrollableArea&) { }
+ virtual void scrollableAreaScrollLayerDidChange(ScrollableArea&) { }
+ virtual void scrollableAreaScrollbarLayerDidChange(ScrollableArea&, ScrollbarOrientation) { }
</ins><span class="cx">
</span><span class="cx"> static String synchronousScrollingReasonsAsText(SynchronousScrollingReasons);
</span><span class="cx"> String synchronousScrollingReasonsAsText() const;
</span><span class="cx">
</span><del>- Region computeNonFastScrollableRegion(const Frame*, const IntPoint& frameLocation) const;
</del><ins>+ Region computeNonFastScrollableRegion(const Frame&, const IntPoint& frameLocation) const;
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> explicit ScrollingCoordinator(Page*);
</span><span class="cx">
</span><del>- static GraphicsLayer* scrollLayerForScrollableArea(ScrollableArea*);
</del><ins>+ static GraphicsLayer* scrollLayerForScrollableArea(ScrollableArea&);
</ins><span class="cx">
</span><span class="cx"> unsigned computeCurrentWheelEventHandlerCount();
</span><del>- GraphicsLayer* scrollLayerForFrameView(FrameView*);
- GraphicsLayer* counterScrollingLayerForFrameView(FrameView*);
- GraphicsLayer* insetClipLayerForFrameView(FrameView*);
- GraphicsLayer* rootContentLayerForFrameView(FrameView*);
- GraphicsLayer* contentShadowLayerForFrameView(FrameView*);
- GraphicsLayer* headerLayerForFrameView(FrameView*);
- GraphicsLayer* footerLayerForFrameView(FrameView*);
</del><ins>+ GraphicsLayer* scrollLayerForFrameView(FrameView&);
+ GraphicsLayer* counterScrollingLayerForFrameView(FrameView&);
+ GraphicsLayer* insetClipLayerForFrameView(FrameView&);
+ GraphicsLayer* rootContentLayerForFrameView(FrameView&);
+ GraphicsLayer* contentShadowLayerForFrameView(FrameView&);
+ GraphicsLayer* headerLayerForFrameView(FrameView&);
+ GraphicsLayer* footerLayerForFrameView(FrameView&);
</ins><span class="cx">
</span><span class="cx"> Page* m_page; // FIXME: ideally this would be a reference but it gets nulled on async teardown.
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*) { }
</del><ins>+ virtual void recomputeWheelEventHandlerCountForFrameView(FrameView&) { }
</ins><span class="cx"> virtual void setSynchronousScrollingReasons(SynchronousScrollingReasons) { }
</span><span class="cx">
</span><del>- virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(FrameView*) const;
- void updateSynchronousScrollingReasons(FrameView*);
</del><ins>+ virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(const FrameView&) const;
+ void updateSynchronousScrollingReasons(FrameView&);
</ins><span class="cx">
</span><span class="cx"> bool m_forceSynchronousScrollLayerPositionUpdates;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -94,16 +94,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinatorCoordinatedGraphics::scrollableAreaScrollLayerDidChange(ScrollableArea* scrollableArea)
</del><ins>+void ScrollingCoordinatorCoordinatedGraphics::scrollableAreaScrollLayerDidChange(ScrollableArea& scrollableArea)
</ins><span class="cx"> {
</span><span class="cx"> CoordinatedGraphicsLayer* layer = toCoordinatedGraphicsLayer(scrollLayerForScrollableArea(scrollableArea));
</span><span class="cx"> if (!layer)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- layer->setScrollableArea(scrollableArea);
</del><ins>+ layer->setScrollableArea(&scrollableArea);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingCoordinatorCoordinatedGraphics::willDestroyScrollableArea(ScrollableArea* scrollableArea)
</del><ins>+void ScrollingCoordinatorCoordinatedGraphics::willDestroyScrollableArea(ScrollableArea& scrollableArea)
</ins><span class="cx"> {
</span><span class="cx"> CoordinatedGraphicsLayer* layer = toCoordinatedGraphicsLayer(scrollLayerForScrollableArea(scrollableArea));
</span><span class="cx"> if (!layer)
</span><span class="lines">@@ -112,13 +112,13 @@
</span><span class="cx"> layer->setScrollableArea(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScrollingCoordinatorCoordinatedGraphics::requestScrollPositionUpdate(FrameView* frameView, const IntPoint& scrollPosition)
</del><ins>+bool ScrollingCoordinatorCoordinatedGraphics::requestScrollPositionUpdate(FrameView& frameView, const IntPoint& scrollPosition)
</ins><span class="cx"> {
</span><del>- if (!frameView->delegatesScrolling())
</del><ins>+ if (!frameView.delegatesScrolling())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- frameView->setFixedVisibleContentRect(IntRect(scrollPosition, frameView->visibleContentRect().size()));
- frameView->hostWindow()->delegatedScrollRequested(scrollPosition);
</del><ins>+ frameView.setFixedVisibleContentRect(IntRect(scrollPosition, frameView.visibleContentRect().size()));
+ frameView.hostWindow()->delegatedScrollRequested(scrollPosition);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.h (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.h 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.h 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -47,10 +47,10 @@
</span><span class="cx">
</span><span class="cx"> virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportConstraints&, GraphicsLayer*) override;
</span><span class="cx">
</span><del>- virtual void scrollableAreaScrollLayerDidChange(ScrollableArea*) override;
- virtual void willDestroyScrollableArea(ScrollableArea*) override;
</del><ins>+ virtual void scrollableAreaScrollLayerDidChange(ScrollableArea&) override;
+ virtual void willDestroyScrollableArea(ScrollableArea&) override;
</ins><span class="cx">
</span><del>- virtual bool requestScrollPositionUpdate(FrameView*, const IntPoint&) override;
</del><ins>+ virtual bool requestScrollPositionUpdate(FrameView&, const IntPoint&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> std::unique_ptr<ScrollingStateTree> m_scrollingStateTree;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> virtual void commitTreeStateIfNeeded() override;
</span><span class="cx">
</span><span class="cx"> // Handle the wheel event on the scrolling thread. Returns whether the event was handled or not.
</span><del>- virtual bool handleWheelEvent(FrameView*, const PlatformWheelEvent&) override { return false; }
</del><ins>+ virtual bool handleWheelEvent(FrameView&, const PlatformWheelEvent&) override { return false; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void scheduleTreeStateCommit() override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> virtual void commitTreeStateIfNeeded() override;
</span><span class="cx">
</span><span class="cx"> // Handle the wheel event on the scrolling thread. Returns whether the event was handled or not.
</span><del>- virtual bool handleWheelEvent(FrameView*, const PlatformWheelEvent&) override;
</del><ins>+ virtual bool handleWheelEvent(FrameView&, const PlatformWheelEvent&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void scheduleTreeStateCommit() override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> m_scrollingStateTreeCommitterTimer.stop();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScrollingCoordinatorMac::handleWheelEvent(FrameView*, const PlatformWheelEvent& wheelEvent)
</del><ins>+bool ScrollingCoordinatorMac::handleWheelEvent(FrameView&, const PlatformWheelEvent& wheelEvent)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(m_page);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx">
</span><span class="cx"> if (renderer().frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = renderer().frame().page()->scrollingCoordinator())
</span><del>- scrollingCoordinator->willDestroyScrollableArea(this);
</del><ins>+ scrollingCoordinator->willDestroyScrollableArea(*this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_reflection)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -1295,9 +1295,9 @@
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m_owningLayer)) {
</span><span class="cx"> if (horizontalScrollbarLayerChanged)
</span><del>- scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(&m_owningLayer, HorizontalScrollbar);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_owningLayer, HorizontalScrollbar);
</ins><span class="cx"> if (verticalScrollbarLayerChanged)
</span><del>- scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(&m_owningLayer, VerticalScrollbar);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_owningLayer, VerticalScrollbar);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return horizontalScrollbarLayerChanged || verticalScrollbarLayerChanged || scrollCornerLayerChanged;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -987,7 +987,7 @@
</span><span class="cx"> if (layer.isRootLayer() && !m_renderView.document().ownerElement()) {
</span><span class="cx"> updateScrollCoordinatedStatus(layer);
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewRootLayerDidChange(&m_renderView.frameView());
</del><ins>+ scrollingCoordinator->frameViewRootLayerDidChange(m_renderView.frameView());
</ins><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><span class="cx"> if (Page* page = this->page()) {
</span><span class="cx"> updateLayerForHeader(page->headerHeight());
</span><span class="lines">@@ -1061,7 +1061,7 @@
</span><span class="cx"> }
</span><span class="cx"> if (layerChanged) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewFixedObjectsDidChange(&m_renderView.frameView());
</del><ins>+ scrollingCoordinator->frameViewFixedObjectsDidChange(m_renderView.frameView());
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> layer.setViewportConstrainedNotCompositedReason(RenderLayer::NoNotCompositedReason);
</span><span class="lines">@@ -1707,7 +1707,7 @@
</span><span class="cx"> bool RenderLayerCompositor::hasCoordinatedScrolling() const
</span><span class="cx"> {
</span><span class="cx"> ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator();
</span><del>- return scrollingCoordinator && scrollingCoordinator->coordinatesScrollingForFrameView(&m_renderView.frameView());
</del><ins>+ return scrollingCoordinator && scrollingCoordinator->coordinatesScrollingForFrameView(m_renderView.frameView());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::updateScrollLayerPosition()
</span><span class="lines">@@ -1766,7 +1766,7 @@
</span><span class="cx"> void RenderLayerCompositor::scrollingLayerDidChange(RenderLayer& layer)
</span><span class="cx"> {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->scrollableAreaScrollLayerDidChange(&layer);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::fixedRootBackgroundLayerChanged()
</span><span class="lines">@@ -3112,7 +3112,7 @@
</span><span class="cx"> // The ScrollingTree knows about the header layer, and the position of the root layer is affected
</span><span class="cx"> // by the header layer, so if we remove the header, we need to tell the scrolling tree.
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewRootLayerDidChange(&m_renderView.frameView());
</del><ins>+ scrollingCoordinator->frameViewRootLayerDidChange(m_renderView.frameView());
</ins><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -3132,7 +3132,7 @@
</span><span class="cx"> m_layerForHeader->setSize(FloatSize(m_renderView.frameView().visibleWidth(), m_renderView.frameView().headerHeight()));
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewRootLayerDidChange(&m_renderView.frameView());
</del><ins>+ scrollingCoordinator->frameViewRootLayerDidChange(m_renderView.frameView());
</ins><span class="cx">
</span><span class="cx"> if (Page* page = this->page())
</span><span class="cx"> page->chrome().client().didAddHeaderLayer(m_layerForHeader.get());
</span><span class="lines">@@ -3153,7 +3153,7 @@
</span><span class="cx"> // The ScrollingTree knows about the footer layer, and the total scrollable size is affected
</span><span class="cx"> // by the footer layer, so if we remove the footer, we need to tell the scrolling tree.
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewRootLayerDidChange(&m_renderView.frameView());
</del><ins>+ scrollingCoordinator->frameViewRootLayerDidChange(m_renderView.frameView());
</ins><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -3173,7 +3173,7 @@
</span><span class="cx"> m_layerForFooter->setSize(FloatSize(m_renderView.frameView().visibleWidth(), m_renderView.frameView().footerHeight()));
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->frameViewRootLayerDidChange(&m_renderView.frameView());
</del><ins>+ scrollingCoordinator->frameViewRootLayerDidChange(m_renderView.frameView());
</ins><span class="cx">
</span><span class="cx"> if (Page* page = this->page())
</span><span class="cx"> page->chrome().client().didAddFooterLayer(m_layerForFooter.get());
</span><span class="lines">@@ -3287,14 +3287,14 @@
</span><span class="cx"> m_overflowControlsHostLayer->addChild(m_layerForHorizontalScrollbar.get());
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(&m_renderView.frameView(), HorizontalScrollbar);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_renderView.frameView(), HorizontalScrollbar);
</ins><span class="cx"> }
</span><span class="cx"> } else if (m_layerForHorizontalScrollbar) {
</span><span class="cx"> m_layerForHorizontalScrollbar->removeFromParent();
</span><span class="cx"> m_layerForHorizontalScrollbar = nullptr;
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(&m_renderView.frameView(), HorizontalScrollbar);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_renderView.frameView(), HorizontalScrollbar);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (requiresVerticalScrollbarLayer()) {
</span><span class="lines">@@ -3310,14 +3310,14 @@
</span><span class="cx"> m_overflowControlsHostLayer->addChild(m_layerForVerticalScrollbar.get());
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(&m_renderView.frameView(), VerticalScrollbar);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_renderView.frameView(), VerticalScrollbar);
</ins><span class="cx"> }
</span><span class="cx"> } else if (m_layerForVerticalScrollbar) {
</span><span class="cx"> m_layerForVerticalScrollbar->removeFromParent();
</span><span class="cx"> m_layerForVerticalScrollbar = nullptr;
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(&m_renderView.frameView(), VerticalScrollbar);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_renderView.frameView(), VerticalScrollbar);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (requiresScrollCornerLayer()) {
</span><span class="lines">@@ -3437,7 +3437,7 @@
</span><span class="cx"> m_layerForHorizontalScrollbar->removeFromParent();
</span><span class="cx"> m_layerForHorizontalScrollbar = nullptr;
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(&m_renderView.frameView(), HorizontalScrollbar);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_renderView.frameView(), HorizontalScrollbar);
</ins><span class="cx"> if (Scrollbar* horizontalScrollbar = m_renderView.frameView().verticalScrollbar())
</span><span class="cx"> m_renderView.frameView().invalidateScrollbar(horizontalScrollbar, IntRect(IntPoint(0, 0), horizontalScrollbar->frameRect().size()));
</span><span class="cx"> }
</span><span class="lines">@@ -3446,7 +3446,7 @@
</span><span class="cx"> m_layerForVerticalScrollbar->removeFromParent();
</span><span class="cx"> m_layerForVerticalScrollbar = nullptr;
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</span><del>- scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(&m_renderView.frameView(), VerticalScrollbar);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollbarLayerDidChange(m_renderView.frameView(), VerticalScrollbar);
</ins><span class="cx"> if (Scrollbar* verticalScrollbar = m_renderView.frameView().verticalScrollbar())
</span><span class="cx"> m_renderView.frameView().invalidateScrollbar(verticalScrollbar, IntRect(IntPoint(0, 0), verticalScrollbar->frameRect().size()));
</span><span class="cx"> }
</span><span class="lines">@@ -3816,7 +3816,7 @@
</span><span class="cx"> void RenderLayerCompositor::updateScrollCoordinationForThisFrame(ScrollingNodeID parentNodeID)
</span><span class="cx"> {
</span><span class="cx"> ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator();
</span><del>- ASSERT(scrollingCoordinator->coordinatesScrollingForFrameView(&m_renderView.frameView()));
</del><ins>+ ASSERT(scrollingCoordinator->coordinatesScrollingForFrameView(m_renderView.frameView()));
</ins><span class="cx">
</span><span class="cx"> ScrollingNodeID nodeID = attachScrollingNode(*m_renderView.layer(), FrameScrollingNode, parentNodeID);
</span><span class="cx"> scrollingCoordinator->updateFrameScrollingNode(nodeID, m_scrollLayer.get(), m_rootContentLayer.get(), fixedRootBackgroundLayer(), clipLayer());
</span><span class="lines">@@ -3825,7 +3825,7 @@
</span><span class="cx"> void RenderLayerCompositor::updateScrollCoordinatedLayer(RenderLayer& layer, ScrollCoordinationReasons reasons)
</span><span class="cx"> {
</span><span class="cx"> ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator();
</span><del>- if (!scrollingCoordinator || !scrollingCoordinator->coordinatesScrollingForFrameView(&m_renderView.frameView()))
</del><ins>+ if (!scrollingCoordinator || !scrollingCoordinator->coordinatesScrollingForFrameView(m_renderView.frameView()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool isRootLayer = &layer == m_renderView.layer();
</span><span class="lines">@@ -4019,7 +4019,7 @@
</span><span class="cx"> backing.detachFromScrollingCoordinator();
</span><span class="cx">
</span><span class="cx"> // For Coordinated Graphics.
</span><del>- scrollingCoordinator->scrollableAreaScrollLayerDidChange(&layer);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4044,7 +4044,7 @@
</span><span class="cx">
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator()) {
</span><span class="cx"> // For Coordinated Graphics.
</span><del>- scrollingCoordinator->scrollableAreaScrollLayerDidChange(&layer);
</del><ins>+ scrollingCoordinator->scrollableAreaScrollLayerDidChange(layer);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -1771,7 +1771,7 @@
</span><span class="cx"> if (!page)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return page->nonFastScrollableRects(document->frame());
</del><ins>+ return page->nonFastScrollableRects(*document->frame());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::garbageCollectDocumentResources(ExceptionCode& ec) const
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-29 Simon Fraser <simon.fraser@apple.com>
+
+ Convert arguments to ScrollingCoordinator functions to references
+ https://bugs.webkit.org/show_bug.cgi?id=143198
+
+ Reviewed by Darin Adler.
+
+ Convert all the FrameView* and ScrollableArea* arguments to ScrollingCoordinator functions to
+ references, and use references in a few other places.
+
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.h:
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
+ (WebKit::RemoteScrollingCoordinator::coordinatesScrollingForFrameView):
+
</ins><span class="cx"> 2015-03-29 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] WKContentView should implement _selectionClipRect
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> virtual bool isRemoteScrollingCoordinator() const override { return true; }
</span><span class="cx">
</span><span class="cx"> // ScrollingCoordinator
</span><del>- virtual bool coordinatesScrollingForFrameView(WebCore::FrameView*) const override;
</del><ins>+ virtual bool coordinatesScrollingForFrameView(const WebCore::FrameView&) const override;
</ins><span class="cx"> virtual void scheduleTreeStateCommit() override;
</span><span class="cx">
</span><span class="cx"> virtual bool isRubberBandInProgress() const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm (182131 => 182132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2015-03-30 03:12:23 UTC (rev 182131)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2015-03-30 04:13:45 UTC (rev 182132)
</span><span class="lines">@@ -67,9 +67,9 @@
</span><span class="cx"> m_webPage->drawingArea()->scheduleCompositingLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RemoteScrollingCoordinator::coordinatesScrollingForFrameView(FrameView* frameView) const
</del><ins>+bool RemoteScrollingCoordinator::coordinatesScrollingForFrameView(const FrameView& frameView) const
</ins><span class="cx"> {
</span><del>- RenderView* renderView = frameView->renderView();
</del><ins>+ RenderView* renderView = frameView.renderView();
</ins><span class="cx"> return renderView && renderView->usesCompositing();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>