<!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>[170972] 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/170972">170972</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-07-10 13:04:42 -0700 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need Setting/WKPreference that allows clients to prevent scrollbars from drawing
on a secondary thread
https://bugs.webkit.org/show_bug.cgi?id=134778
-and corresponding-
<rdar://problem/17595333>
Reviewed by Tim Horton.
Source/WebCore:
This is a requirement for some types of performance tests. The patch adds a new
virtual function to ScrollableArea that forces subclasses to indicate the value of
the Setting. This is required because Scrollbar and ScrollableArea can’t get to
Settings on their own.
* page/FrameView.cpp:
(WebCore::FrameView::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
* page/FrameView.h:
* page/Settings.in:
* platform/ScrollableArea.h:
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::supportsUpdateOnSecondaryThread):
* platform/win/PopupMenuWin.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
* rendering/RenderLayer.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
* rendering/RenderListBox.h:
Source/WebKit2:
This is a requirement for some types of performance tests.
New pref.
* Shared/WebPreferencesDefinitions.h:
PDFPlugin has to implement this new ScrollableArea virtual function to indicate
the Setting’s value.
* WebProcess/Plugins/PDF/PDFPlugin.h:
* WebProcess/Plugins/PDF/PDFPlugin.mm:
(WebKit::PDFPlugin::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
New pref.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</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="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreah">trunk/Source/WebCore/platform/ScrollableArea.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollbarcpp">trunk/Source/WebCore/platform/Scrollbar.cpp</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="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</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="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/ChangeLog 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-07-10 Beth Dakin <bdakin@apple.com>
+
+ Need Setting/WKPreference that allows clients to prevent scrollbars from drawing
+ on a secondary thread
+ https://bugs.webkit.org/show_bug.cgi?id=134778
+ -and corresponding-
+ <rdar://problem/17595333>
+
+ Reviewed by Tim Horton.
+
+ This is a requirement for some types of performance tests. The patch adds a new
+ virtual function to ScrollableArea that forces subclasses to indicate the value of
+ the Setting. This is required because Scrollbar and ScrollableArea can’t get to
+ Settings on their own.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
+ * page/FrameView.h:
+ * page/Settings.in:
+ * platform/ScrollableArea.h:
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::supportsUpdateOnSecondaryThread):
+ * platform/win/PopupMenuWin.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
+ * rendering/RenderLayer.h:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
+ * rendering/RenderListBox.h:
+
</ins><span class="cx"> 2014-07-10 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Phone number highlights should always be visible if the mouse hovers over.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/page/FrameView.cpp 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -3152,6 +3152,12 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool FrameView::forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const
+{
+ Page* page = frame().page();
+ return page && page->settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();
+}
+
</ins><span class="cx"> void FrameView::scrollTo(const IntSize& newOffset)
</span><span class="cx"> {
</span><span class="cx"> LayoutSize offset = scrollOffset();
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/page/FrameView.h 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -452,6 +452,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool isActive() const override;
</span><span class="cx"> virtual bool updatesScrollLayerPositionOnMainThread() const override;
</span><ins>+ virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(RUBBER_BANDING)
</span><span class="cx"> GraphicsLayer* setWantsLayerForTopOverHangArea(bool) const;
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/page/Settings.in 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -134,6 +134,7 @@
</span><span class="cx"> scrollingCoordinatorEnabled initial=false
</span><span class="cx"> scrollingTreeIncludesFrames initial=defaultScrollingTreeIncludesFrames
</span><span class="cx"> scrollAnimatorEnabled initial=true, conditional=SMOOTH_SCROLLING
</span><ins>+forceUpdateScrollbarsOnMainThreadForPerformanceTesting initial=false
</ins><span class="cx"> notificationsEnabled initial=true
</span><span class="cx">
</span><span class="cx"> # Some apps needs isLoadingInAPISense to account for active subresource loaders.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.h (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.h 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/platform/ScrollableArea.h 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -125,6 +125,8 @@
</span><span class="cx">
</span><span class="cx"> virtual bool updatesScrollLayerPositionOnMainThread() const = 0;
</span><span class="cx">
</span><ins>+ virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const = 0;
+
</ins><span class="cx"> // Convert points and rects between the scrollbar and its containing view.
</span><span class="cx"> // The client needs to implement these in order to be aware of layout effects
</span><span class="cx"> // like CSS transforms.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Scrollbar.cpp (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Scrollbar.cpp 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/platform/Scrollbar.cpp 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -551,7 +551,8 @@
</span><span class="cx"> // It's unfortunate that this needs to be done with an ifdef. Ideally there would be a way to feature-detect
</span><span class="cx"> // the necessary support within AppKit.
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>- return m_scrollableArea->hasLayerForVerticalScrollbar() || m_scrollableArea->hasLayerForHorizontalScrollbar();
</del><ins>+ return !m_scrollableArea->forceUpdateScrollbarsOnMainThreadForPerformanceTesting()
+ && (m_scrollableArea->hasLayerForVerticalScrollbar() || m_scrollableArea->hasLayerForHorizontalScrollbar());
</ins><span class="cx"> #else
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinPopupMenuWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/PopupMenuWin.h (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/PopupMenuWin.h 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/platform/win/PopupMenuWin.h 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx"> virtual IntSize contentsSize() const override;
</span><span class="cx"> virtual IntRect scrollableAreaBoundingBox() const override;
</span><span class="cx"> virtual bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</span><ins>+ virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override { return false; }
</ins><span class="cx">
</span><span class="cx"> // NOTE: This should only be called by the overriden setScrollOffset from ScrollableArea.
</span><span class="cx"> void scrollTo(int offset);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -1361,6 +1361,12 @@
</span><span class="cx"> return renderer().absoluteBoundingBoxRect();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RenderLayer::forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const
+{
+ Page* page = renderer().frame().page();
+ return page && page->settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();
+}
+
</ins><span class="cx"> RenderLayer* RenderLayer::enclosingTransformedAncestor() const
</span><span class="cx"> {
</span><span class="cx"> RenderLayer* curr = parent();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -1082,6 +1082,7 @@
</span><span class="cx"> virtual bool shouldSuspendScrollAnimations() const override;
</span><span class="cx"> virtual IntRect scrollableAreaBoundingBox() const override;
</span><span class="cx"> virtual bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</span><ins>+ virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> void registerAsTouchEventListenerForScrolling();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "Scrollbar.h"
</span><span class="cx"> #include "ScrollbarTheme.h"
</span><ins>+#include "Settings.h"
</ins><span class="cx"> #include "SpatialNavigation.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include <math.h>
</span><span class="lines">@@ -774,6 +775,12 @@
</span><span class="cx"> return view().frameView().shouldSuspendScrollAnimations();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool RenderListBox::forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const
+{
+ Page* page = frame().page();
+ return page && page->settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();
+}
+
</ins><span class="cx"> ScrollableArea* RenderListBox::enclosingScrollableArea() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Return a RenderLayer that's scrollable.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.h (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.h 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebCore/rendering/RenderListBox.h 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -127,6 +127,7 @@
</span><span class="cx"> virtual bool isHandlingWheelEvent() const override;
</span><span class="cx"> virtual bool shouldSuspendScrollAnimations() const override;
</span><span class="cx"> virtual bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</span><ins>+ virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const override;
</ins><span class="cx">
</span><span class="cx"> virtual ScrollableArea* enclosingScrollableArea() const override;
</span><span class="cx"> virtual IntRect scrollableAreaBoundingBox() const override;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-07-10 Beth Dakin <bdakin@apple.com>
+
+ Need Setting/WKPreference that allows clients to prevent scrollbars from drawing
+ on a secondary thread
+ https://bugs.webkit.org/show_bug.cgi?id=134778
+ -and corresponding-
+ <rdar://problem/17595333>
+
+ Reviewed by Tim Horton.
+
+ This is a requirement for some types of performance tests.
+
+ New pref.
+ * Shared/WebPreferencesDefinitions.h:
+
+ PDFPlugin has to implement this new ScrollableArea virtual function to indicate
+ the Setting’s value.
+ * WebProcess/Plugins/PDF/PDFPlugin.h:
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::forceUpdateScrollbarsOnMainThreadForPerformanceTesting):
+
+ New pref.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2014-07-10 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Frequent assertion failures when swiping back
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -162,6 +162,7 @@
</span><span class="cx"> macro(InteractiveFormValidationEnabled, interactiveFormValidationEnabled, Bool, bool, false) \
</span><span class="cx"> macro(ScrollingPerformanceLoggingEnabled, scrollingPerformanceLoggingEnabled, Bool, bool, false) \
</span><span class="cx"> macro(ScrollAnimatorEnabled, scrollAnimatorEnabled, Bool, bool, DEFAULT_WEBKIT_SCROLL_ANIMATOR_ENABLED) \
</span><ins>+ macro(ForceUpdateScrollbarsOnMainThreadForPerformanceTesting, forceUpdateScrollbarsOnMainThreadForPerformanceTesting, Bool, bool, false) \
</ins><span class="cx"> macro(ScreenFontSubstitutionEnabled, screenFontSubstitutionEnabled, Bool, bool, DEFAULT_SCREEN_FONT_SUBSTITUTION_ENABLED) \
</span><span class="cx"> macro(CookieEnabled, cookieEnabled, Bool, bool, true) \
</span><span class="cx"> macro(PlugInSnapshottingEnabled, plugInSnapshottingEnabled, Bool, bool, false) \
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.h 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> virtual WebCore::IntPoint convertFromScrollbarToContainingView(const WebCore::Scrollbar*, const WebCore::IntPoint& scrollbarPoint) const override;
</span><span class="cx"> virtual WebCore::IntPoint convertFromContainingViewToScrollbar(const WebCore::Scrollbar*, const WebCore::IntPoint& parentPoint) const override;
</span><span class="cx"> virtual bool updatesScrollLayerPositionOnMainThread() const override { return true; }
</span><ins>+ virtual bool forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const;
</ins><span class="cx">
</span><span class="cx"> // PDFPlugin functions.
</span><span class="cx"> void updateScrollbars();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> #import <WebCore/PluginDocument.h>
</span><span class="cx"> #import <WebCore/RenderBoxModelObject.h>
</span><span class="cx"> #import <WebCore/ScrollbarTheme.h>
</span><ins>+#import <WebCore/Settings.h>
</ins><span class="cx"> #import <WebCore/UUID.h>
</span><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx"> #import <wtf/CurrentTime.h>
</span><span class="lines">@@ -748,6 +749,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool PDFPlugin::forceUpdateScrollbarsOnMainThreadForPerformanceTesting() const
+{
+ if (Frame* coreFrame = m_frame->coreFrame()) {
+ if (Page* page = coreFrame->page())
+ return page->settings().forceUpdateScrollbarsOnMainThreadForPerformanceTesting();
+ }
+
+ return false;
+}
+
</ins><span class="cx"> int PDFPlugin::scrollPosition(Scrollbar* scrollbar) const
</span><span class="cx"> {
</span><span class="cx"> if (scrollbar->orientation() == HorizontalScrollbar)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (170971 => 170972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-10 19:31:54 UTC (rev 170971)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-10 20:04:42 UTC (rev 170972)
</span><span class="lines">@@ -2637,6 +2637,7 @@
</span><span class="cx"> #if ENABLE(SMOOTH_SCROLLING)
</span><span class="cx"> settings.setScrollAnimatorEnabled(store.getBoolValueForKey(WebPreferencesKey::scrollAnimatorEnabledKey()));
</span><span class="cx"> #endif
</span><ins>+ settings.setForceUpdateScrollbarsOnMainThreadForPerformanceTesting(store.getBoolValueForKey(WebPreferencesKey::forceUpdateScrollbarsOnMainThreadForPerformanceTestingKey()));
</ins><span class="cx"> settings.setInteractiveFormValidationEnabled(store.getBoolValueForKey(WebPreferencesKey::interactiveFormValidationEnabledKey()));
</span><span class="cx"> settings.setSpatialNavigationEnabled(store.getBoolValueForKey(WebPreferencesKey::spatialNavigationEnabledKey()));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>