Diff
Modified: branches/safari-608.1.24-branch/LayoutTests/ChangeLog (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/ChangeLog 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/ChangeLog 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,5 +1,9 @@
2019-05-16 Kocsen Chung <[email protected]>
+ Revert r245205. rdar://problem/50652127
+
+2019-05-16 Kocsen Chung <[email protected]>
+
Revert r245220. rdar://problem/50686229
2019-05-15 Kocsen Chung <[email protected]>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/nested-shared-layers-with-opacity-expected.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/nested-shared-layers-with-opacity-expected.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/nested-shared-layers-with-opacity-expected.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer with opacity into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- z-index: 0;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .box {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .opacity {
- opacity: 0.5;
- }
-
- .composited {
- transform: translateZ(0);
- }
-
- .trigger {
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing opacity box">
- <div class="opacity box"></div>
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/nested-shared-layers-with-opacity.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/nested-shared-layers-with-opacity.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/nested-shared-layers-with-opacity.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer with opacity into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .box {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .opacity {
- opacity: 0.5;
- }
-
- .composited {
- transform: translateZ(0);
- }
-
- .trigger {
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing opacity box">
- <div class="opacity box"></div>
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-blending-expected.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-blending-expected.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-blending-expected.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <style>
- .clipping {
- position: absolute;
- z-index: 0;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .blending {
- mix-blend-mode: difference;
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing blending box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-blending.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-blending.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-blending.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer with mix-blend-mode into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .blending {
- mix-blend-mode: difference;
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing blending box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-filter-expected.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-filter-expected.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-filter-expected.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <style>
- .clipping {
- position: absolute;
- z-index: 0;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .filtered {
- filter: saturate(0);
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing filtered box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-filter.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-filter.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-filter.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer with a filter into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .filtered {
- filter: saturate(0);
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing filtered box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-opacity-expected.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-opacity-expected.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-opacity-expected.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer with opacity into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- z-index: 0;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .opacity {
- opacity: 0.5;
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing opacity box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-opacity.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-opacity.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-opacity.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer with opacity into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .opacity {
- opacity: 0.5;
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing opacity box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-reflection-expected.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-reflection-expected.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-reflection-expected.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <style>
- .clipping {
- position: absolute;
- z-index: 0;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 160px;
- background-color: green;
- border-bottom: 20px solid orange;
- }
-
- .reflected {
- -webkit-box-reflect: below 10px;
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing reflected box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-reflection.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-reflection.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-reflection.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer with a reflection into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 160px;
- background-color: green;
- border-bottom: 20px solid orange;
- }
-
- .reflected {
- -webkit-box-reflect: below 10px;
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing reflected box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-transform-expected.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-transform-expected.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-transform-expected.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <style>
- .clipping {
- position: absolute;
- z-index: 0;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .transformed {
- transform: rotate(45deg);
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing transformed box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-transform.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-transform.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-has-transform.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer with a transform into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .transformed {
- transform: rotate(45deg);
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
-
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing transformed box">
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-isolates-blending-expected.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-isolates-blending-expected.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-isolates-blending-expected.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <style>
- .clipping {
- position: absolute;
- z-index: 0;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 30px;
- left: 30px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .isolation {
- isolation: isolate;
- }
-
- .blending {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- mix-blend-mode: multiply;
- background-color: green;
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing isolation box">
- <div class="blending"></div>
- </div>
- </div>
-</body>
-</html>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-isolates-blending.html (245421 => 245422)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-isolates-blending.html 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/shared-layer-isolates-blending.html 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Tests painting of a layer which isolates blending into shared backing</title>
- <style>
- .clipping {
- position: absolute;
- top: 20px;
- left: 20px;
- overflow: hidden;
- height: 300px;
- width: 300px;
- margin: 10px;
- border: 1px solid black;
- }
-
- .sharing {
- position: relative;
- top: 30px;
- left: 30px;
- width: 180px;
- height: 180px;
- background-color: green;
- }
-
- .isolation {
- isolation: isolate;
- }
-
- .blending {
- position: relative;
- top: 50px;
- left: 50px;
- width: 180px;
- height: 180px;
- mix-blend-mode: multiply;
- background-color: green;
- }
-
- .trigger {
- transform: translateZ(0);
- width: 50px;
- height: 50px;
- background-color: silver;
- }
- </style>
-</head>
-<body>
- <div class="composited trigger"></div>
- <div class="clipping">
- <div class="sharing isolation box">
- <div class="blending"></div>
- </div>
- </div>
-</body>
-</html>
Modified: branches/safari-608.1.24-branch/Source/WebCore/ChangeLog (245421 => 245422)
--- branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1,5 +1,9 @@
2019-05-16 Kocsen Chung <[email protected]>
+ Revert r245205. rdar://problem/50652127
+
+2019-05-16 Kocsen Chung <[email protected]>
+
Revert r245218. rdar://problem/50705506
2019-05-16 Kocsen Chung <[email protected]>
Modified: branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayer.cpp (245421 => 245422)
--- branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayer.cpp 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayer.cpp 2019-05-16 23:27:37 UTC (rev 245422)
@@ -4100,11 +4100,6 @@
return;
}
- paintLayerWithEffects(context, paintingInfo, paintFlags);
-}
-
-void RenderLayer::paintLayerWithEffects(GraphicsContext& context, const LayerPaintingInfo& paintingInfo, OptionSet<PaintLayerFlag> paintFlags)
-{
// Non self-painting leaf layers don't need to be painted as their renderer() should properly paint itself.
if (!isSelfPaintingLayer() && !hasSelfPaintingLayerDescendant())
return;
@@ -4111,7 +4106,7 @@
if (shouldSuppressPaintingLayer(this))
return;
-
+
// If this layer is totally invisible then there is nothing to paint.
if (!renderer().opacity())
return;
Modified: branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayer.h (245421 => 245422)
--- branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayer.h 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayer.h 2019-05-16 23:27:37 UTC (rev 245422)
@@ -1003,8 +1003,6 @@
void applyFilters(GraphicsContext& originalContext, const LayerPaintingInfo&, const LayerFragments&);
void paintLayer(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>);
- void paintLayerWithEffects(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>);
-
void paintLayerContentsAndReflection(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>);
void paintLayerByApplyingTransform(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>, const LayoutSize& translationOffset = LayoutSize());
void paintLayerContents(GraphicsContext&, const LayerPaintingInfo&, OptionSet<PaintLayerFlag>);
Modified: branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (245421 => 245422)
--- branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2019-05-16 23:27:37 UTC (rev 245422)
@@ -2668,13 +2668,10 @@
RenderLayer::LayerPaintingInfo paintingInfo(&m_owningLayer, paintDirtyRect, paintBehavior, -m_subpixelOffsetFromRenderer);
- if (&layer == &m_owningLayer) {
- layer.paintLayerContents(context, paintingInfo, paintFlags);
+ layer.paintLayerContents(context, paintingInfo, paintFlags);
- if (layer.containsDirtyOverlayScrollbars())
- layer.paintLayerContents(context, paintingInfo, paintFlags | RenderLayer::PaintLayerPaintingOverlayScrollbars);
- } else
- layer.paintLayerWithEffects(context, paintingInfo, paintFlags);
+ if (layer.containsDirtyOverlayScrollbars())
+ layer.paintLayerContents(context, paintingInfo, paintFlags | RenderLayer::PaintLayerPaintingOverlayScrollbars);
if (layer.isRenderViewLayer())
renderer().view().frameView().didPaintContents(context, paintDirtyRect, paintingState);
Modified: branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (245421 => 245422)
--- branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-05-16 23:27:33 UTC (rev 245421)
+++ branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-05-16 23:27:37 UTC (rev 245422)
@@ -241,7 +241,6 @@
else
childState.stackingContextAncestor = stackingContextAncestor;
- childState.backingSharingAncestor = backingSharingAncestor;
childState.subtreeIsCompositing = false;
childState.testingOverlap = testingOverlap;
childState.fullPaintOrderTraversalRequired = fullPaintOrderTraversalRequired;
@@ -269,7 +268,6 @@
}
RenderLayer* compositingAncestor;
- RenderLayer* backingSharingAncestor { nullptr };
RenderLayer* stackingContextAncestor { nullptr };
bool subtreeIsCompositing { false };
bool testingOverlap { true };
@@ -862,10 +860,6 @@
static bool backingProviderLayerCanIncludeLayer(const RenderLayer& sharedLayer, const RenderLayer& layer)
{
- // Disable sharing when painting shared layers doesn't work correctly.
- if (layer.hasReflection())
- return false;
-
return layer.ancestorLayerIsInContainingBlockChain(sharedLayer);
}
@@ -987,9 +981,6 @@
// Compositing for any reason disables backing sharing.
LOG_WITH_STREAM(Compositing, stream << &layer << " is compositing - flushing sharing to " << backingSharingState.backingProviderCandidate << " with " << backingSharingState.backingSharingLayers.size() << " sharing layers");
backingSharingState.resetBackingProviderCandidate();
- } else if (layerPaintsIntoProvidedBacking) {
- childState.backingSharingAncestor = &layer;
- overlapMap.pushCompositingContainer();
}
#if !ASSERT_DISABLED
@@ -1073,7 +1064,7 @@
compositingState.hasNotIsolatedCompositedBlendingDescendants = true;
#endif
- if ((childState.compositingAncestor == &layer && !layer.isRenderViewLayer()) || childState.backingSharingAncestor == &layer)
+ if (childState.compositingAncestor == &layer && !layer.isRenderViewLayer())
overlapMap.popCompositingContainer();
// If we're back at the root, and no other layers need to be composited, and the root layer itself doesn't need
@@ -1237,7 +1228,7 @@
compositingState.hasNotIsolatedCompositedBlendingDescendants = true;
#endif
- if ((childState.compositingAncestor == &layer && !layer.isRenderViewLayer()) || childState.backingSharingAncestor == &layer)
+ if (childState.compositingAncestor == &layer && !layer.isRenderViewLayer())
overlapMap.popCompositingContainer();
if (layer.isComposited())
