<!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>[169409] trunk/Source/WebCore</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/169409">169409</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 21:44:51 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Instantiate a ScrollingTreeMac on Mac
https://bugs.webkit.org/show_bug.cgi?id=133332
Reviewed by Tim Horton.
Mac previously instantiated a ThreadedScrollingTree, but this has no platform
knowledge. To support future expansion, create a ScrollingTreeMac subclass and
instantiate that on Mac.
Also protect ScrollingCoordinatorMac in PLATFORM(MAC) #ifdefs and remove it from the
EXCLUDED_SOURCE_FILE_NAMES list in the xcconfig file, following general trends.
* Configurations/WebCore.xcconfig:
* WebCore.xcodeproj/project.pbxproj:
* page/scrolling/ThreadedScrollingTree.cpp:
(WebCore::ThreadedScrollingTree::create): Deleted.
* page/scrolling/ThreadedScrollingTree.h:
* page/scrolling/mac/ScrollingCoordinatorMac.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::ScrollingCoordinatorMac):
* page/scrolling/mac/ScrollingTreeMac.cpp: Copied from Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h.
(ScrollingTreeMac::create):
(ScrollingTreeMac::ScrollingTreeMac):
* page/scrolling/mac/ScrollingTreeMac.h: Copied from Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreConfigurationsWebCorexcconfig">trunk/Source/WebCore/Configurations/WebCore.xcconfig</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreeh">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeMaccpp">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169408 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-28 04:44:48 UTC (rev 169408)
+++ trunk/Source/WebCore/ChangeLog 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-05-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Instantiate a ScrollingTreeMac on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=133332
+
+ Reviewed by Tim Horton.
+
+ Mac previously instantiated a ThreadedScrollingTree, but this has no platform
+ knowledge. To support future expansion, create a ScrollingTreeMac subclass and
+ instantiate that on Mac.
+
+ Also protect ScrollingCoordinatorMac in PLATFORM(MAC) #ifdefs and remove it from the
+ EXCLUDED_SOURCE_FILE_NAMES list in the xcconfig file, following general trends.
+
+ * Configurations/WebCore.xcconfig:
+ * WebCore.xcodeproj/project.pbxproj:
+ * page/scrolling/ThreadedScrollingTree.cpp:
+ (WebCore::ThreadedScrollingTree::create): Deleted.
+ * page/scrolling/ThreadedScrollingTree.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::ScrollingCoordinatorMac):
+ * page/scrolling/mac/ScrollingTreeMac.cpp: Copied from Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h.
+ (ScrollingTreeMac::create):
+ (ScrollingTreeMac::ScrollingTreeMac):
+ * page/scrolling/mac/ScrollingTreeMac.h: Copied from Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h.
+
+2014-05-27 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Prepare for position:sticky support inside accelerated overflow-scroll with WK2
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133329
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreConfigurationsWebCorexcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Configurations/WebCore.xcconfig (169408 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-05-28 04:44:48 UTC (rev 169408)
+++ trunk/Source/WebCore/Configurations/WebCore.xcconfig 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -112,6 +112,6 @@
</span><span class="cx"> JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
</span><span class="cx">
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(PLATFORM_NAME));
</span><del>-EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollingCoordinatorMac.mm ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp;
</del><ins>+EXCLUDED_SOURCE_FILE_NAMES_iphoneos = *.tiff *Cursor.png AccessibilityObjectMac.mm AXObjectCacheMac.mm ColorMac.mm Cursor.cpp CursorMac.mm DataTransferMac.mm EditorMac.mm EventHandlerMac.mm EventLoopMac.mm GeolocationServiceMac.mm GraphicsContext3DOpenGLES.cpp IconDatabase.cpp IconMac.mm KillRingMac.mm LocalCurrentGraphicsContext.mm MIMETypeRegistryMac.mm MediaPlayerPrivateQTKit.mm NSScrollerImpDetails.mm NetworkStateNotifierMac.cpp PasteboardMac.mm PlatformEventFactoryMac.mm PlatformMouseEventMac.mm PlatformPasteboardMac.mm PlatformScreenMac.mm PlatformSpeechSynthesizerMac.mm PluginMainThreadScheduler.cpp RunLoopMac.mm SSLKeyGeneratorMac.cpp ScrollViewMac.mm ScrollbarThemeMac.mm SharedTimerMac.mm SoundMac.mm SystemTimeMac.cpp ThemeMac.mm ThreadCheck.mm UserAgentMac.mm WebAccessibilityObjectWrapperMac.mm WebCoreSystemInterface.mm WebCoreURLResponse.mm WebCoreView.m WebFontCache.mm WebVideoFullscreenController.mm WebVideoFullscreenHUDWindowController.mm WebWindowAnimation.mm WidgetMac.mm DisplayRefreshMonitorMac.cpp;
</ins><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_iphonesimulator = $(EXCLUDED_SOURCE_FILE_NAMES_iphoneos);
</span><span class="cx"> EXCLUDED_SOURCE_FILE_NAMES_macosx = *IOS.h *IOS.cpp *IOS.mm JSTouch* JSGesture* DOMGesture* DOMTouch* KillRingNone.cpp WAKAppKitStubs.h WAKClipView.h WAKResponder.h WAKScrollView.h WAKView.h WAKViewPrivate.h WAKWindow.h WKContentObservation.h WKGraphics.h WKTypes.h WKUtilities.h WKView.h WKViewPrivate.h WebCoreThread.h WebCoreThreadMessage.h WebCoreThreadRun.h WebCoreThreadSystemInterface.h;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (169408 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-05-28 04:44:48 UTC (rev 169408)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -554,6 +554,8 @@
</span><span class="cx"> 0FDA7C23188330A900C954B5 /* DragImageIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */; };
</span><span class="cx"> 0FDA7C261883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FDA7C241883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp */; };
</span><span class="cx"> 0FDA7C271883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FDA7C251883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h */; };
</span><ins>+ 0FE5806319327A6200DE32EB /* ScrollingTreeMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */; };
+ 0FE5806419327A6200DE32EB /* ScrollingTreeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FE5806219327A6200DE32EB /* ScrollingTreeMac.h */; };
</ins><span class="cx"> 0FE71405142170B800DB33BA /* ScrollbarThemeMock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */; };
</span><span class="cx"> 0FE71406142170B800DB33BA /* ScrollbarThemeMock.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FE71404142170B800DB33BA /* ScrollbarThemeMock.h */; };
</span><span class="cx"> 0FEA3E7B191B2FC5000F1B55 /* ScrollingStateFrameScrollingNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEA3E79191B2FC5000F1B55 /* ScrollingStateFrameScrollingNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -7442,6 +7444,8 @@
</span><span class="cx"> 0FDA7C22188330A900C954B5 /* DragImageIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DragImageIOS.mm; path = ios/DragImageIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FDA7C241883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWebKitPlaybackTargetAvailabilityEvent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FDA7C251883333200C954B5 /* JSWebKitPlaybackTargetAvailabilityEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWebKitPlaybackTargetAvailabilityEvent.h; sourceTree = "<group>"; };
</span><ins>+ 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingTreeMac.cpp; sourceTree = "<group>"; };
+ 0FE5806219327A6200DE32EB /* ScrollingTreeMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollingTreeMac.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FE71403142170B800DB33BA /* ScrollbarThemeMock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarThemeMock.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FE71404142170B800DB33BA /* ScrollbarThemeMock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollbarThemeMock.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FE71415142189FC00DB33BA /* ScrollbarTheme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollbarTheme.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -15056,6 +15060,8 @@
</span><span class="cx"> 93C38C02164473DD00091EB2 /* ScrollingTreeFixedNode.mm */,
</span><span class="cx"> 93C4A4131629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.h */,
</span><span class="cx"> 93C4A4141629DF5A00C3EB6E /* ScrollingTreeFrameScrollingNodeMac.mm */,
</span><ins>+ 0FE5806219327A6200DE32EB /* ScrollingTreeMac.h */,
+ 0FE5806119327A6200DE32EB /* ScrollingTreeMac.cpp */,
</ins><span class="cx"> 0FB88908167D2FA10010CDA5 /* ScrollingTreeStickyNode.h */,
</span><span class="cx"> 0FB88909167D2FA10010CDA5 /* ScrollingTreeStickyNode.mm */,
</span><span class="cx"> );
</span><span class="lines">@@ -26461,6 +26467,7 @@
</span><span class="cx"> 2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */,
</span><span class="cx"> 0B9056F90F2685F30095FF6A /* WorkerThreadableLoader.h in Headers */,
</span><span class="cx"> 97AABD2D14FA09D5007457AE /* WorkerThreadableWebSocketChannel.h in Headers */,
</span><ins>+ 0FE5806419327A6200DE32EB /* ScrollingTreeMac.h in Headers */,
</ins><span class="cx"> 93309E24099E64920056E581 /* WrapContentsInDummySpanCommand.h in Headers */,
</span><span class="cx"> 9BAF3B2412C1A39800014BF1 /* WritingDirection.h in Headers */,
</span><span class="cx"> 14476AA815DC4BB100305DB2 /* WritingMode.h in Headers */,
</span><span class="lines">@@ -27667,6 +27674,7 @@
</span><span class="cx"> A8EA7D300A19385500A8EF5F /* HTMLImageLoader.cpp in Sources */,
</span><span class="cx"> A81369CD097374F600D74463 /* HTMLInputElement.cpp in Sources */,
</span><span class="cx"> 93309DE5099E64920056E581 /* HTMLInterchange.cpp in Sources */,
</span><ins>+ 0FE5806319327A6200DE32EB /* ScrollingTreeMac.cpp in Sources */,
</ins><span class="cx"> A81369E5097374F600D74463 /* HTMLKeygenElement.cpp in Sources */,
</span><span class="cx"> A81369E3097374F600D74463 /* HTMLLabelElement.cpp in Sources */,
</span><span class="cx"> A81369E1097374F600D74463 /* HTMLLegendElement.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp (169408 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2014-05-28 04:44:48 UTC (rev 169408)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -40,11 +40,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-RefPtr<ThreadedScrollingTree> ThreadedScrollingTree::create(AsyncScrollingCoordinator* scrollingCoordinator)
-{
- return adoptRef(new ThreadedScrollingTree(scrollingCoordinator));
-}
-
</del><span class="cx"> ThreadedScrollingTree::ThreadedScrollingTree(AsyncScrollingCoordinator* scrollingCoordinator)
</span><span class="cx"> : m_scrollingCoordinator(scrollingCoordinator)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (169408 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2014-05-28 04:44:48 UTC (rev 169408)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -43,8 +43,6 @@
</span><span class="cx"> // object on the main thread if they can't be handled on the scrolling thread for various reasons.
</span><span class="cx"> class ThreadedScrollingTree : public ScrollingTree {
</span><span class="cx"> public:
</span><del>- static RefPtr<ThreadedScrollingTree> create(AsyncScrollingCoordinator*);
-
</del><span class="cx"> virtual ~ThreadedScrollingTree();
</span><span class="cx">
</span><span class="cx"> virtual void commitNewTreeState(PassOwnPtr<ScrollingStateTree>) override;
</span><span class="lines">@@ -58,9 +56,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void invalidate() override;
</span><span class="cx">
</span><del>-private:
</del><ins>+protected:
</ins><span class="cx"> explicit ThreadedScrollingTree(AsyncScrollingCoordinator*);
</span><del>- virtual bool isThreadedScrollingTree() const override { return true; }
</del><span class="cx">
</span><span class="cx"> virtual PassOwnPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
</span><span class="cx">
</span><span class="lines">@@ -69,6 +66,9 @@
</span><span class="cx"> virtual void handleWheelEventPhase(PlatformWheelEventPhase) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+private:
+ virtual bool isThreadedScrollingTree() const override { return true; }
+
</ins><span class="cx"> RefPtr<AsyncScrollingCoordinator> m_scrollingCoordinator;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (169408 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2014-05-28 04:44:48 UTC (rev 169408)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #ifndef ScrollingCoordinatorMac_h
</span><span class="cx"> #define ScrollingCoordinatorMac_h
</span><span class="cx">
</span><del>-#if ENABLE(ASYNC_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #include "AsyncScrollingCoordinator.h"
</span><span class="cx">
</span><span class="lines">@@ -64,6 +64,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(ASYNC_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #endif // ScrollingCoordinatorMac_h
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (169408 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2014-05-28 04:44:48 UTC (rev 169408)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(ASYNC_SCROLLING)
</del><ins>+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "ScrollingCoordinatorMac.h"
</span><span class="cx">
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> #include "ScrollingThread.h"
</span><span class="cx"> #include "ScrollingTreeFixedNode.h"
</span><span class="cx"> #include "ScrollingTreeFrameScrollingNodeMac.h"
</span><ins>+#include "ScrollingTreeMac.h"
</ins><span class="cx"> #include "ScrollingTreeStickyNode.h"
</span><del>-#include "ThreadedScrollingTree.h"
</del><span class="cx"> #include "TiledBacking.h"
</span><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> : AsyncScrollingCoordinator(page)
</span><span class="cx"> , m_scrollingStateTreeCommitterTimer(this, &ScrollingCoordinatorMac::scrollingStateTreeCommitterTimerFired)
</span><span class="cx"> {
</span><del>- setScrollingTree(ThreadedScrollingTree::create(this));
</del><ins>+ setScrollingTree(ScrollingTreeMac::create(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingCoordinatorMac::~ScrollingCoordinatorMac()
</span><span class="lines">@@ -162,4 +162,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><del>-#endif // ENABLE(ASYNC_SCROLLING)
</del><ins>+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeMaccppfromrev169408trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp (from rev 169408, trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h) (0 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp (rev 0)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2014 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.
+ */
+
+#include "config.h"
+#include "ScrollingTreeMac.h"
+
+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
+
+using namespace WebCore;
+
+RefPtr<ScrollingTreeMac> ScrollingTreeMac::create(AsyncScrollingCoordinator* scrollingCoordinator)
+{
+ return adoptRef(new ScrollingTreeMac(scrollingCoordinator));
+}
+
+ScrollingTreeMac::ScrollingTreeMac(AsyncScrollingCoordinator* scrollingCoordinator)
+ : ThreadedScrollingTree(scrollingCoordinator)
+{
+}
+
+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeMachfromrev169408trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.h (from rev 169408, trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h) (0 => 169409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.h (rev 0)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.h 2014-05-28 04:44:51 UTC (rev 169409)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 ScrollingTreeMac_h
+#define ScrollingTreeMac_h
+
+#if ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
+
+#include "ThreadedScrollingTree.h"
+
+namespace WebCore {
+
+class ScrollingTreeMac : public ThreadedScrollingTree {
+public:
+ static RefPtr<ScrollingTreeMac> create(AsyncScrollingCoordinator*);
+
+private:
+ explicit ScrollingTreeMac(AsyncScrollingCoordinator*);
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(ASYNC_SCROLLING) && PLATFORM(MAC)
+
+#endif // ScrollingTreeMac_h
</ins></span></pre>
</div>
</div>
</body>
</html>