Title: [245423] branches/safari-608.1.24-branch
- Revision
- 245423
- Author
- [email protected]
- Date
- 2019-05-16 16:27:40 -0700 (Thu, 16 May 2019)
Log Message
Revert r245181. rdar://problem/50670806
Modified Paths
Removed Paths
Diff
Modified: branches/safari-608.1.24-branch/LayoutTests/ChangeLog (245422 => 245423)
--- branches/safari-608.1.24-branch/LayoutTests/ChangeLog 2019-05-16 23:27:37 UTC (rev 245422)
+++ branches/safari-608.1.24-branch/LayoutTests/ChangeLog 2019-05-16 23:27:40 UTC (rev 245423)
@@ -1,5 +1,9 @@
2019-05-16 Kocsen Chung <[email protected]>
+ Revert r245181. rdar://problem/50670806
+
+2019-05-16 Kocsen Chung <[email protected]>
+
Revert r245205. rdar://problem/50652127
2019-05-16 Kocsen Chung <[email protected]>
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/overflow-scroll/non-self-painting-layer-should-not-share-expected.txt (245422 => 245423)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/overflow-scroll/non-self-painting-layer-should-not-share-expected.txt 2019-05-16 23:27:37 UTC (rev 245422)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/overflow-scroll/non-self-painting-layer-should-not-share-expected.txt 2019-05-16 23:27:40 UTC (rev 245423)
@@ -1,5 +0,0 @@
-Test passes if it does not assert in debug.
-
-this is clipped
-this is clipped
-
Deleted: branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/overflow-scroll/non-self-painting-layer-should-not-share.html (245422 => 245423)
--- branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/overflow-scroll/non-self-painting-layer-should-not-share.html 2019-05-16 23:27:37 UTC (rev 245422)
+++ branches/safari-608.1.24-branch/LayoutTests/compositing/shared-backing/overflow-scroll/non-self-painting-layer-should-not-share.html 2019-05-16 23:27:40 UTC (rev 245423)
@@ -1,48 +0,0 @@
-<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
-<html>
-<head>
- <title>Tests that a non-self-painting layer doesn't get into the sharing list</title>
- <style>
- .scroller {
- margin: 20px;
- width: 300px;
- height: 300px;
- overflow: auto;
- border: 2px solid black;
- padding: 10px;
- }
-
- .clipping {
- overflow: hidden;
- top: 50px;
- left: 200px;
- height: 200px;
- width: 200px;
- border: 2px solid orange;
- }
-
- .relative {
- position: relative;
- }
-
- .spacer {
- height: 150px;
- }
- </style>
- <script>
- if (window.testRunner)
- testRunner.dumpAsText();
- </script>
-</head>
-<body>
- <p>Test passes if it does not assert in debug.</p>
- <div class="scroller">
- <div class="clipping">this is clipped</div>
- <div class="relative">
- <div class="clipping">this is clipped</div>
- </div>
- <div class="spacer"></div>
- </div>
-</body>
-</html>
-
Modified: branches/safari-608.1.24-branch/Source/WebCore/ChangeLog (245422 => 245423)
--- branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 23:27:37 UTC (rev 245422)
+++ branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 23:27:40 UTC (rev 245423)
@@ -1,5 +1,9 @@
2019-05-16 Kocsen Chung <[email protected]>
+ Revert r245181. rdar://problem/50670806
+
+2019-05-16 Kocsen Chung <[email protected]>
+
Revert r245205. rdar://problem/50652127
2019-05-16 Kocsen Chung <[email protected]>
Modified: branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (245422 => 245423)
--- branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-05-16 23:27:37 UTC (rev 245422)
+++ branches/safari-608.1.24-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2019-05-16 23:27:40 UTC (rev 245423)
@@ -915,7 +915,7 @@
// If we're testing for overlap, we only need to composite if we overlap something that is already composited.
if (overlapMap.overlapsLayers(layerExtent.bounds)) {
- if (backingSharingState.backingProviderCandidate && canBeComposited(layer) && backingProviderLayerCanIncludeLayer(*backingSharingState.backingProviderCandidate, layer)) {
+ if (backingSharingState.backingProviderCandidate && backingProviderLayerCanIncludeLayer(*backingSharingState.backingProviderCandidate, layer)) {
backingSharingState.backingSharingLayers.append(makeWeakPtr(layer));
LOG(Compositing, " layer %p can share with %p", &layer, backingSharingState.backingProviderCandidate);
compositingReason = RenderLayer::IndirectCompositingReason::None;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
