<!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>[200342] 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/200342">200342</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-05-02 15:19:29 -0700 (Mon, 02 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix shouldUpdateScrollLayerPositionSynchronously() for non-main frames. Remove updatesScrollLayerPositionOnMainThread()
https://bugs.webkit.org/show_bug.cgi?id=157277
Reviewed by Dean Jackson, Tim Horton.
Source/WebCore:
shouldUpdateScrollLayerPositionSynchronously() gave an answer for the main frame even if
called for a subframe. This could have caused scroll snapping, and isRubberBandInProgress()
to give wrong answers sometimes. Fix by passing in the FrameView.
I was unable to easily come up with a testcase to detect the incorrect behavior.
Remove updatesScrollLayerPositionOnMainThread() which is unused by all ports.
* page/FrameView.cpp:
(WebCore::FrameView::isScrollSnapInProgress):
(WebCore::FrameView::shouldUpdateCompositingLayersAfterScrolling):
(WebCore::FrameView::isRubberBandInProgress):
(WebCore::FrameView::updatesScrollLayerPositionOnMainThread): Deleted.
* page/FrameView.h:
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::updateSynchronousScrollingReasons):
(WebCore::ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously):
* page/scrolling/ScrollingCoordinator.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::updateTiledScrollingIndicator):
* platform/ScrollableArea.h:
* platform/win/PopupMenuWin.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::setupFontSubpixelQuantization):
* rendering/RenderLayer.h:
* rendering/RenderListBox.h:
Source/WebKit2:
Remove updatesScrollLayerPositionOnMainThread() which is unused by all ports.
* WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.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="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinPopupMenuWinh">trunk/Source/WebCore/platform/win/PopupMenuWin.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxh">trunk/Source/WebCore/rendering/RenderListBox.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/ChangeLog 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2016-05-02 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Fix shouldUpdateScrollLayerPositionSynchronously() for non-main frames. Remove updatesScrollLayerPositionOnMainThread()
+ https://bugs.webkit.org/show_bug.cgi?id=157277
+
+ Reviewed by Dean Jackson, Tim Horton.
+
+ shouldUpdateScrollLayerPositionSynchronously() gave an answer for the main frame even if
+ called for a subframe. This could have caused scroll snapping, and isRubberBandInProgress()
+ to give wrong answers sometimes. Fix by passing in the FrameView.
+
+ I was unable to easily come up with a testcase to detect the incorrect behavior.
+
+ Remove updatesScrollLayerPositionOnMainThread() which is unused by all ports.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::isScrollSnapInProgress):
+ (WebCore::FrameView::shouldUpdateCompositingLayersAfterScrolling):
+ (WebCore::FrameView::isRubberBandInProgress):
+ (WebCore::FrameView::updatesScrollLayerPositionOnMainThread): Deleted.
+ * page/FrameView.h:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::updateSynchronousScrollingReasons):
+ (WebCore::ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously):
+ * page/scrolling/ScrollingCoordinator.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::updateTiledScrollingIndicator):
+ * platform/ScrollableArea.h:
+ * platform/win/PopupMenuWin.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::setupFontSubpixelQuantization):
+ * rendering/RenderLayer.h:
+ * rendering/RenderListBox.h:
+
+2016-05-02 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Add to the Animations log channel output about which properties are being blended
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157271
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/page/FrameView.cpp 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> // ScrollingCoordinator::isScrollSnapInProgress().
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
</span><del>- if (!scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously())
</del><ins>+ if (!scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously(*this))
</ins><span class="cx"> return scrollingCoordinator->isScrollSnapInProgress();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2307,7 +2307,7 @@
</span><span class="cx"> if (!scrollingCoordinator->supportsFixedPositionLayers())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously())
</del><ins>+ if (scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously(*this))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (inProgrammaticScroll())
</span><span class="lines">@@ -2340,7 +2340,7 @@
</span><span class="cx"> // ScrollingCoordinator::isRubberBandInProgress().
</span><span class="cx"> if (Page* page = frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator()) {
</span><del>- if (!scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously())
</del><ins>+ if (!scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously(*this))
</ins><span class="cx"> return scrollingCoordinator->isRubberBandInProgress();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3527,16 +3527,6 @@
</span><span class="cx"> return page && page->focusController().isActive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FrameView::updatesScrollLayerPositionOnMainThread() const
-{
- if (Page* page = frame().page()) {
- if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
- return scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously();
- }
-
- return true;
-}
-
</del><span class="cx"> bool FrameView::forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const
</span><span class="cx"> {
</span><span class="cx"> Page* page = frame().page();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/page/FrameView.h 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -486,7 +486,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool isActive() const override;
</span><del>- bool updatesScrollLayerPositionOnMainThread() const override;
</del><span class="cx"> bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -347,7 +347,7 @@
</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(const 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><span class="lines">@@ -367,10 +367,11 @@
</span><span class="cx"> updateSynchronousScrollingReasons(*frameView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously() const
</del><ins>+bool ScrollingCoordinator::shouldUpdateScrollLayerPositionSynchronously(const FrameView& frameView) const
</ins><span class="cx"> {
</span><del>- if (FrameView* frameView = m_page->mainFrame().view())
- return synchronousScrollingReasons(*frameView);
</del><ins>+ if (&frameView == m_page->mainFrame().view())
+ return synchronousScrollingReasons(frameView);
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> SynchronousScrollingReasons synchronousScrollingReasons(const FrameView&) const;
</span><del>- bool shouldUpdateScrollLayerPositionSynchronously() const;
</del><ins>+ bool shouldUpdateScrollLayerPositionSynchronously(const FrameView&) const;
</ins><span class="cx">
</span><span class="cx"> virtual void willDestroyScrollableArea(ScrollableArea&) { }
</span><span class="cx"> virtual void scrollableAreaScrollLayerDidChange(ScrollableArea&) { }
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> virtual void setSynchronousScrollingReasons(SynchronousScrollingReasons) { }
</span><span class="cx">
</span><span class="cx"> virtual bool hasVisibleSlowRepaintViewportConstrainedObjects(const FrameView&) const;
</span><del>- void updateSynchronousScrollingReasons(FrameView&);
</del><ins>+ void updateSynchronousScrollingReasons(const FrameView&);
</ins><span class="cx">
</span><span class="cx"> Region absoluteNonFastScrollableRegionForFrame(const Frame&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ScrollingModeIndication indicatorMode;
</span><del>- if (shouldUpdateScrollLayerPositionSynchronously())
</del><ins>+ if (shouldUpdateScrollLayerPositionSynchronously(*frameView))
</ins><span class="cx"> indicatorMode = SynchronousScrollingBecauseOfStyleIndication;
</span><span class="cx"> else
</span><span class="cx"> indicatorMode = AsyncScrollingIndication;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -155,8 +155,6 @@
</span><span class="cx"> virtual IntRect scrollCornerRect() const = 0;
</span><span class="cx"> WEBCORE_EXPORT virtual void invalidateScrollCorner(const IntRect&);
</span><span class="cx">
</span><del>- virtual bool updatesScrollLayerPositionOnMainThread() const = 0;
-
</del><span class="cx"> virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const = 0;
</span><span class="cx">
</span><span class="cx"> // Convert points and rects between the scrollbar and its containing view.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.h (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.h 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.h 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -106,7 +106,6 @@
</span><span class="cx"> IntSize visibleSize() const override;
</span><span class="cx"> IntSize contentsSize() const override;
</span><span class="cx"> IntRect scrollableAreaBoundingBox(bool* = nullptr) const override;
</span><del>- bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</del><span class="cx"> bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override { return false; }
</span><span class="cx"> bool shouldPlaceBlockDirectionScrollbarOnLeft() const final { return false; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -4024,7 +4024,7 @@
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> if (Page* page = renderer().frame().page()) {
</span><span class="cx"> if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
</span><del>- scrollingOnMainThread = scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously();
</del><ins>+ scrollingOnMainThread = scrollingCoordinator->shouldUpdateScrollLayerPositionSynchronously(renderer().view().frameView());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -883,7 +883,6 @@
</span><span class="cx"> bool shouldSuspendScrollAnimations() const override;
</span><span class="cx"> IntRect scrollableAreaBoundingBox(bool* isInsideFixed = nullptr) const override;
</span><span class="cx"> bool isRubberBandInProgress() const override;
</span><del>- bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</del><span class="cx"> bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> bool isScrollSnapInProgress() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -131,7 +131,6 @@
</span><span class="cx"> IntPoint lastKnownMousePosition() const override;
</span><span class="cx"> bool isHandlingWheelEvent() const override;
</span><span class="cx"> bool shouldSuspendScrollAnimations() const override;
</span><del>- bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</del><span class="cx"> bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</span><span class="cx">
</span><span class="cx"> ScrollableArea* enclosingScrollableArea() const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-02 Simon Fraser <simon.fraser@apple.com>
+
+ Fix shouldUpdateScrollLayerPositionSynchronously() for non-main frames. Remove updatesScrollLayerPositionOnMainThread()
+ https://bugs.webkit.org/show_bug.cgi?id=157277
+
+ Reviewed by Dean Jackson, Tim Horton.
+
+ Remove updatesScrollLayerPositionOnMainThread() which is unused by all ports.
+
+ * WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h:
+
</ins><span class="cx"> 2016-05-02 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Crash if a certificate chain has null certificates
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFDeprecatedPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h (200341 => 200342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h 2016-05-02 22:19:23 UTC (rev 200341)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/DeprecatedPDFPlugin.h 2016-05-02 22:19:29 UTC (rev 200342)
</span><span class="lines">@@ -213,7 +213,6 @@
</span><span class="cx"> WebCore::IntRect convertFromContainingViewToScrollbar(const WebCore::Scrollbar&, const WebCore::IntRect& parentRect) const override;
</span><span class="cx"> WebCore::IntPoint convertFromScrollbarToContainingView(const WebCore::Scrollbar&, const WebCore::IntPoint& scrollbarPoint) const override;
</span><span class="cx"> WebCore::IntPoint convertFromContainingViewToScrollbar(const WebCore::Scrollbar&, const WebCore::IntPoint& parentPoint) const override;
</span><del>- bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</del><span class="cx"> bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</span><span class="cx">
</span><span class="cx"> // PDFPlugin functions.
</span></span></pre>
</div>
</div>
</body>
</html>