Title: [270363] trunk
- Revision
- 270363
- Author
- [email protected]
- Date
- 2020-12-02 12:16:05 -0800 (Wed, 02 Dec 2020)
Log Message
Unreviewed, reverting r270339.
introduced a constantly failing test.
Reverted changeset:
"Toggling pointer-events on body does not re-enable scrolling
on child"
https://bugs.webkit.org/show_bug.cgi?id=218533
https://trac.webkit.org/changeset/270339
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (270362 => 270363)
--- trunk/LayoutTests/ChangeLog 2020-12-02 20:09:26 UTC (rev 270362)
+++ trunk/LayoutTests/ChangeLog 2020-12-02 20:16:05 UTC (rev 270363)
@@ -1,3 +1,16 @@
+2020-12-02 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r270339.
+
+ introduced a constantly failing test.
+
+ Reverted changeset:
+
+ "Toggling pointer-events on body does not re-enable scrolling
+ on child"
+ https://bugs.webkit.org/show_bug.cgi?id=218533
+ https://trac.webkit.org/changeset/270339
+
2020-12-02 Lauro Moura <[email protected]>
[WPE] webgl/1.0.3/conformance/rendering/multisample-corruption.html is also timing out
Deleted: trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-pointer-events-expected.txt (270362 => 270363)
--- trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-pointer-events-expected.txt 2020-12-02 20:09:26 UTC (rev 270362)
+++ trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-pointer-events-expected.txt 2020-12-02 20:16:05 UTC (rev 270363)
@@ -1,11 +0,0 @@
-Tests that toggling `pointer-events: none;` doesn't prevent scrolling.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS innerScrollElement.scrollTop is 0
-Disabling pointer events...
-PASS innerScrollElement.scrollTop is 0
-Enabling pointer events...
-PASS innerScrollElement.scrollTop is 150
-
Deleted: trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-pointer-events.html (270362 => 270363)
--- trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-pointer-events.html 2020-12-02 20:09:26 UTC (rev 270362)
+++ trunk/LayoutTests/fast/scrolling/ios/overflow-scroll-pointer-events.html 2020-12-02 20:16:05 UTC (rev 270363)
@@ -1,61 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ AsyncOverflowScrollingEnabled=true ] -->
-<head>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<script src=""
-<script src=""
-<script src=""
-<style>
-.disable-scroll { pointer-events: none; }
-.outer-scroll { height: 100%; }
-.inner-scroll { height: 100%; overflow-y: auto; }
-.box { height: 100%; }
-</style>
-<script>
-if (window.testRunner)
- testRunner.waitUntilDone();
-
-async function runTest() {
- if (!window.testRunner) {
- finishJSTest();
- return;
- }
-
- description("Tests that toggling `pointer-events: none;` doesn't prevent scrolling.");
-
- globalThis.outerScrollElement = document.querySelector(".outer-scroll");
- globalThis.innerScrollElement = document.querySelector(".inner-scroll");
-
- shouldBe("innerScrollElement.scrollTop", "0");
-
- debug("Disabling pointer events...");
- outerScrollElement.classList.add("disable-scroll");
- await UIHelper.animationFrame();
- await touchAndDragFromPointToPoint(150, 300, 150, 150);
- await liftUpAtPoint(150, 150);
- await UIHelper.animationFrame();
- shouldBe("innerScrollElement.scrollTop", "0");
-
- debug("Enabling pointer events...");
- outerScrollElement.classList.remove("disable-scroll");
- await UIHelper.animationFrame();
- await touchAndDragFromPointToPoint(150, 300, 150, 150);
- await liftUpAtPoint(150, 150);
- await UIHelper.animationFrame();
- shouldBe("innerScrollElement.scrollTop", "150");
-
- finishJSTest();
-}
-</script>
-<body _onload_="runTest()">
- <div class="outer-scroll">
- <div class="inner-scroll">
- <div class="box" style="background-color: red;"></div>
- <div class="box" style="background-color: green;"></div>
- <div class="box" style="background-color: blue;"></div>
- </div>
- </div>
- <p id="description"></p>
- <div id="console"></div>
- <script src=""
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (270362 => 270363)
--- trunk/Source/WebCore/ChangeLog 2020-12-02 20:09:26 UTC (rev 270362)
+++ trunk/Source/WebCore/ChangeLog 2020-12-02 20:16:05 UTC (rev 270363)
@@ -1,3 +1,16 @@
+2020-12-02 Truitt Savell <[email protected]>
+
+ Unreviewed, reverting r270339.
+
+ introduced a constantly failing test.
+
+ Reverted changeset:
+
+ "Toggling pointer-events on body does not re-enable scrolling
+ on child"
+ https://bugs.webkit.org/show_bug.cgi?id=218533
+ https://trac.webkit.org/changeset/270339
+
2020-12-02 Megan Gardner <[email protected]>
Create and draw app highlights
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (270362 => 270363)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2020-12-02 20:09:26 UTC (rev 270362)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2020-12-02 20:16:05 UTC (rev 270363)
@@ -1681,14 +1681,9 @@
}
}
- if (diff == StyleDifference::RecompositeLayer && layer.isComposited()) {
- if (oldStyle && oldStyle->pointerEvents() != newStyle.pointerEvents())
- layer.setNeedsCompositingConfigurationUpdate();
- else if (is<RenderWidget>(layer.renderer())) {
- // This is necessary to get iframe layers hooked up in response to scheduleInvalidateStyleAndLayerComposition().
- layer.setNeedsCompositingConfigurationUpdate();
- }
- }
+ // This is necessary to get iframe layers hooked up in response to scheduleInvalidateStyleAndLayerComposition().
+ if (diff == StyleDifference::RecompositeLayer && layer.isComposited() && is<RenderWidget>(layer.renderer()))
+ layer.setNeedsCompositingConfigurationUpdate();
if (diff >= StyleDifference::RecompositeLayer && oldStyle && recompositeChangeRequiresGeometryUpdate(*oldStyle, newStyle)) {
// FIXME: transform changes really need to trigger layout. See RenderElement::adjustStyleDifference().
Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (270362 => 270363)
--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2020-12-02 20:09:26 UTC (rev 270362)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2020-12-02 20:16:05 UTC (rev 270363)
@@ -1167,9 +1167,6 @@
bool RenderStyle::changeRequiresRecompositeLayer(const RenderStyle& other, OptionSet<StyleDifferenceContextSensitiveProperty>&) const
{
- if (m_inheritedFlags.pointerEvents != other.m_inheritedFlags.pointerEvents)
- return true;
-
if (m_rareNonInheritedData.ptr() != other.m_rareNonInheritedData.ptr()) {
if (m_rareNonInheritedData->transformStyle3D != other.m_rareNonInheritedData->transformStyle3D
|| m_rareNonInheritedData->backfaceVisibility != other.m_rareNonInheritedData->backfaceVisibility
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
