When the set of backing-sharing layers changes, we need to issue a repaint
https://bugs.webkit.org/show_bug.cgi?id=197825

Reviewed by Zalan Bujtas.

Source/WebCore:

If the set of layers painting into a shared backing store changes, we need
to repaint that backing store. This happens when scrolling as shared layers
enter the visible area.

Test: compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll.html

* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::setBackingSharingLayers):

LayoutTests:

* compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll-expected.html: Added.
* compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll.html: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@245220 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cd9ea7b..2577385 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2019-05-12  Simon Fraser  <simon.fraser@apple.com>
+
+        When the set of backing-sharing layers changes, we need to issue a repaint
+        https://bugs.webkit.org/show_bug.cgi?id=197825
+
+        Reviewed by Zalan Bujtas.
+
+        * compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll-expected.html: Added.
+        * compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll.html: Added.
+
 2019-05-12  Takashi Komori  <Takashi.Komori@sony.com>
 
         [Curl] Suppress extra didReceiveAuthenticationChallenge call when accessing a server which checks basic auth.
diff --git a/LayoutTests/compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll-expected.html b/LayoutTests/compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll-expected.html
new file mode 100644
index 0000000..700cae8
--- /dev/null
+++ b/LayoutTests/compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll-expected.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+<head>
+    <style>
+        .scrollable {
+            overflow-y: scroll;
+            height: 300px;
+            width: 300px;
+            margin: 10px;
+            border: 1px solid black;
+        }
+		
+		.box.sharing {
+            background-color: blue;
+		}
+		
+		.box {
+			position: relative;
+			top: 50px;
+			left: 50px;
+            width: 180px;
+            height: 180px;
+            background-color: green;
+		}
+
+        .spacer {
+            height: 500px;
+        }
+    </style>
+</head>
+<body>
+    <div class="scrollable">
+        <div class="sharing box">
+			<div class="inner box"></div>
+        </div>
+        <div class="spacer"></div>
+    </div>
+</body>
+</html>
+
diff --git a/LayoutTests/compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll.html b/LayoutTests/compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll.html
new file mode 100644
index 0000000..a908aaf
--- /dev/null
+++ b/LayoutTests/compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+<head>
+    <title>Tests repaints of shared backing when the sharing layers change</title>
+    <style>
+        .scrollable {
+            overflow-y: scroll;
+            height: 300px;
+            width: 300px;
+            margin: 10px;
+            border: 1px solid black;
+        }
+		
+		.box.sharing {
+            background-color: blue;
+		}
+		
+		.box {
+			position: relative;
+			top: 50px;
+			left: 50px;
+            width: 180px;
+            height: 180px;
+            background-color: green;
+		}
+
+        .spacer {
+            height: 500px;
+        }
+    </style>
+    <script>
+        if (window.testRunner)
+            testRunner.waitUntilDone();
+
+        window.addEventListener('load', () => {
+            let scroller = document.querySelector('.scrollable');
+            requestAnimationFrame(() => {
+                scroller.scrollTop = 250;
+                requestAnimationFrame(() => {
+                    scroller.scrollTop = 0;
+                    if (window.testRunner)
+                        testRunner.notifyDone();
+                });
+            });
+        }, false);
+    </script>
+</head>
+<body>
+    <div class="scrollable">
+        <div class="sharing box">
+			<div class="inner box"></div>
+        </div>
+        <div class="spacer"></div>
+    </div>
+</body>
+</html>
+
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 9271c0a..e8d1444 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2019-05-12  Simon Fraser  <simon.fraser@apple.com>
+
+        When the set of backing-sharing layers changes, we need to issue a repaint
+        https://bugs.webkit.org/show_bug.cgi?id=197825
+
+        Reviewed by Zalan Bujtas.
+
+        If the set of layers painting into a shared backing store changes, we need
+        to repaint that backing store. This happens when scrolling as shared layers
+        enter the visible area.
+
+        Test: compositing/shared-backing/overflow-scroll/repaint-shared-on-scroll.html
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::setBackingSharingLayers):
+
 2019-05-02  Simon Fraser  <simon.fraser@apple.com>
 
         Add logging for RenderLayer clip rects
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
index f839e46..1d14c1a 100644
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -281,6 +281,10 @@
 void RenderLayerBacking::setBackingSharingLayers(Vector<WeakPtr<RenderLayer>>&& sharingLayers)
 {
     clearBackingSharingLayerProviders(m_backingSharingLayers);
+
+    if (sharingLayers != m_backingSharingLayers)
+        setContentsNeedDisplay(); // This could be optimize to only repaint rects for changed layers.
+
     m_backingSharingLayers = WTFMove(sharingLayers);
 
     for (auto& layerWeakPtr : m_backingSharingLayers)