Attachment 369479 Details for Bug 197281 – patch

[patch] patch

touch-action-inline-block.patch (text/plain), 4.72 KB, created by Antti Koivisto on 2019-05-09 01:54:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2019-05-09 01:54:37 PDT

Size: 4.72 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 245112)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2019-05-09  Antti Koivisto  <antti@apple.com>
>+
>+        Elements with "display: inline-block" don't have a touch-action region
>+        https://bugs.webkit.org/show_bug.cgi?id=197281
>+        <rdar://problem/50535081>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Test: pointerevents/ios/touch-action-region-inline-block.html
>+
>+        PaintPhase::EventRegion failed to traverse into inline boxes.
>+
>+        * rendering/InlineElementBox.cpp:
>+        (WebCore::InlineElementBox::paint):
>+        * rendering/RenderElement.cpp:
>+        (WebCore::RenderElement::paintAsInlineBlock):
>+
> 2019-05-08  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         REGRESSION(r239915): [FreeType] White space skipped when rendering plain text with noto CJK font
>Index: Source/WebCore/rendering/InlineElementBox.cpp
>===================================================================
>--- Source/WebCore/rendering/InlineElementBox.cpp	(revision 245051)
>+++ Source/WebCore/rendering/InlineElementBox.cpp	(working copy)
>@@ -71,7 +71,7 @@ void InlineElementBox::paint(PaintInfo& 
>     if (!paintInfo.shouldPaintWithinRoot(renderer()))
>         return;
> 
>-    if (paintInfo.phase != PaintPhase::Foreground && paintInfo.phase != PaintPhase::Selection)
>+    if (paintInfo.phase != PaintPhase::Foreground && paintInfo.phase != PaintPhase::Selection && paintInfo.phase != PaintPhase::EventRegion)
>         return;
> 
>     LayoutPoint childPoint = paintOffset;
>Index: Source/WebCore/rendering/RenderElement.cpp
>===================================================================
>--- Source/WebCore/rendering/RenderElement.cpp	(revision 245051)
>+++ Source/WebCore/rendering/RenderElement.cpp	(working copy)
>@@ -998,7 +998,7 @@ void RenderElement::paintAsInlineBlock(P
>     // (See Appendix E.2, section 6.4 on inline block/table/replaced elements in the CSS2.1 specification.)
>     // This is also used by other elements (e.g. flex items and grid items).
>     PaintPhase paintPhaseToUse = isExcludedAndPlacedInBorder() ? paintInfo.phase : PaintPhase::Foreground;
>-    if (paintInfo.phase == PaintPhase::Selection)
>+    if (paintInfo.phase == PaintPhase::Selection || paintInfo.phase == PaintPhase::EventRegion)
>         paint(paintInfo, childPoint);
>     else if (paintInfo.phase == paintPhaseToUse) {
>         paintPhase(*this, PaintPhase::BlockBackground, paintInfo, childPoint);
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 245051)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-05-09  Antti Koivisto  <antti@apple.com>
>+
>+        Elements with "display: inline-block" don't have a touch-action region
>+        https://bugs.webkit.org/show_bug.cgi?id=197281
>+        <rdar://problem/50535081>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * pointerevents/ios/touch-action-region-inline-block-expected.txt: Added.
>+        * pointerevents/ios/touch-action-region-inline-block.html: Added.
>+
> 2019-05-07  Jiewen Tan  <jiewen_tan@apple.com>
> 
>         [WebAuthN] A new request should always suppress the pending request if any
>Index: LayoutTests/pointerevents/ios/touch-action-region-inline-block-expected.txt
>===================================================================
>--- LayoutTests/pointerevents/ios/touch-action-region-inline-block-expected.txt	(nonexistent)
>+++ LayoutTests/pointerevents/ios/touch-action-region-inline-block-expected.txt	(working copy)
>@@ -0,0 +1,21 @@
>+ (GraphicsLayer
>+  (anchor 0.00 0.00)
>+  (bounds 800.00 600.00)
>+  (children 1
>+    (GraphicsLayer
>+      (bounds 800.00 600.00)
>+      (contentsOpaque 1)
>+      (drawsContent 1)
>+      (backgroundColor #FFFFFF)
>+      (event region
>+        (rect (0,0) width=800 height=600)
>+        (touch-action
>+          (none          
>+            (rect (8,8) width=100 height=100)
>+          )
>+        )
>+      )
>+    )
>+  )
>+)
>+
>Index: LayoutTests/pointerevents/ios/touch-action-region-inline-block.html
>===================================================================
>--- LayoutTests/pointerevents/ios/touch-action-region-inline-block.html	(nonexistent)
>+++ LayoutTests/pointerevents/ios/touch-action-region-inline-block.html	(working copy)
>@@ -0,0 +1,10 @@
>+<body>
>+<div style="touch-action: none; width: 100px; height: 100px; display: inline-block;"></div>
>+<pre id="results"></pre>
>+<script>
>+if (window.testRunner)
>+    testRunner.dumpAsText();
>+if (window.internals)
>+    results.innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_EVENT_REGION | internals.LAYER_TREE_INCLUDES_ROOT_LAYER_PROPERTIES);
>+</script>
>+</body>

Actions: View | Formatted Diff | Diff

Attachments on bug 197281: 368237 | 369479