Changeset 161387 in webkit
- Timestamp:
- Jan 6, 2014 4:57:23 PM (10 years ago)
- Location:
- trunk/Source
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r161385 r161387 1 2014-01-06 Simon Fraser <simon.fraser@apple.com> 2 3 Hook up the RemoteScrollingCoordinator 4 https://bugs.webkit.org/show_bug.cgi?id=126547 5 6 Reviewed by Tim Horton. 7 8 Export lots of scrolling-related symbols for use by WebKit2. 9 10 * WebCore.exp.in: 11 1 12 2014-01-06 Seokju Kwon <seokju@webkit.org> 2 13 -
trunk/Source/WebCore/WebCore.exp.in
r161338 r161387 1002 1002 __ZN7WebCore4Page32setMemoryCacheClientCallsEnabledEb 1003 1003 __ZN7WebCore4Page35resumeActiveDOMObjectsAndAnimationsEv 1004 __ZN7WebCore4Page20scrollingCoordinatorEv 1004 1005 __ZN7WebCore4Page36setShouldSuppressScrollbarAnimationsEb 1005 1006 __ZN7WebCore4Page36suspendActiveDOMObjectsAndAnimationsEv … … 2864 2865 2865 2866 #if ENABLE(ASYNC_SCROLLING) 2867 __ZN7WebCore13ScrollingTree16handleWheelEventERKNS_18PlatformWheelEventE 2868 __ZN7WebCore13ScrollingTree18commitNewTreeStateEN3WTF10PassOwnPtrINS_18ScrollingStateTreeEEE 2866 2869 __ZN7WebCore13ScrollingTree21setCanRubberBandStateEbbbb 2870 __ZN7WebCore13ScrollingTree31willWheelEventStartSwipeGestureERKNS_18PlatformWheelEventE 2871 __ZN7WebCore13ScrollingTree35shouldHandleWheelEventSynchronouslyERKNS_18PlatformWheelEventE 2867 2872 __ZN7WebCore13ScrollingTree37setScrollingPerformanceLoggingEnabledEb 2873 __ZN7WebCore13ScrollingTreeC2Ev 2868 2874 __ZN7WebCore13ScrollingTreeD1Ev 2875 __ZN7WebCore13ScrollingTreeD2Ev 2869 2876 __ZN7WebCore15ScrollingThread15dispatchBarrierERKN3WTF8FunctionIFvvEEE 2870 2877 __ZN7WebCore15ScrollingThread8dispatchERKN3WTF8FunctionIFvvEEE 2878 __ZN7WebCore18ScrollingStateNode8setLayerERKNS_19LayerRepresentationE 2879 __ZN7WebCore18ScrollingStateTree10attachNodeENS_17ScrollingNodeTypeEyy 2880 __ZN7WebCore18ScrollingStateTree14stateNodeForIDEy 2881 __ZN7WebCore18ScrollingStateTree15setRemovedNodesEN3WTF6VectorIyLm0ENS1_15CrashOnOverflowEEE 2882 __ZN7WebCore18ScrollingStateTree6commitENS_19LayerRepresentation4TypeE 2883 __ZN7WebCore18ScrollingStateTree6createEPNS_25AsyncScrollingCoordinatorE 2884 __ZN7WebCore18ScrollingStateTreeD1Ev 2885 __ZN7WebCore20ScrollingCoordinator13pageDestroyedEv 2871 2886 __ZN7WebCore20ScrollingCoordinator45setForceSynchronousScrollLayerPositionUpdatesEb 2872 __ZN7WebCore4Page20scrollingCoordinatorEv 2887 __ZN7WebCore22ScrollingTreeFixedNode6createERNS_13ScrollingTreeEy 2888 __ZN7WebCore23ScrollingStateFixedNode17updateConstraintsERKNS_32FixedPositionViewportConstraintsE 2889 __ZN7WebCore23ScrollingTreeStickyNode6createERNS_13ScrollingTreeEy 2890 __ZN7WebCore24ScrollingStateStickyNode17updateConstraintsERKNS_33StickyPositionViewportConstraintsE 2891 __ZN7WebCore20ScrollingCoordinator35scheduleUpdateScrollPositionForNodeEyRKNS_8IntPointEbNS_31SetOrSyncScrollingLayerPositionE 2892 __ZN7WebCore25AsyncScrollingCoordinator14clearStateTreeEv 2893 __ZN7WebCore25AsyncScrollingCoordinator17attachToStateTreeENS_17ScrollingNodeTypeEyy 2894 __ZN7WebCore25AsyncScrollingCoordinator18syncChildPositionsERKNS_10LayoutRectE 2895 __ZN7WebCore25AsyncScrollingCoordinator19detachFromStateTreeEy 2896 __ZN7WebCore25AsyncScrollingCoordinator19updateScrollingNodeEyPNS_13GraphicsLayerES2_ 2897 __ZN7WebCore25AsyncScrollingCoordinator22frameViewLayoutUpdatedEPNS_9FrameViewE 2898 __ZNK7WebCore25AsyncScrollingCoordinator24scrollingStateTreeAsTextEv 2899 __ZN7WebCore25AsyncScrollingCoordinator27frameViewRootLayerDidChangeEPNS_9FrameViewE 2900 __ZN7WebCore25AsyncScrollingCoordinator27requestScrollPositionUpdateEPNS_9FrameViewERKNS_8IntPointE 2901 __ZN7WebCore25AsyncScrollingCoordinator29updateViewportConstrainedNodeEyRKNS_19ViewportConstraintsEPNS_13GraphicsLayerE 2902 __ZN7WebCore25AsyncScrollingCoordinator30setSynchronousScrollingReasonsEj 2903 __ZN7WebCore25AsyncScrollingCoordinator37scrollableAreaScrollbarLayerDidChangeEPNS_14ScrollableAreaENS_20ScrollbarOrientationE 2904 __ZN7WebCore25AsyncScrollingCoordinator43recomputeWheelEventHandlerCountForFrameViewEPNS_9FrameViewE 2905 __ZN7WebCore25AsyncScrollingCoordinatorC2EPNS_4PageE 2906 __ZN7WebCore25AsyncScrollingCoordinatorD2Ev 2907 __ZN7WebCore27ScrollingStateScrollingNode14setFooterLayerERKNS_19LayerRepresentationE 2908 __ZN7WebCore27ScrollingStateScrollingNode14setHeaderLayerERKNS_19LayerRepresentationE 2909 __ZN7WebCore27ScrollingStateScrollingNode15setFooterHeightEi 2910 __ZN7WebCore27ScrollingStateScrollingNode15setHeaderHeightEi 2911 __ZN7WebCore27ScrollingStateScrollingNode15setScrollOriginERKNS_8IntPointE 2912 __ZN7WebCore27ScrollingStateScrollingNode15setViewportRectERKNS_7IntRectE 2913 __ZN7WebCore27ScrollingStateScrollingNode19setFrameScaleFactorEf 2914 __ZN7WebCore27ScrollingStateScrollingNode20setTotalContentsSizeERKNS_7IntSizeE 2915 __ZN7WebCore27ScrollingStateScrollingNode24setCounterScrollingLayerERKNS_19LayerRepresentationE 2916 __ZN7WebCore27ScrollingStateScrollingNode25setWheelEventHandlerCountEj 2917 __ZN7WebCore27ScrollingStateScrollingNode27setScrollableAreaParametersERKNS_24ScrollableAreaParametersE 2918 __ZN7WebCore27ScrollingStateScrollingNode30setSynchronousScrollingReasonsEj 2919 __ZN7WebCore27ScrollingStateScrollingNode33setScrollBehaviorForFixedElementsENS_30ScrollBehaviorForFixedElementsE 2920 __ZN7WebCore29ScrollingTreeScrollingNodeMac6createERNS_13ScrollingTreeEy 2873 2921 #endif 2874 2922 -
trunk/Source/WebKit2/ChangeLog
r161386 r161387 1 2014-01-06 Simon Fraser <simon.fraser@apple.com> 2 3 Hook up the RemoteScrollingCoordinator 4 https://bugs.webkit.org/show_bug.cgi?id=126547 5 6 Reviewed by Tim Horton. 7 8 Hook up the RemoteScrollingCoordinator in WebKit2. 9 10 When the RemoteLayerTreeDrawingArea is in use, WebPageProxy creates 11 a RemoteScrollingCoordinator, and hands it mouseWheel events. It then 12 scrolls via a RemoteScrollingTree constructed from state tree commits from the 13 WebProcess. 14 15 Scrolling tree commits happen via a transaction received by RemoteLayerTreeDrawingAreaProxy, 16 atomically with layer tree transactions. 17 18 * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp: 19 (WebKit::RemoteScrollingCoordinatorTransaction::encode): Fix encoding for some 20 cases seen in WebKitTestRunner where a page has no ScrollingCoordinator. 21 * UIProcess/WebPageProxy.cpp: 22 (WebKit::WebPageProxy::initializeWebPage): Create the RemoteScrollingCoordinatorProxy 23 when using a remote layer tree drawing area. 24 (WebKit::WebPageProxy::handleWheelEvent): Pass to the scrolling coordinator. 25 * UIProcess/WebPageProxy.h: 26 (WebKit::WebPageProxy::scrollingCoordinatorProxy): 27 * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h: Include the RemoteScrollingCoordinatorTransaction. 28 * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in: 29 * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm: 30 (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree): 31 * UIProcess/mac/RemoteLayerTreeHost.mm: 32 (WebKit::RemoteLayerTreeHost::getLayer): It's valid to get a 0 layerID (e.g. when 33 a layer disappears) so handle this case. 34 * WebKit2.xcodeproj/project.pbxproj: 35 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 36 (WebKit::WebChromeClient::createScrollingCoordinator): Override to create the 37 RemoteScrollingCoordinator in the WebProcess. 38 * WebProcess/WebCoreSupport/WebChromeClient.h: 39 * WebProcess/WebPage/WebPage.cpp: 40 (WebKit::WebPage::scrollingCoordinator): Not inline to avoid polluting the 41 header with #includes. 42 * WebProcess/WebPage/WebPage.h: 43 * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h: Say that we want a ScrollingCoordinator. 44 * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm: 45 (WebKit::RemoteLayerTreeDrawingArea::flushLayers): Add the scrollingTransaction to the 46 message. 47 1 48 2014-01-06 Jaehun Lim <ljaehun.lim@samsung.com> 2 49 -
trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp
r161373 r161387 231 231 void RemoteScrollingCoordinatorTransaction::encode(IPC::ArgumentEncoder& encoder) const 232 232 { 233 encoder << m_scrollingStateTree->nodeCount(); 234 235 if (const ScrollingStateNode* rootNode = m_scrollingStateTree->rootStateNode()) 236 encodeNodeAndDescendants(encoder, *rootNode); 237 238 encoder << m_scrollingStateTree->removedNodes(); 233 int numNodes = m_scrollingStateTree ? m_scrollingStateTree->nodeCount() : 0; 234 encoder << numNodes; 235 236 if (m_scrollingStateTree) { 237 if (const ScrollingStateNode* rootNode = m_scrollingStateTree->rootStateNode()) 238 encodeNodeAndDescendants(encoder, *rootNode); 239 240 encoder << m_scrollingStateTree->removedNodes(); 241 } else 242 encoder << Vector<ScrollingNodeID>(); 239 243 } 240 244 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r161358 r161387 62 62 #include "WebEditCommandProxy.h" 63 63 #include "WebEvent.h" 64 #include "WebEventConversion.h" 64 65 #include "WebFormSubmissionListenerProxy.h" 65 66 #include "WebFramePolicyListenerProxy.h" … … 93 94 #include <wtf/NeverDestroyed.h> 94 95 #include <stdio.h> 96 97 #if ENABLE(ASYNC_SCROLLING) 98 #include "RemoteScrollingCoordinatorProxy.h" 99 #endif 95 100 96 101 #if USE(COORDINATED_GRAPHICS) … … 508 513 ASSERT(m_drawingArea); 509 514 515 #if ENABLE(ASYNC_SCROLLING) 516 if (m_drawingArea->type() == DrawingAreaTypeRemoteLayerTree) 517 m_scrollingCoordinatorProxy = std::make_unique<RemoteScrollingCoordinatorProxy>(*this); 518 #endif 519 510 520 #if ENABLE(INSPECTOR_SERVER) 511 521 if (pageGroup().preferences()->developerExtrasEnabled()) … … 1236 1246 void WebPageProxy::handleWheelEvent(const NativeWebWheelEvent& event) 1237 1247 { 1248 #if ENABLE(ASYNC_SCROLLING) 1249 if (m_scrollingCoordinatorProxy && m_scrollingCoordinatorProxy->handleWheelEvent(platform(event))) 1250 return; 1251 #endif 1252 1238 1253 if (!isValid()) 1239 1254 return; -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r161358 r161387 137 137 class NativeWebWheelEvent; 138 138 class PageClient; 139 class RemoteScrollingCoordinatorProxy; 139 140 class StringPairVector; 140 141 class WebBackForwardList; … … 336 337 337 338 DrawingAreaProxy* drawingArea() const { return m_drawingArea.get(); } 339 340 RemoteScrollingCoordinatorProxy* scrollingCoordinatorProxy() const { return m_scrollingCoordinatorProxy.get(); } 338 341 339 342 WebBackForwardList& backForwardList() { return m_backForwardList.get(); } … … 1170 1173 1171 1174 std::unique_ptr<DrawingAreaProxy> m_drawingArea; 1175 std::unique_ptr<RemoteScrollingCoordinatorProxy> m_scrollingCoordinatorProxy; 1176 1172 1177 Ref<WebProcessProxy> m_process; 1173 1178 Ref<WebPageGroup> m_pageGroup; -
trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.h
r161373 r161387 35 35 36 36 class RemoteLayerTreeTransaction; 37 class RemoteScrollingCoordinatorTransaction; 37 38 38 39 class RemoteLayerTreeDrawingAreaProxy : public DrawingAreaProxy { … … 52 53 53 54 // Message handlers 54 void commitLayerTree(const RemoteLayerTreeTransaction& );55 void commitLayerTree(const RemoteLayerTreeTransaction&, const RemoteScrollingCoordinatorTransaction&); 55 56 56 57 void sendUpdateGeometry(); -
trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.messages.in
r161327 r161387 22 22 23 23 messages -> RemoteLayerTreeDrawingAreaProxy { 24 void CommitLayerTree(WebKit::RemoteLayerTreeTransaction layerTreeTransaction )24 void CommitLayerTree(WebKit::RemoteLayerTreeTransaction layerTreeTransaction, WebKit::RemoteScrollingCoordinatorTransaction scrollingTreeTransaction) 25 25 } -
trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm
r161327 r161387 29 29 #import "RemoteLayerTreeDrawingAreaProxyMessages.h" 30 30 #import "DrawingAreaMessages.h" 31 #import "RemoteScrollingCoordinatorProxy.h" 31 32 #import "WebPageProxy.h" 32 33 #import "WebProcessProxy.h" … … 83 84 } 84 85 85 void RemoteLayerTreeDrawingAreaProxy::commitLayerTree(const RemoteLayerTreeTransaction& layerTreeTransaction )86 void RemoteLayerTreeDrawingAreaProxy::commitLayerTree(const RemoteLayerTreeTransaction& layerTreeTransaction, const RemoteScrollingCoordinatorTransaction& scrollingTreeTransaction) 86 87 { 87 88 m_remoteLayerTreeHost.updateLayerTree(layerTreeTransaction); 89 m_webPageProxy->scrollingCoordinatorProxy()->updateScrollingTree(scrollingTreeTransaction); 88 90 } 89 91 -
trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm
r161327 r161387 90 90 CALayer *RemoteLayerTreeHost::getLayer(GraphicsLayer::PlatformLayerID layerID) const 91 91 { 92 if (!layerID) 93 return nil; 94 92 95 return m_layers.get(layerID).get(); 93 96 } -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r161373 r161387 58 58 0F5947A3187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F5947A1187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp */; }; 59 59 0F5947A4187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5947A2187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h */; }; 60 0F5947A7187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F5947A5187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp */; }; 61 0F5947A8187B517600437857 /* RemoteScrollingCoordinatorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F5947A6187B517600437857 /* RemoteScrollingCoordinatorMessages.h */; }; 60 62 0FB659231208B4DB0044816C /* DrawingAreaInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */; }; 61 63 0FF24A2D1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */; }; … … 1604 1606 0F5947A1187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteScrollingCoordinatorTransaction.cpp; path = Scrolling/RemoteScrollingCoordinatorTransaction.cpp; sourceTree = "<group>"; }; 1605 1607 0F5947A2187B3B7D00437857 /* RemoteScrollingCoordinatorTransaction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteScrollingCoordinatorTransaction.h; path = Scrolling/RemoteScrollingCoordinatorTransaction.h; sourceTree = "<group>"; }; 1608 0F5947A5187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteScrollingCoordinatorMessageReceiver.cpp; path = RemoteScrollingCoordinatorMessageReceiver.cpp; sourceTree = "<group>"; }; 1609 0F5947A6187B517600437857 /* RemoteScrollingCoordinatorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteScrollingCoordinatorMessages.h; path = RemoteScrollingCoordinatorMessages.h; sourceTree = "<group>"; }; 1606 1610 0FB659221208B4DB0044816C /* DrawingAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaInfo.h; sourceTree = "<group>"; }; 1607 1611 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp; sourceTree = "<group>"; }; … … 5595 5599 0FF24A2B1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessageReceiver.cpp */, 5596 5600 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */, 5601 0F5947A5187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp */, 5602 0F5947A6187B517600437857 /* RemoteScrollingCoordinatorMessages.h */, 5597 5603 E18E6911169B667B009B6670 /* SecItemShimMessageReceiver.cpp */, 5598 5604 E18E6912169B667B009B6670 /* SecItemShimMessages.h */, … … 6108 6114 BCA0EF9F12332642007D3CFB /* WebEditCommandProxy.h in Headers */, 6109 6115 BC032D7D10F4378D0058C15A /* WebEditorClient.h in Headers */, 6116 0F5947A8187B517600437857 /* RemoteScrollingCoordinatorMessages.h in Headers */, 6110 6117 516A4A5D120A2CCD00C05B7F /* APIError.h in Headers */, 6111 6118 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */, … … 7598 7605 378E1A3D181ED6FF0031007A /* APIObject.mm in Sources */, 7599 7606 51FB08FF1639DE1A00EC324A /* WebResourceLoadScheduler.cpp in Sources */, 7607 0F5947A7187B517600437857 /* RemoteScrollingCoordinatorMessageReceiver.cpp in Sources */, 7600 7608 D3B9484811FF4B6500032B39 /* WebSearchPopupMenu.cpp in Sources */, 7601 7609 BCC5715C115ADAEF001CCAF9 /* WebSystemInterface.mm in Sources */, -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r161152 r161387 33 33 #include "LayerTreeHost.h" 34 34 #include "PageBanner.h" 35 #include "RemoteScrollingCoordinator.h" 35 36 #include "WebColorChooser.h" 36 37 #include "WebCoreArgumentCoders.h" … … 799 800 #endif 800 801 802 PassRefPtr<ScrollingCoordinator> WebChromeClient::createScrollingCoordinator(Page* page) const 803 { 804 ASSERT(m_page->corePage() == page); 805 if (m_page->drawingArea()->type() == DrawingAreaTypeRemoteLayerTree) 806 return RemoteScrollingCoordinator::create(m_page); 807 808 return 0; 809 } 810 801 811 #if ENABLE(TOUCH_EVENTS) 802 812 void WebChromeClient::needTouchEvents(bool needTouchEvents) -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
r161106 r161387 228 228 #endif 229 229 230 virtual PassRefPtr<WebCore::ScrollingCoordinator> createScrollingCoordinator(WebCore::Page*) const OVERRIDE; 231 230 232 #if ENABLE(TOUCH_EVENTS) 231 233 virtual void needTouchEvents(bool) OVERRIDE; -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r161367 r161387 3152 3152 } 3153 3153 3154 ScrollingCoordinator* WebPage::scrollingCoordinator() const 3155 { 3156 return m_page->scrollingCoordinator(); 3157 } 3158 3154 3159 WebPage::SandboxExtensionTracker::~SandboxExtensionTracker() 3155 3160 { -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r161358 r161387 184 184 InjectedBundleBackForwardList* backForwardList(); 185 185 DrawingArea* drawingArea() const { return m_drawingArea.get(); } 186 WebCore::ScrollingCoordinator* scrollingCoordinator() const; 186 187 187 188 WebPageGroupProxy* pageGroup() const { return m_pageGroup.get(); } -
trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h
r161327 r161387 65 65 virtual void setPageOverlayNeedsDisplay(PageOverlay*, const WebCore::IntRect&) OVERRIDE; 66 66 virtual void setPageOverlayOpacity(PageOverlay*, float) OVERRIDE; 67 virtual bool supportsAsyncScrolling() OVERRIDE { return true; } 67 68 68 69 virtual void setLayerTreeStateIsFrozen(bool) OVERRIDE; -
trunk/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm
r161327 r161387 31 31 #import "RemoteLayerTreeContext.h" 32 32 #import "RemoteLayerTreeDrawingAreaProxyMessages.h" 33 #import "RemoteScrollingCoordinator.h" 34 #import "RemoteScrollingCoordinatorTransaction.h" 33 35 #import "WebPage.h" 34 36 #import <WebCore/Frame.h> … … 320 322 m_remoteLayerTreeContext->buildTransaction(layerTransaction, *m_rootLayer); 321 323 322 m_webPage->send(Messages::RemoteLayerTreeDrawingAreaProxy::CommitLayerTree(layerTransaction)); 324 RemoteScrollingCoordinatorTransaction scrollingTransaction; 325 if (m_webPage->scrollingCoordinator()) 326 toRemoteScrollingCoordinator(m_webPage->scrollingCoordinator())->buildTransaction(scrollingTransaction); 327 328 m_webPage->send(Messages::RemoteLayerTreeDrawingAreaProxy::CommitLayerTree(layerTransaction, scrollingTransaction)); 323 329 } 324 330
Note: See TracChangeset
for help on using the changeset viewer.