Changeset 166333 in webkit

Timestamp:

Mar 26, 2014 7:15:48 PM (10 years ago)

Author:

Simon Fraser

Message:

Hook up -webkit-overflow-scrolling:touch for iOS WK2
​https://bugs.webkit.org/show_bug.cgi?id=130809

Reviewed by Tim Horton.

Source/WebCore:

Get -webkit-overflow-scrolling: touch working for iOS WK2.

• WebCore.exp.in:
• page/scrolling/AsyncScrollingCoordinator.cpp:

(WebCore::AsyncScrollingCoordinator::updateScrollingNode):
Send in ScrollingGeometry when we update scrolling nodes.

• page/scrolling/AsyncScrollingCoordinator.h:
• page/scrolling/ScrollingCoordinator.h:

(WebCore::ScrollingCoordinator::updateScrollingNode):

• page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h:

Need to get to the scrolling layer in a subclass.
(WebCore::ScrollingTreeScrollingNodeIOS::scrollLayer):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::hasAcceleratedTouchScrolling): Remove code
that temporarily disabled touch-scrolling.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer): When we
update scrolling nodes, send in the right scrolling geometry.

Source/WebKit2:

• UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
• UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:

(WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren):
Set the content size of the UIScrollVIew based on the geometry.

• UIProcess/ios/RemoteLayerTreeHostIOS.mm:

(WebKit::RemoteLayerTreeHost::createLayer): Make a UIScrollView if the
layer properties tell us that we have the scrolling behavior.

• UIProcess/ios/WKContentView.mm:

(-[WKContentView initWithFrame:context:WebKit::configuration:WebKit::webView:]):
We need to allow user interaction in the _rootContentView so that events get to
nested UIScrollViews (this could be optimized in future).

• UIProcess/mac/RemoteLayerTreeHost.h:
• UIProcess/mac/RemoteLayerTreeHost.mm:

(WebKit::RemoteLayerTreeHost::updateLayerTree):
(WebKit::RemoteLayerTreeHost::createLayer): Need to pass RemoteLayerTreeTransaction::LayerProperties
in so we can get at the custom behavior.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (modified) (2 diffs)
• WebCore/page/scrolling/AsyncScrollingCoordinator.h (modified) (1 diff)
• WebCore/page/scrolling/ScrollingCoordinator.h (modified) (1 diff)
• WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h (modified) (2 diffs)
• WebCore/rendering/RenderLayer.cpp (modified) (1 diff)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (modified) (1 diff)
• WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (modified) (2 diffs)
• WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm (modified) (3 diffs)
• WebKit2/UIProcess/ios/WKContentView.mm (modified) (1 diff)
• WebKit2/UIProcess/mac/RemoteLayerTreeHost.h (modified) (1 diff)
• WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-26  Simon Fraser  <simon.fraser@apple.com>
+
+        Hook up -webkit-overflow-scrolling:touch for iOS WK2
+        https://bugs.webkit.org/show_bug.cgi?id=130809
+
+        Reviewed by Tim Horton.
+
+        Get -webkit-overflow-scrolling: touch working for iOS WK2.
+        
+        * WebCore.exp.in:
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::updateScrollingNode):
+        Send in ScrollingGeometry when we update scrolling nodes.
+        * page/scrolling/AsyncScrollingCoordinator.h:
+        * page/scrolling/ScrollingCoordinator.h:
+        (WebCore::ScrollingCoordinator::updateScrollingNode):
+        * page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h:
+        Need to get to the scrolling layer in a subclass.
+        (WebCore::ScrollingTreeScrollingNodeIOS::scrollLayer):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::hasAcceleratedTouchScrolling): Remove code
+        that temporarily disabled touch-scrolling.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer): When we
+        update scrolling nodes, send in the right scrolling geometry.
+
 2014-03-26  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -2757 +2757 @@
 __ZN7WebCore25AsyncScrollingCoordinator18syncChildPositionsERKNS_10LayoutRectE
 __ZN7WebCore25AsyncScrollingCoordinator19detachFromStateTreeEy
-__ZN7WebCore25AsyncScrollingCoordinator19updateScrollingNodeEyPNS_13GraphicsLayerES2_S2_
+__ZN7WebCore25AsyncScrollingCoordinator19updateScrollingNodeEyPNS_13GraphicsLayerES2_S2_RKNS_20ScrollingCoordinator17ScrollingGeometryE
 __ZN7WebCore25AsyncScrollingCoordinator22frameViewLayoutUpdatedEPNS_9FrameViewE
 __ZN7WebCore25AsyncScrollingCoordinator27frameViewRootLayerDidChangeEPNS_9FrameViewE

trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

@@ -288 +288 @@
 }
 
-void AsyncScrollingCoordinator::updateScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer)
+void AsyncScrollingCoordinator::updateScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, const ScrollingGeometry& scrollingGeometry)
 {
     ScrollingStateScrollingNode* node = toScrollingStateScrollingNode(m_scrollingStateTree->stateNodeForID(nodeID));
@@ -298 +298 @@
     node->setScrolledContentsLayer(scrolledContentsLayer);
     node->setCounterScrollingLayer(counterScrollingLayer);
+
+    node->setScrollOrigin(scrollingGeometry.scrollOrigin);
+    node->setScrollPosition(scrollingGeometry.scrollPosition);
+    node->setTotalContentsSize(scrollingGeometry.contentSize);
 }
 

trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h

@@ -88 +88 @@
 
     virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportConstraints&, GraphicsLayer*) override;
-    virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer*, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer) override;
+    virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer*, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, const ScrollingGeometry&) override;
     virtual String scrollingStateTreeAsText() const override;
     virtual bool isRubberBandInProgress() const override;

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h

@@ -153 +153 @@
     virtual void clearStateTree() { }
     virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportConstraints&, GraphicsLayer*) { }
-    virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer* /*scrollLayer*/, GraphicsLayer* /*scrolledContentsLayer*/, GraphicsLayer* /*counterScrollingLayer*/) { }
+
+    struct ScrollingGeometry {
+        IntSize contentSize;
+        FloatPoint scrollPosition;
+        IntPoint scrollOrigin;
+    };
+
+    virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer* /*scrollLayer*/, GraphicsLayer* /*scrolledContentsLayer*/, GraphicsLayer* /*counterScrollingLayer*/, const ScrollingGeometry&) { }
     virtual void syncChildPositions(const LayoutRect&) { }
     virtual String scrollingStateTreeAsText() const;

trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h

@@ -44 +44 @@
     ScrollingTreeScrollingNodeIOS(ScrollingTree&, ScrollingNodeType, ScrollingNodeID);
 
-private:
     // ScrollingTreeNode member functions.
     virtual void updateBeforeChildren(const ScrollingStateNode&) override;
@@ -50 +49 @@
     virtual void handleWheelEvent(const PlatformWheelEvent&) override { }
 
+    CALayer *scrollLayer() const { return m_scrollLayer.get(); }
+
+private:
     FloatPoint scrollPosition() const;
     virtual void setScrollPosition(const FloatPoint&) override;

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2088 +2088 @@
         return false;
 
-    // Temporary: turn off accelerated scrolling in WK2.
-    if (Page* page = renderer().frame().page()) {
-        if (page->scrollingCoordinator())
-            return false;
-    }
-    
     Settings* settings = renderer().document().settings();
-
     // FIXME: settings should not be null at this point. If you find a reliable way to hit this assertion, please file a bug.
     // See <rdar://problem/10266101>.

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -3521 +3521 @@
         GraphicsLayer* counterScrollingLayer = nullptr;
 
+        ScrollingCoordinator::ScrollingGeometry scrollingGeometry;
         if (isRootLayer) {
             scrollingLayer = m_scrollLayer.get();
             scrolledContentsLayer = nullptr;
             counterScrollingLayer = fixedRootBackgroundLayer();
-        }
-    
-        scrollingCoordinator->updateScrollingNode(nodeID, scrollingLayer, scrolledContentsLayer, counterScrollingLayer);
+
+            scrollingGeometry.scrollOrigin = m_renderView.frameView().scrollOrigin();
+            scrollingGeometry.scrollPosition = m_renderView.frameView().scrollPosition();
+            scrollingGeometry.contentSize = m_renderView.frameView().totalContentsSize();
+        } else {
+            scrollingGeometry.scrollOrigin = layer.scrollOrigin();
+            scrollingGeometry.scrollPosition = layer.scrollPosition();
+            scrollingGeometry.contentSize = layer.contentsSize();
+        }
+
+        scrollingCoordinator->updateScrollingNode(nodeID, scrollingLayer, scrolledContentsLayer, counterScrollingLayer, scrollingGeometry);
     }
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-26  Simon Fraser  <simon.fraser@apple.com>
+
+        Hook up -webkit-overflow-scrolling:touch for iOS WK2
+        https://bugs.webkit.org/show_bug.cgi?id=130809
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+        * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+        (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren):
+        Set the content size of the UIScrollVIew based on the geometry.
+        * UIProcess/ios/RemoteLayerTreeHostIOS.mm:
+        (WebKit::RemoteLayerTreeHost::createLayer): Make a UIScrollView if the
+        layer properties tell us that we have the scrolling behavior.
+        * UIProcess/ios/WKContentView.mm:
+        (-[WKContentView initWithFrame:context:WebKit::configuration:WebKit::webView:]):
+        We need to allow user interaction in the _rootContentView so that events get to
+        nested UIScrollViews (this could be optimized in future).
+        * UIProcess/mac/RemoteLayerTreeHost.h:
+        * UIProcess/mac/RemoteLayerTreeHost.mm:
+        (WebKit::RemoteLayerTreeHost::updateLayerTree):
+        (WebKit::RemoteLayerTreeHost::createLayer): Need to pass RemoteLayerTreeTransaction::LayerProperties
+        in so we can get at the custom behavior.
+
 2014-03-26  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h

@@ -42 +42 @@
 private:
     ScrollingTreeOverflowScrollingNodeIOS(WebCore::ScrollingTree&, WebCore::ScrollingNodeID);
+
+    virtual void updateAfterChildren(const WebCore::ScrollingStateNode&) override;
+
 };
 

trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm

@@ -26 +26 @@
 #import "config.h"
 #import "ScrollingTreeOverflowScrollingNodeIOS.h"
+#import <WebCore/BlockExceptions.h>
+#import <WebCore/ScrollingStateScrollingNode.h>
+#import <UIKit/UIScrollView.h>
 
 #if PLATFORM(IOS)
@@ -48 +51 @@
 }
 
+void ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren(const ScrollingStateNode& stateNode)
+{
+    ScrollingTreeScrollingNodeIOS::updateAfterChildren(stateNode);
+
+    const auto& scrollingStateNode = toScrollingStateScrollingNode(stateNode);
+
+    if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize)) {
+        BEGIN_BLOCK_OBJC_EXCEPTIONS
+        UIScrollView *scrollView = (UIScrollView *)[scrollLayer() delegate];
+        ASSERT([scrollView isKindOfClass:[UIScrollView self]]);
+
+        scrollView.contentSize = scrollingStateNode.totalContentsSize();
+
+        END_BLOCK_OBJC_EXCEPTIONS
+    }
+}
+
 } // namespace WebCore
 

trunk/Source/WebKit2/UIProcess/ios/RemoteLayerTreeHostIOS.mm

@@ -33 +33 @@
 #import <WebKitSystemInterface.h>
 
-#import <UIKit/UIView.h>
+#import <UIKit/UIScrollView.h>
 #import <QuartzCore/QuartzCore.h>
 
@@ -77 +77 @@
 namespace WebKit {
 
-LayerOrView *RemoteLayerTreeHost::createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties& properties)
+LayerOrView *RemoteLayerTreeHost::createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties& properties, const RemoteLayerTreeTransaction::LayerProperties* layerProperties)
 {
     RetainPtr<LayerOrView>& layerOrView = m_layers.add(properties.layerID, nullptr).iterator->value;
@@ -91 +91 @@
     case PlatformCALayer::LayerTypePageTiledBackingLayer:
     case PlatformCALayer::LayerTypeTiledBackingTileLayer:
-        layerOrView = adoptNS([[UIView alloc] initWithFrame:CGRectZero]);
+        if (layerProperties && layerProperties->customBehavior == GraphicsLayer::CustomScrollingBehavior)
+            layerOrView = adoptNS([[UIScrollView alloc] init]);
+        else
+            layerOrView = adoptNS([[UIView alloc] init]);
         break;
     case PlatformCALayer::LayerTypeTransformLayer:
-        layerOrView = adoptNS([[WKTransformView alloc] initWithFrame:CGRectZero]);
+        layerOrView = adoptNS([[WKTransformView alloc] init]);
         break;
     case PlatformCALayer::LayerTypeCustom:

trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm

@@ -180 +180 @@
     _rootContentView = adoptNS([[UIView alloc] init]);
     [_rootContentView layer].masksToBounds = NO;
-    [_rootContentView setUserInteractionEnabled:NO];
 
     [self addSubview:_rootContentView.get()];

trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.h

@@ -52 +52 @@
 
 private:
-    LayerOrView *createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties&);
+    LayerOrView *createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties&, const RemoteLayerTreeTransaction::LayerProperties*);
 
     LayerOrView *m_rootLayer;

trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeHost.mm

@@ -54 +54 @@
 bool RemoteLayerTreeHost::updateLayerTree(const RemoteLayerTreeTransaction& transaction, float indicatorScaleFactor)
 {
-    for (const auto& createdLayer : transaction.createdLayers())
-        createLayer(createdLayer);
+    for (const auto& createdLayer : transaction.createdLayers()) {
+        const RemoteLayerTreeTransaction::LayerProperties* properties = transaction.changedLayers().get(createdLayer.layerID);
+        createLayer(createdLayer, properties);
+    }
 
     bool rootLayerChanged = false;
@@ -106 +108 @@
 
 #if !PLATFORM(IOS)
-LayerOrView *RemoteLayerTreeHost::createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties& properties)
+LayerOrView *RemoteLayerTreeHost::createLayer(const RemoteLayerTreeTransaction::LayerCreationProperties& properties, const RemoteLayerTreeTransaction::LayerProperties*)
 {
     RetainPtr<CALayer>& layer = m_layers.add(properties.layerID, nullptr).iterator->value;