Title: [286442] branches/safari-612-branch
- Revision
- 286442
- Author
- repst...@apple.com
- Date
- 2021-12-02 11:54:12 -0800 (Thu, 02 Dec 2021)
Log Message
Revert r286395. rdar://problem/83070565
Modified Paths
Removed Paths
Diff
Modified: branches/safari-612-branch/LayoutTests/ChangeLog (286441 => 286442)
--- branches/safari-612-branch/LayoutTests/ChangeLog 2021-12-02 19:49:47 UTC (rev 286441)
+++ branches/safari-612-branch/LayoutTests/ChangeLog 2021-12-02 19:54:12 UTC (rev 286442)
@@ -1,3 +1,7 @@
+2021-12-02 Alan Coon <alanc...@apple.com>
+
+ Revert r286395. rdar://problem/83070565
+
2021-12-01 Alan Coon <alanc...@apple.com>
Cherry-pick r285320. rdar://problem/85943167
Deleted: branches/safari-612-branch/LayoutTests/fast/layers/top-layer-ancestor-opacity-and-transform-crash-expected.txt (286441 => 286442)
--- branches/safari-612-branch/LayoutTests/fast/layers/top-layer-ancestor-opacity-and-transform-crash-expected.txt 2021-12-02 19:49:47 UTC (rev 286441)
+++ branches/safari-612-branch/LayoutTests/fast/layers/top-layer-ancestor-opacity-and-transform-crash-expected.txt 2021-12-02 19:54:12 UTC (rev 286442)
@@ -1 +0,0 @@
-PASS if this doesn't crash
Deleted: branches/safari-612-branch/LayoutTests/fast/layers/top-layer-ancestor-opacity-and-transform-crash.html (286441 => 286442)
--- branches/safari-612-branch/LayoutTests/fast/layers/top-layer-ancestor-opacity-and-transform-crash.html 2021-12-02 19:49:47 UTC (rev 286441)
+++ branches/safari-612-branch/LayoutTests/fast/layers/top-layer-ancestor-opacity-and-transform-crash.html 2021-12-02 19:54:12 UTC (rev 286442)
@@ -1,9 +0,0 @@
-<style>
-* { opacity: 0.1; translate: 1px; }
-</style>
-<dialog>PASS if this doesn't crash</dialog>
-<script>
- document.querySelector("dialog").showModal();
- if (testRunner)
- testRunner.dumpAsText();
-</script>
Modified: branches/safari-612-branch/Source/WebCore/ChangeLog (286441 => 286442)
--- branches/safari-612-branch/Source/WebCore/ChangeLog 2021-12-02 19:49:47 UTC (rev 286441)
+++ branches/safari-612-branch/Source/WebCore/ChangeLog 2021-12-02 19:54:12 UTC (rev 286442)
@@ -1,3 +1,7 @@
+2021-12-02 Alan Coon <alanc...@apple.com>
+
+ Revert r286395. rdar://problem/83070565
+
2021-12-01 Alan Coon <alanc...@apple.com>
Cherry-pick r285320. rdar://problem/85943167
Modified: branches/safari-612-branch/Source/WebCore/rendering/RenderLayer.cpp (286441 => 286442)
--- branches/safari-612-branch/Source/WebCore/rendering/RenderLayer.cpp 2021-12-02 19:49:47 UTC (rev 286441)
+++ branches/safari-612-branch/Source/WebCore/rendering/RenderLayer.cpp 2021-12-02 19:54:12 UTC (rev 286442)
@@ -2017,9 +2017,9 @@
if (isComposited())
return nullptr;
- for (RenderLayer* curr = stackingContext(); curr; curr = curr->stackingContext()) {
+ for (RenderLayer* curr = parent(); curr; curr = curr->parent()) {
if (curr->isComposited())
- break;
+ return nullptr;
if (curr->isTransparent())
return curr;
}
@@ -3001,8 +3001,7 @@
// If we have a transparency layer enclosing us and we are the root of a transform, then we need to establish the transparency
// layer from the parent now, assuming there is a parent
if (paintFlags & PaintLayerFlag::HaveTransparency) {
- // Top layer elements are not affected by ancestor opacities
- if (!establishesTopLayer() && parent())
+ if (parent())
parent()->beginTransparencyLayers(context, paintingInfo, paintingInfo.paintDirtyRect);
else
beginTransparencyLayers(context, paintingInfo, paintingInfo.paintDirtyRect);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
