<!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>[178723] 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/178723">178723</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 10:40:33 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a way to collect scrolling performance data (viewport tile coverage) with UI-side compositing
https://bugs.webkit.org/show_bug.cgi?id=140474
Reviewed by Tim Horton.
Source/WebCore:
Add accessors for standard names for container CALayer for each of the tile grids,
and when tile grids are swapped, update those names as appropriate.
* WebCore.exp.in:
* platform/graphics/ca/TileController.cpp:
(WebCore::TileController::tileGridContainerLayerName):
(WebCore::TileController::zoomedOutTileGridContainerLayerName):
(WebCore::TileController::setContentsScale):
* platform/graphics/ca/TileController.h:
* platform/graphics/ca/TileGrid.cpp:
(WebCore::TileGrid::TileGrid):
(WebCore::TileGrid::setIsZoomedOutTileGrid):
* platform/graphics/ca/TileGrid.h:
Source/WebKit2:
Add a private method to enable scrolling data collection to WKWebView. When enabled, create
a RemoteLayerTreeScrollingPerformanceData object that collects "blank pixel" data on
every layer tree commit and scroll, and stores them in a vector. A second SPI call
allows retrieval of an NSArray of this data.
To allow RemoteLayerTreeScrollingPerformanceData to find the correct layer which
contains the main tile grid, we set a layer name on the appropriate layer (even
in release builds).
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView visibleRectInScreenCoordinates]):
(-[WKWebView _didCommitLayerTree:]):
(-[WKWebView scrollViewDidScroll:]):
(-[WKWebView _setScrollPerformanceDataCollectionEnabled:]):
(-[WKWebView _scrollPerformanceDataCollectionEnabled]):
(-[WKWebView _scrollPerformanceData]):
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.h: Added.
(WebKit::RemoteLayerTreeScrollingPerformanceData::BlankPixelCount::BlankPixelCount):
* UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm: Added.
(WebKit::RemoteLayerTreeScrollingPerformanceData::RemoteLayerTreeScrollingPerformanceData):
(WebKit::RemoteLayerTreeScrollingPerformanceData::~RemoteLayerTreeScrollingPerformanceData):
(WebKit::RemoteLayerTreeScrollingPerformanceData::didCommitLayerTree):
(WebKit::RemoteLayerTreeScrollingPerformanceData::didScroll):
(WebKit::RemoteLayerTreeScrollingPerformanceData::BlankPixelCount::canCoalesce):
(WebKit::RemoteLayerTreeScrollingPerformanceData::appendBlankPixelCount):
(WebKit::RemoteLayerTreeScrollingPerformanceData::data):
(WebKit::findTileGridContainerLayer):
(WebKit::RemoteLayerTreeScrollingPerformanceData::blankPixelCount):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setScrollPerformanceDataCollectionEnabled):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::scrollPerformanceDataCollectionEnabled):
(WebKit::WebPageProxy::scrollingPerformanceData):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllercpp">trunk/Source/WebCore/platform/graphics/ca/TileController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileControllerh">trunk/Source/WebCore/platform/graphics/ca/TileController.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileGridcpp">trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscaTileGridh">trunk/Source/WebCore/platform/graphics/ca/TileGrid.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessCocoaRemoteLayerTreeScrollingPerformanceDatah">trunk/Source/WebKit2/UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaRemoteLayerTreeScrollingPerformanceDatamm">trunk/Source/WebKit2/UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebCore/ChangeLog 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-19 Simon Fraser <simon.fraser@apple.com>
+
+ Add a way to collect scrolling performance data (viewport tile coverage) with UI-side compositing
+ https://bugs.webkit.org/show_bug.cgi?id=140474
+
+ Reviewed by Tim Horton.
+
+ Add accessors for standard names for container CALayer for each of the tile grids,
+ and when tile grids are swapped, update those names as appropriate.
+
+ * WebCore.exp.in:
+ * platform/graphics/ca/TileController.cpp:
+ (WebCore::TileController::tileGridContainerLayerName):
+ (WebCore::TileController::zoomedOutTileGridContainerLayerName):
+ (WebCore::TileController::setContentsScale):
+ * platform/graphics/ca/TileController.h:
+ * platform/graphics/ca/TileGrid.cpp:
+ (WebCore::TileGrid::TileGrid):
+ (WebCore::TileGrid::setIsZoomedOutTileGrid):
+ * platform/graphics/ca/TileGrid.h:
+
</ins><span class="cx"> 2015-01-20 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix unused-private-field warning in IconEfl.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -478,6 +478,7 @@
</span><span class="cx"> __ZN7WebCore14TileController21setNeedsDisplayInRectERKNS_7IntRectE
</span><span class="cx"> __ZN7WebCore14TileController23setTileDebugBorderColorENS_5ColorE
</span><span class="cx"> __ZN7WebCore14TileController23setTileDebugBorderWidthEf
</span><ins>+__ZN7WebCore14TileController26tileGridContainerLayerNameEv
</ins><span class="cx"> __ZN7WebCore14TileController27tileCacheLayerBoundsChangedEv
</span><span class="cx"> __ZN7WebCore14TileControllerC1EPNS_15PlatformCALayerE
</span><span class="cx"> __ZN7WebCore14areRangesEqualEPKNS_5RangeES2_
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.cpp (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.cpp 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -40,6 +40,16 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+String TileController::tileGridContainerLayerName()
+{
+ return ASCIILiteral("TileGrid Container Layer");
+}
+
+String TileController::zoomedOutTileGridContainerLayerName()
+{
+ return ASCIILiteral("Zoomed Out TileGrid Container Layer");
+}
+
</ins><span class="cx"> TileController::TileController(PlatformCALayer* rootPlatformLayer)
</span><span class="cx"> : m_tileCacheLayer(rootPlatformLayer)
</span><span class="cx"> , m_tileGrid(std::make_unique<TileGrid>(*this))
</span><span class="lines">@@ -113,12 +123,14 @@
</span><span class="cx">
</span><span class="cx"> if (m_zoomedOutTileGrid && m_zoomedOutTileGrid->scale() == scale) {
</span><span class="cx"> m_tileGrid = WTF::move(m_zoomedOutTileGrid);
</span><ins>+ m_tileGrid->setIsZoomedOutTileGrid(false);
</ins><span class="cx"> m_tileGrid->revalidateTiles(0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_zoomedOutContentsScale && m_zoomedOutContentsScale == tileGrid().scale() && tileGrid().scale() != scale && !m_hasTilesWithTemporaryScaleFactor) {
</span><span class="cx"> m_zoomedOutTileGrid = WTF::move(m_tileGrid);
</span><ins>+ m_zoomedOutTileGrid->setIsZoomedOutTileGrid(true);
</ins><span class="cx"> m_tileGrid = std::make_unique<TileGrid>(*this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileController.h (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileController.h 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebCore/platform/graphics/ca/TileController.h 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -54,6 +54,9 @@
</span><span class="cx"> public:
</span><span class="cx"> WEBCORE_EXPORT explicit TileController(PlatformCALayer*);
</span><span class="cx"> ~TileController();
</span><ins>+
+ static String tileGridContainerLayerName();
+ static String zoomedOutTileGridContainerLayerName();
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void tileCacheLayerBoundsChanged();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileGridcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebCore/platform/graphics/ca/TileGrid.cpp 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -45,9 +45,7 @@
</span><span class="cx"> , m_scale(1)
</span><span class="cx"> , m_cohortRemovalTimer(*this, &TileGrid::cohortRemovalTimerFired)
</span><span class="cx"> {
</span><del>-#ifndef NDEBUG
- m_containerLayer.get().setName("TileGrid Container Layer");
-#endif
</del><ins>+ m_containerLayer.get().setName(TileController::tileGridContainerLayerName());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TileGrid::~TileGrid()
</span><span class="lines">@@ -58,6 +56,14 @@
</span><span class="cx"> tile.layer->setOwner(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TileGrid::setIsZoomedOutTileGrid(bool isZoomedOutGrid)
+{
+ if (isZoomedOutGrid)
+ m_containerLayer.get().setName(TileController::zoomedOutTileGridContainerLayerName());
+ else
+ m_containerLayer.get().setName(TileController::tileGridContainerLayerName());
+}
+
</ins><span class="cx"> void TileGrid::setScale(float scale)
</span><span class="cx"> {
</span><span class="cx"> m_scale = scale;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscaTileGridh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ca/TileGrid.h (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ca/TileGrid.h 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebCore/platform/graphics/ca/TileGrid.h 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx">
</span><span class="cx"> PlatformCALayer& containerLayer() { return m_containerLayer; }
</span><span class="cx">
</span><ins>+ void setIsZoomedOutTileGrid(bool);
+
</ins><span class="cx"> void setScale(float);
</span><span class="cx"> float scale() const { return m_scale; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2015-01-19 Simon Fraser <simon.fraser@apple.com>
+
+ Add a way to collect scrolling performance data (viewport tile coverage) with UI-side compositing
+ https://bugs.webkit.org/show_bug.cgi?id=140474
+
+ Reviewed by Tim Horton.
+
+ Add a private method to enable scrolling data collection to WKWebView. When enabled, create
+ a RemoteLayerTreeScrollingPerformanceData object that collects "blank pixel" data on
+ every layer tree commit and scroll, and stores them in a vector. A second SPI call
+ allows retrieval of an NSArray of this data.
+
+ To allow RemoteLayerTreeScrollingPerformanceData to find the correct layer which
+ contains the main tile grid, we set a layer name on the appropriate layer (even
+ in release builds).
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView visibleRectInScreenCoordinates]):
+ (-[WKWebView _didCommitLayerTree:]):
+ (-[WKWebView scrollViewDidScroll:]):
+ (-[WKWebView _setScrollPerformanceDataCollectionEnabled:]):
+ (-[WKWebView _scrollPerformanceDataCollectionEnabled]):
+ (-[WKWebView _scrollPerformanceData]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.h: Added.
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::BlankPixelCount::BlankPixelCount):
+ * UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm: Added.
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::RemoteLayerTreeScrollingPerformanceData):
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::~RemoteLayerTreeScrollingPerformanceData):
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::didCommitLayerTree):
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::didScroll):
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::BlankPixelCount::canCoalesce):
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::appendBlankPixelCount):
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::data):
+ (WebKit::findTileGridContainerLayer):
+ (WebKit::RemoteLayerTreeScrollingPerformanceData::blankPixelCount):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::setScrollPerformanceDataCollectionEnabled):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::scrollPerformanceDataCollectionEnabled):
+ (WebKit::WebPageProxy::scrollingPerformanceData):
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-01-19 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Support "plus-darker" in mix-blend mode
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "FindClient.h"
</span><span class="cx"> #import "LegacySessionStateCoding.h"
</span><span class="cx"> #import "NavigationState.h"
</span><ins>+#import "RemoteLayerTreeScrollingPerformanceData.h"
</ins><span class="cx"> #import "RemoteLayerTreeTransaction.h"
</span><span class="cx"> #import "RemoteObjectRegistry.h"
</span><span class="cx"> #import "RemoteObjectRegistryMessages.h"
</span><span class="lines">@@ -848,6 +849,15 @@
</span><span class="cx"> scrollView.contentOffset = contentOffsetBoundedInValidRange(scrollView, contentOffset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WebCore::FloatRect)visibleRectInViewCoordinates
+{
+ WebCore::FloatRect bounds = self.bounds;
+ bounds.moveBy([_scrollView contentOffset]);
+ WebCore::FloatRect contentViewBounds = [_contentView bounds];
+ bounds.intersect(contentViewBounds);
+ return bounds;
+}
+
</ins><span class="cx"> // WebCore stores the page scale factor as float instead of double. When we get a scale from WebCore,
</span><span class="cx"> // we need to ignore differences that are within a small rounding error on floats.
</span><span class="cx"> static inline bool areEssentiallyEqualAsFloat(float a, float b)
</span><span class="lines">@@ -918,6 +928,9 @@
</span><span class="cx"> }
</span><span class="cx"> [self _updateVisibleContentRects];
</span><span class="cx"> }
</span><ins>+
+ if (WebKit::RemoteLayerTreeScrollingPerformanceData* scrollPerfData = _page->scrollingPerformanceData())
+ scrollPerfData->didCommitLayerTree([self visibleRectInViewCoordinates]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_dynamicViewportUpdateChangedTargetToScale:(double)newScale position:(CGPoint)newScrollPosition nextValidLayerTreeTransactionID:(uint64_t)nextValidLayerTreeTransactionID
</span><span class="lines">@@ -1376,6 +1389,9 @@
</span><span class="cx"> [_customContentView scrollViewDidScroll:(UIScrollView *)scrollView];
</span><span class="cx">
</span><span class="cx"> [self _updateVisibleContentRects];
</span><ins>+
+ if (WebKit::RemoteLayerTreeScrollingPerformanceData* scrollPerfData = _page->scrollingPerformanceData())
+ scrollPerfData->didScroll([self visibleRectInViewCoordinates]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)scrollViewDidZoom:(UIScrollView *)scrollView
</span><span class="lines">@@ -2114,6 +2130,27 @@
</span><span class="cx"> return _page->isShowingNavigationGestureSnapshot();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark scrollperf methods
+
+- (void)_setScrollPerformanceDataCollectionEnabled:(BOOL)enabled
+{
+ _page->setScrollPerformanceDataCollectionEnabled(enabled);
+}
+
+- (BOOL)_scrollPerformanceDataCollectionEnabled
+{
+ return _page->scrollPerformanceDataCollectionEnabled();
+}
+
+- (NSArray *)_scrollPerformanceData
+{
+#if PLATFORM(IOS)
+ if (WebKit::RemoteLayerTreeScrollingPerformanceData* scrollPefData = _page->scrollingPerformanceData())
+ return scrollPefData->data();
+#endif
+ return nil;
+}
+
</ins><span class="cx"> #pragma mark iOS-specific methods
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -186,6 +186,9 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly, getter=_isDisplayingStandaloneImageDocument) BOOL _displayingStandaloneImageDocument;
</span><span class="cx">
</span><ins>+@property (nonatomic, setter=_setScrollPerformanceDataCollectionEnabled:) BOOL _scrollPerformanceDataCollectionEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, readonly) NSArray *_scrollPerformanceData WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaRemoteLayerTreeScrollingPerformanceDatah"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.h (0 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.h 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+#ifndef RemoteLayerTreeScrollingPerformanceData_h
+#define RemoteLayerTreeScrollingPerformanceData_h
+
+#import <WebCore/FloatRect.h>
+#import <wtf/Vector.h>
+
+namespace WebKit {
+
+class RemoteLayerTreeDrawingAreaProxy;
+
+class RemoteLayerTreeScrollingPerformanceData {
+public:
+ RemoteLayerTreeScrollingPerformanceData(RemoteLayerTreeDrawingAreaProxy&);
+ ~RemoteLayerTreeScrollingPerformanceData();
+
+ void didCommitLayerTree(const WebCore::FloatRect& visibleRect);
+ void didScroll(const WebCore::FloatRect& visibleRect);
+
+ NSArray *data(); // Array of [ time, event type, unfilled pixel count ]
+
+private:
+ unsigned blankPixelCount(const WebCore::FloatRect& visibleRect) const;
+
+ struct BlankPixelCount {
+ enum EventType { Filled, Exposed };
+
+ double startTime;
+ double endTime;
+ EventType eventType;
+ unsigned blankPixelCount;
+
+ BlankPixelCount(double start, double end, EventType type, unsigned count)
+ : startTime(start)
+ , endTime(end)
+ , eventType(type)
+ , blankPixelCount(count)
+ { }
+
+ bool canCoalesce(BlankPixelCount::EventType, unsigned blankPixelCount) const;
+ };
+
+ void appendBlankPixelCount(BlankPixelCount::EventType, unsigned blankPixelCount);
+
+ RemoteLayerTreeDrawingAreaProxy& m_drawingArea;
+ Vector<BlankPixelCount> m_blankPixelCounts;
+};
+
+}
+
+#endif // RemoteLayerTreeScrollingPerformanceData_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaRemoteLayerTreeScrollingPerformanceDatamm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm (0 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/RemoteLayerTreeScrollingPerformanceData.mm 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -0,0 +1,135 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "RemoteLayerTreeScrollingPerformanceData.h"
+
+#import "RemoteLayerTreeDrawingAreaProxy.h"
+#import "RemoteLayerTreeHost.h"
+#import <QuartzCore/CALayer.h>
+#import <WebCore/TileController.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+
+RemoteLayerTreeScrollingPerformanceData::RemoteLayerTreeScrollingPerformanceData(RemoteLayerTreeDrawingAreaProxy& drawingArea)
+ : m_drawingArea(drawingArea)
+{
+}
+
+RemoteLayerTreeScrollingPerformanceData::~RemoteLayerTreeScrollingPerformanceData()
+{
+}
+
+void RemoteLayerTreeScrollingPerformanceData::didCommitLayerTree(const FloatRect& visibleRect)
+{
+ // FIXME: maybe we only care about newly created tiles?
+ appendBlankPixelCount(BlankPixelCount::Filled, blankPixelCount(visibleRect));
+}
+
+void RemoteLayerTreeScrollingPerformanceData::didScroll(const FloatRect& visibleRect)
+{
+ appendBlankPixelCount(BlankPixelCount::Exposed, blankPixelCount(visibleRect));
+}
+
+bool RemoteLayerTreeScrollingPerformanceData::BlankPixelCount::canCoalesce(BlankPixelCount::EventType type, unsigned pixelCount) const
+{
+ return eventType == type && blankPixelCount == pixelCount;
+}
+
+void RemoteLayerTreeScrollingPerformanceData::appendBlankPixelCount(BlankPixelCount::EventType eventType, unsigned blankPixelCount)
+{
+ double now = WTF::monotonicallyIncreasingTime();
+
+ if (!m_blankPixelCounts.isEmpty() && m_blankPixelCounts.last().canCoalesce(eventType, blankPixelCount)) {
+ m_blankPixelCounts.last().endTime = now;
+ return;
+ }
+
+ m_blankPixelCounts.append(BlankPixelCount(now, now, eventType, blankPixelCount));
+}
+
+NSArray *RemoteLayerTreeScrollingPerformanceData::data()
+{
+ NSMutableArray* dataArray = [NSMutableArray arrayWithCapacity:m_blankPixelCounts.size()];
+
+ for (auto pixelData : m_blankPixelCounts) {
+ [dataArray addObject:@[
+ @(pixelData.startTime),
+ (pixelData.eventType == BlankPixelCount::Filled) ? @"filled" : @"exposed",
+ @(pixelData.blankPixelCount)
+ ]];
+ }
+ return dataArray;
+}
+
+static CALayer *findTileGridContainerLayer(CALayer *layer)
+{
+ for (CALayer *currLayer : [layer sublayers]) {
+ String layerName = [currLayer name];
+ if (layerName == TileController::tileGridContainerLayerName())
+ return currLayer;
+
+ if (CALayer *foundLayer = findTileGridContainerLayer(currLayer))
+ return foundLayer;
+ }
+
+ return nil;
+}
+
+unsigned RemoteLayerTreeScrollingPerformanceData::blankPixelCount(const FloatRect& visibleRect) const
+{
+ CALayer *rootLayer = asLayer(m_drawingArea.remoteLayerTreeHost().rootLayer());
+
+ CALayer *tileGridContainer = findTileGridContainerLayer(rootLayer);
+ if (!tileGridContainer) {
+ NSLog(@"Failed to find TileGrid Container Layer");
+ return UINT_MAX;
+ }
+
+ FloatRect visibleRectExcludingToolbar = visibleRect;
+ if (visibleRectExcludingToolbar.y() < 0)
+ visibleRectExcludingToolbar.setY(0);
+
+ Region paintedVisibleTileRegion;
+
+ for (CALayer *tileLayer : [tileGridContainer sublayers]) {
+ FloatRect tileRect = [tileLayer convertRect:[tileLayer bounds] toLayer:tileGridContainer];
+
+ tileRect.intersect(visibleRectExcludingToolbar);
+
+ if (!tileRect.isEmpty())
+ paintedVisibleTileRegion.unite(enclosingIntRect(tileRect));
+ }
+
+ Region uncoveredRegion(enclosingIntRect(visibleRectExcludingToolbar));
+ uncoveredRegion.subtract(paintedVisibleTileRegion);
+
+ return uncoveredRegion.totalArea();
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -128,12 +128,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+#include "RemoteLayerTreeDrawingAreaProxy.h"
+#include "RemoteLayerTreeScrollingPerformanceData.h"
</ins><span class="cx"> #include "ViewSnapshotStore.h"
</span><span class="cx"> #include <WebCore/RunLoopObserver.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#include "RemoteLayerTreeDrawingAreaProxy.h"
</del><span class="cx"> #include "WebVideoFullscreenManagerProxy.h"
</span><span class="cx"> #include "WebVideoFullscreenManagerProxyMessages.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -378,6 +379,10 @@
</span><span class="cx"> , m_mediaVolume(1)
</span><span class="cx"> , m_muted(false)
</span><span class="cx"> , m_mayStartMediaWhenInWindow(true)
</span><ins>+ , m_waitingForDidUpdateViewState(false)
+#if PLATFORM(COCOA)
+ , m_scrollPerformanceDataCollectionEnabled(false)
+#endif
</ins><span class="cx"> , m_scrollPinningBehavior(DoNotPin)
</span><span class="cx"> , m_navigationID(0)
</span><span class="cx"> , m_configurationPreferenceValues(configuration.preferenceValues)
</span><span class="lines">@@ -5336,6 +5341,18 @@
</span><span class="cx"> process().send(Messages::WebPage::ConfirmCompositionAsync(), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::setScrollPerformanceDataCollectionEnabled(bool enabled)
+{
+ if (enabled == m_scrollPerformanceDataCollectionEnabled)
+ return;
+
+ m_scrollPerformanceDataCollectionEnabled = enabled;
+
+ if (m_scrollPerformanceDataCollectionEnabled && !m_scrollingPerformanceData)
+ m_scrollingPerformanceData = std::make_unique<RemoteLayerTreeScrollingPerformanceData>(downcast<RemoteLayerTreeDrawingAreaProxy>(*m_drawingArea));
+ else if (!m_scrollPerformanceDataCollectionEnabled)
+ m_scrollingPerformanceData = nullptr;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::takeSnapshot(IntRect rect, IntSize bitmapSize, SnapshotOptions options, std::function<void (const ShareableBitmap::Handle&, CallbackBase::Error)> callbackFunction)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -161,6 +161,7 @@
</span><span class="cx"> class NativeWebMouseEvent;
</span><span class="cx"> class NativeWebWheelEvent;
</span><span class="cx"> class PageClient;
</span><ins>+class RemoteLayerTreeScrollingPerformanceData;
</ins><span class="cx"> class RemoteLayerTreeTransaction;
</span><span class="cx"> class RemoteScrollingCoordinatorProxy;
</span><span class="cx"> class StringPairVector;
</span><span class="lines">@@ -527,6 +528,11 @@
</span><span class="cx"> void setCompositionAsync(const String& text, Vector<WebCore::CompositionUnderline> underlines, const EditingRange& selectionRange, const EditingRange& replacementRange);
</span><span class="cx"> void confirmCompositionAsync();
</span><span class="cx">
</span><ins>+ void setScrollPerformanceDataCollectionEnabled(bool);
+ bool scrollPerformanceDataCollectionEnabled() const { return m_scrollPerformanceDataCollectionEnabled; }
+ RemoteLayerTreeScrollingPerformanceData* scrollingPerformanceData() { return m_scrollingPerformanceData.get(); }
+#endif // PLATFORM(COCOA)
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void insertDictatedTextAsync(const String& text, const EditingRange& replacementRange, const Vector<WebCore::TextAlternativeWithRange>& dictationAlternatives, bool registerUndoGroup);
</span><span class="cx"> void attributedSubstringForCharacterRangeAsync(const EditingRange&, std::function<void (const AttributedString&, const EditingRange&, CallbackBase::Error)>);
</span><span class="lines">@@ -543,24 +549,26 @@
</span><span class="cx"> WebCore::IntRect firstRectForCharacterRange(const EditingRange&);
</span><span class="cx"> bool executeKeypressCommands(const Vector<WebCore::KeypressCommand>&);
</span><span class="cx"> void cancelComposition();
</span><del>-#endif
</del><ins>+#endif // !USE(ASYNC_NSTEXTINPUTCLIENT)
</ins><span class="cx">
</span><span class="cx"> WKView* wkView() const;
</span><span class="cx"> void intrinsicContentSizeDidChange(const WebCore::IntSize& intrinsicContentSize);
</span><span class="cx"> CGRect boundsOfLayerInLayerBackedWindowCoordinates(CALayer *) const;
</span><del>-#endif
-#endif // PLATFORM(COCOA)
</del><ins>+#endif // PLATFORM(MAC)
+
</ins><span class="cx"> #if PLATFORM(EFL)
</span><span class="cx"> void handleInputMethodKeydown(bool& handled);
</span><span class="cx"> void confirmComposition(const String&);
</span><span class="cx"> void setComposition(const String&, Vector<WebCore::CompositionUnderline>&, int);
</span><span class="cx"> void cancelComposition();
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> PlatformWidget viewWidget();
</span><span class="cx"> const WebCore::Color& backgroundColor() const { return m_backgroundColor; }
</span><span class="cx"> void setBackgroundColor(const WebCore::Color& color) { m_backgroundColor = color; }
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
</span><span class="cx"> void commitPageTransitionViewport();
</span><span class="cx"> #endif
</span><span class="lines">@@ -568,9 +576,11 @@
</span><span class="cx"> void handleMouseEvent(const NativeWebMouseEvent&);
</span><span class="cx"> void handleWheelEvent(const NativeWebWheelEvent&);
</span><span class="cx"> void handleKeyboardEvent(const NativeWebKeyboardEvent&);
</span><ins>+
</ins><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> void handleTouchEventSynchronously(const NativeWebTouchEvent&);
</span><span class="cx"> void handleTouchEventAsynchronously(const NativeWebTouchEvent&);
</span><ins>+
</ins><span class="cx"> #elif ENABLE(TOUCH_EVENTS)
</span><span class="cx"> void handleTouchEvent(const NativeWebTouchEvent&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1617,6 +1627,9 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> HashMap<String, String> m_temporaryPDFFiles;
</span><span class="cx"> std::unique_ptr<WebCore::RunLoopObserver> m_viewStateChangeDispatcher;
</span><ins>+
+ std::unique_ptr<RemoteLayerTreeScrollingPerformanceData> m_scrollingPerformanceData;
+ bool m_scrollPerformanceDataCollectionEnabled;
</ins><span class="cx"> #endif
</span><span class="cx"> UserObservablePageToken m_pageIsUserObservableCount;
</span><span class="cx"> ProcessSuppressionDisabledToken m_preventProcessSuppressionCount;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (178722 => 178723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-20 18:27:48 UTC (rev 178722)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-20 18:40:33 UTC (rev 178723)
</span><span class="lines">@@ -120,6 +120,8 @@
</span><span class="cx"> 0FCB4E6D18BBF26A000FCFC9 /* WKContentViewInteraction.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FCB4E6B18BBF26A000FCFC9 /* WKContentViewInteraction.mm */; };
</span><span class="cx"> 0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */; };
</span><span class="cx"> 0FF24A2E1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */; };
</span><ins>+ 0FF2649F1A1FF9C6001FE759 /* RemoteLayerTreeScrollingPerformanceData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */; };
+ 0FF264A01A1FF9CC001FE759 /* RemoteLayerTreeScrollingPerformanceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F707C791A1FEEA300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.h */; };
</ins><span class="cx"> 1A002D43196B337000B9AD44 /* _WKSessionStateInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D42196B337000B9AD44 /* _WKSessionStateInternal.h */; };
</span><span class="cx"> 1A002D44196B338900B9AD44 /* _WKSessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D3F196B329400B9AD44 /* _WKSessionState.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A002D45196B338E00B9AD44 /* _WKSessionState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A002D3E196B329400B9AD44 /* _WKSessionState.mm */; };
</span><span class="lines">@@ -2111,6 +2113,8 @@
</span><span class="cx"> 0F5947A6187B517600437857 /* RemoteScrollingCoordinatorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteScrollingCoordinatorMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F5E200118E77051003EC3E5 /* PlatformCAAnimationRemote.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlatformCAAnimationRemote.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0F5E200218E77051003EC3E5 /* PlatformCAAnimationRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformCAAnimationRemote.h; sourceTree = "<group>"; };
</span><ins>+ 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RemoteLayerTreeScrollingPerformanceData.mm; sourceTree = "<group>"; };
+ 0F707C791A1FEEA300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoteLayerTreeScrollingPerformanceData.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0F931C1A18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ScrollingTreeOverflowScrollingNodeIOS.h; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F931C1B18C5711900DBA7C3 /* ScrollingTreeOverflowScrollingNodeIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ScrollingTreeOverflowScrollingNodeIOS.mm; path = Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4767,6 +4771,8 @@
</span><span class="cx"> 1ABC3DF31899E437004F0626 /* NavigationState.mm */,
</span><span class="cx"> 1A002D47196B345D00B9AD44 /* SessionStateCoding.h */,
</span><span class="cx"> 1A002D46196B345D00B9AD44 /* SessionStateCoding.mm */,
</span><ins>+ 0F707C791A1FEEA300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.h */,
+ 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */,
</ins><span class="cx"> 1AFE436418B6C081009C7A48 /* UIDelegate.h */,
</span><span class="cx"> 1AFE436318B6C081009C7A48 /* UIDelegate.mm */,
</span><span class="cx"> 1AC0273E196622D600C12B75 /* WebPageProxyCocoa.mm */,
</span><span class="lines">@@ -7765,6 +7771,7 @@
</span><span class="cx"> BCE469561214E6CB000B98EB /* WebFormSubmissionListenerProxy.h in Headers */,
</span><span class="cx"> BC032D8D10F437A00058C15A /* WebFrame.h in Headers */,
</span><span class="cx"> BCE469771214F27B000B98EB /* WebFrameListenerProxy.h in Headers */,
</span><ins>+ 0FF264A01A1FF9CC001FE759 /* RemoteLayerTreeScrollingPerformanceData.h in Headers */,
</ins><span class="cx"> BC032D7F10F4378D0058C15A /* WebFrameLoaderClient.h in Headers */,
</span><span class="cx"> 9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */,
</span><span class="cx"> BCB9F6A01123A84B00A137E0 /* WebFramePolicyListenerProxy.h in Headers */,
</span><span class="lines">@@ -9363,6 +9370,7 @@
</span><span class="cx"> 1AA3D75B1651B44F008713D0 /* RemoteLayerTreeHost.mm in Sources */,
</span><span class="cx"> 0F0C365818C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm in Sources */,
</span><span class="cx"> 2DDE0AFB18298CC900F97EAA /* RemoteLayerTreePropertyApplier.mm in Sources */,
</span><ins>+ 0FF2649F1A1FF9C6001FE759 /* RemoteLayerTreeScrollingPerformanceData.mm in Sources */,
</ins><span class="cx"> 1AF1AC6B1651759E00C17D7F /* RemoteLayerTreeTransaction.mm in Sources */,
</span><span class="cx"> E1B78473163F253E0007B692 /* RemoteNetworkingContext.mm in Sources */,
</span><span class="cx"> 1AC1337F18590AE400F3EC05 /* RemoteObjectRegistry.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>