Changeset 201901 in webkit

Timestamp:

Jun 9, 2016 7:06:30 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS] -webkit-overflow-scrolling: touch; ignores pointer-events: none;
​https://bugs.webkit.org/show_bug.cgi?id=119839
<rdar://problem/9671514>

Patch by Antoine Quint <Antoine Quint> on 2016-06-09
Reviewed by Simon Fraser.

Source/WebCore:

Propagate a "userInteractionEnabled" flag from the Web process which is used to turn off
user interaction on a UIScrollView created for -webkit-overflow-scrolling: touch.

Test: fast/scrolling/ios/touch-scroll-pointer-events-none.html

• platform/graphics/GraphicsLayer.cpp:

(WebCore::GraphicsLayer::GraphicsLayer):

• platform/graphics/GraphicsLayer.h:

(WebCore::GraphicsLayer::userInteractionEnabled):
(WebCore::GraphicsLayer::setUserInteractionEnabled):

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::setUserInteractionEnabled):
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateUserInteractionEnabled):

• platform/graphics/ca/GraphicsLayerCA.h:
• platform/graphics/ca/PlatformCALayer.h:
• platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
• platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:

(PlatformCALayerCocoa::userInteractionEnabled):
(PlatformCALayerCocoa::setUserInteractionEnabled):

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::updateAfterDescendants):

Source/WebKit2:

Propagate a "userInteractionEnabled" flag from the Web process which is used to turn off
user interaction on a UIScrollView created for -webkit-overflow-scrolling: touch.

• Shared/mac/RemoteLayerTreePropertyApplier.mm:

(WebKit::RemoteLayerTreePropertyApplier::applyProperties):

• Shared/mac/RemoteLayerTreeTransaction.h:
• Shared/mac/RemoteLayerTreeTransaction.mm:

(WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
(WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
(WebKit::dumpChangedLayers):

• WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:

(WebKit::PlatformCALayerRemote::userInteractionEnabled):
(WebKit::PlatformCALayerRemote::setUserInteractionEnabled):

• WebProcess/WebPage/mac/PlatformCALayerRemote.h:

LayoutTests:

• fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt: Added.
• fast/scrolling/ios/touch-scroll-pointer-events-none.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt (added)
• LayoutTests/fast/scrolling/ios/touch-scroll-pointer-events-none.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• Source/WebCore/platform/graphics/GraphicsLayer.h (modified) (2 diffs)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (3 diffs)
• Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h (modified) (3 diffs)
• Source/WebCore/platform/graphics/ca/PlatformCALayer.h (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h (modified) (1 diff)
• Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (modified) (1 diff)
• Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h (modified) (2 diffs)
• Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm (modified) (5 diffs)
• Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-09  Antoine Quint  <graouts@apple.com>
+
+        [iOS] -webkit-overflow-scrolling: touch; ignores pointer-events: none;
+        https://bugs.webkit.org/show_bug.cgi?id=119839
+        <rdar://problem/9671514>
+
+        Reviewed by Simon Fraser.
+
+        * fast/scrolling/ios/touch-scroll-pointer-events-none-expected.txt: Added.
+        * fast/scrolling/ios/touch-scroll-pointer-events-none.html: Added.
+
 2016-06-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-09  Antoine Quint  <graouts@apple.com>
+
+        [iOS] -webkit-overflow-scrolling: touch; ignores pointer-events: none;
+        https://bugs.webkit.org/show_bug.cgi?id=119839
+        <rdar://problem/9671514>
+
+        Reviewed by Simon Fraser.
+
+        Propagate a "userInteractionEnabled" flag from the Web process which is used to turn off
+        user interaction on a UIScrollView created for -webkit-overflow-scrolling: touch.
+
+        Test: fast/scrolling/ios/touch-scroll-pointer-events-none.html
+
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::GraphicsLayer):
+        * platform/graphics/GraphicsLayer.h:
+        (WebCore::GraphicsLayer::userInteractionEnabled):
+        (WebCore::GraphicsLayer::setUserInteractionEnabled):
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::setUserInteractionEnabled):
+        (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+        (WebCore::GraphicsLayerCA::updateUserInteractionEnabled):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        * platform/graphics/ca/PlatformCALayer.h:
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.h:
+        * platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
+        (PlatformCALayerCocoa::userInteractionEnabled):
+        (PlatformCALayerCocoa::setUserInteractionEnabled):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateAfterDescendants):
+
 2016-06-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -129 +129 @@
     , m_isMaskLayer(false)
     , m_isTrackingDisplayListReplay(false)
+    , m_userInteractionEnabled(true)
     , m_paintingPhase(GraphicsLayerPaintAllWithOverflowClip)
     , m_contentsOrientation(CompositingCoordinatesTopDown)

trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

@@ -347 +347 @@
     virtual void setContentsVisible(bool b) { m_contentsVisible = b; }
 
+    bool userInteractionEnabled() const { return m_userInteractionEnabled; }
+    virtual void setUserInteractionEnabled(bool b) { m_userInteractionEnabled = b; }
+    
     bool acceleratesDrawing() const { return m_acceleratesDrawing; }
     virtual void setAcceleratesDrawing(bool b) { m_acceleratesDrawing = b; }
@@ -627 +630 @@
     bool m_isMaskLayer : 1;
     bool m_isTrackingDisplayListReplay : 1;
+    bool m_userInteractionEnabled : 1;
     
     GraphicsLayerPaintingPhase m_paintingPhase;

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -677 +677 @@
 }
 
+void GraphicsLayerCA::setUserInteractionEnabled(bool userInteractionEnabled)
+{
+    if (userInteractionEnabled == m_userInteractionEnabled)
+        return;
+    
+    GraphicsLayer::setUserInteractionEnabled(userInteractionEnabled);
+    noteLayerPropertyChanged(UserInteractionEnabledChanged);
+}
+
 void GraphicsLayerCA::setAcceleratesDrawing(bool acceleratesDrawing)
 {
@@ -1580 +1589 @@
         updateContentsVisibility();
 
+    if (m_uncommittedChanges & UserInteractionEnabledChanged)
+        updateUserInteractionEnabled();
+
     // Note that contentsScale can affect whether the layer can be opaque.
     if (m_uncommittedChanges & ContentsOpaqueChanged)
@@ -1883 +1895 @@
 
     m_layer->setContentsHidden(!m_contentsVisible);
+}
+
+void GraphicsLayerCA::updateUserInteractionEnabled()
+{
+    m_layer->setUserInteractionEnabled(m_userInteractionEnabled);
 }
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

@@ -92 +92 @@
     WEBCORE_EXPORT void setAcceleratesDrawing(bool) override;
     WEBCORE_EXPORT void setUsesDisplayListDrawing(bool) override;
+    WEBCORE_EXPORT void setUserInteractionEnabled(bool) override;
 
     WEBCORE_EXPORT void setBackgroundColor(const Color&) override;
@@ -400 +401 @@
     void updateCoverage();
     void updateBackgroundColor();
+    void updateUserInteractionEnabled();
 
     void updateContentsImage();
@@ -496 +498 @@
         ShapeChanged =                  1LLU << 35,
         WindRuleChanged =               1LLU << 36,
+        UserInteractionEnabledChanged = 1LLU << 37,
     };
     typedef uint64_t LayerChangeFlags;

trunk/Source/WebCore/platform/graphics/ca/PlatformCALayer.h

@@ -162 +162 @@
     virtual bool contentsHidden() const = 0;
     virtual void setContentsHidden(bool) = 0;
+    virtual bool userInteractionEnabled() const = 0;
+    virtual void setUserInteractionEnabled(bool) = 0;
 
     virtual bool geometryFlipped() const = 0;

trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.h

@@ -93 +93 @@
     bool contentsHidden() const override;
     void setContentsHidden(bool) override;
+
+    bool userInteractionEnabled() const override;
+    void setUserInteractionEnabled(bool) override;
 
     void setBackingStoreAttached(bool) override;

trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

@@ -629 +629 @@
 }
 
+bool PlatformCALayerCocoa::userInteractionEnabled() const
+{
+    return true;
+}
+
+void PlatformCALayerCocoa::setUserInteractionEnabled(bool)
+{
+}
+
 void PlatformCALayerCocoa::setBackingStoreAttached(bool)
 {

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1072 +1072 @@
 
     m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || isPaintDestinationForDescendantLayers());
-    if (m_scrollingLayer)
+    if (m_scrollingLayer) {
         m_scrollingLayer->setContentsVisible(renderer().style().visibility() == VISIBLE);
+        m_scrollingLayer->setUserInteractionEnabled(renderer().style().pointerEvents() != PE_NONE);
+    }
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-06-09  Antoine Quint  <graouts@apple.com>
+
+        [iOS] -webkit-overflow-scrolling: touch; ignores pointer-events: none;
+        https://bugs.webkit.org/show_bug.cgi?id=119839
+        <rdar://problem/9671514>
+
+        Reviewed by Simon Fraser.
+
+        Propagate a "userInteractionEnabled" flag from the Web process which is used to turn off
+        user interaction on a UIScrollView created for -webkit-overflow-scrolling: touch.
+
+        * Shared/mac/RemoteLayerTreePropertyApplier.mm:
+        (WebKit::RemoteLayerTreePropertyApplier::applyProperties):
+        * Shared/mac/RemoteLayerTreeTransaction.h:
+        * Shared/mac/RemoteLayerTreeTransaction.mm:
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::LayerProperties):
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::encode):
+        (WebKit::RemoteLayerTreeTransaction::LayerProperties::decode):
+        (WebKit::dumpChangedLayers):
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.cpp:
+        (WebKit::PlatformCALayerRemote::userInteractionEnabled):
+        (WebKit::PlatformCALayerRemote::setUserInteractionEnabled):
+        * WebProcess/WebPage/mac/PlatformCALayerRemote.h:
+
 2016-06-09  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm

@@ -332 +332 @@
         }
     }
-    
-    if (properties.changedProperties & RemoteLayerTreeTransaction::ContentsHiddenChanged)
-        view.userInteractionEnabled = !properties.contentsHidden;
+
+    if (properties.changedProperties & (RemoteLayerTreeTransaction::ContentsHiddenChanged | RemoteLayerTreeTransaction::UserInteractionEnabledChanged))
+        view.userInteractionEnabled = !properties.contentsHidden && properties.userInteractionEnabled;
 
     END_BLOCK_OBJC_EXCEPTIONS;

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.h

@@ -90 +90 @@
         EdgeAntialiasingMaskChanged     = 1LLU << 35,
         CustomAppearanceChanged         = 1LLU << 36,
+        UserInteractionEnabledChanged   = 1LLU << 37,
     };
     typedef uint64_t LayerChange;
@@ -167 +168 @@
         bool opaque;
         bool contentsHidden;
+        bool userInteractionEnabled;
     };
 

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm

@@ -105 +105 @@
     , opaque(false)
     , contentsHidden(false)
+    , userInteractionEnabled(true)
 {
 }
@@ -143 +144 @@
     , opaque(other.opaque)
     , contentsHidden(other.contentsHidden)
+    , userInteractionEnabled(other.userInteractionEnabled)
 {
     // FIXME: LayerProperties should reference backing store by ID, so that two layers can have the same backing store (for clones).
@@ -274 +276 @@
     if (changedProperties & CustomAppearanceChanged)
         encoder.encodeEnum(customAppearance);
+
+    if (changedProperties & UserInteractionEnabledChanged)
+        encoder << userInteractionEnabled;
 }
 
@@ -489 +494 @@
     if (result.changedProperties & CustomAppearanceChanged) {
         if (!decoder.decodeEnum(result.customAppearance))
+            return false;
+    }
+
+    if (result.changedProperties & UserInteractionEnabledChanged) {
+        if (!decoder.decode(result.userInteractionEnabled))
             return false;
     }
@@ -815 +825 @@
         if (layerProperties.changedProperties & RemoteLayerTreeTransaction::CustomAppearanceChanged)
             ts.dumpProperty("customAppearance", layerProperties.customAppearance);
+
+        if (layerProperties.changedProperties & RemoteLayerTreeTransaction::UserInteractionEnabledChanged)
+            ts.dumpProperty("userInteractionEnabled", layerProperties.userInteractionEnabled);
     }
 }

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.cpp

@@ -528 +528 @@
 }
 
+bool PlatformCALayerRemote::userInteractionEnabled() const
+{
+    return m_properties.userInteractionEnabled;
+}
+
+void PlatformCALayerRemote::setUserInteractionEnabled(bool value)
+{
+    if (m_properties.userInteractionEnabled == value)
+        return;
+    
+    m_properties.userInteractionEnabled = value;
+    m_properties.notePropertiesChanged(RemoteLayerTreeTransaction::UserInteractionEnabledChanged);
+}
+
 void PlatformCALayerRemote::setBackingStoreAttached(bool value)
 {

trunk/Source/WebKit2/WebProcess/WebPage/mac/PlatformCALayerRemote.h

@@ -98 +98 @@
     void setContentsHidden(bool) override;
 
+    bool userInteractionEnabled() const override;
+    void setUserInteractionEnabled(bool) override;
+
     void setBackingStoreAttached(bool) override;
     bool backingStoreAttached() const override;