Unreviewed, rolling out r225089.
authorfred.wang@free.fr <fred.wang@free.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Nov 2017 06:40:24 +0000 (06:40 +0000)
committerfred.wang@free.fr <fred.wang@free.fr@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Nov 2017 06:40:24 +0000 (06:40 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179937

This patch caused compilation failures (Requested by fredw on
#webkit).

Reverted changeset:

"Async frame scrolling: handle fixed root backgrounds in
frames"
https://bugs.webkit.org/show_bug.cgi?id=176261
https://trac.webkit.org/changeset/225089

Patch by Commit Queue <commit-queue@webkit.org> on 2017-11-21

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@225090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/compositing/tiling/tiled-drawing-async-frame-scrolling-expected.txt
LayoutTests/compositing/tiling/tiled-drawing-async-frame-scrolling.html
LayoutTests/platform/ios-wk2/compositing/tiling/tiled-drawing-async-frame-scrolling-expected.txt
LayoutTests/platform/mac-wk2/compositing/tiling/tiled-drawing-async-frame-scrolling-expected.txt
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderLayerBacking.cpp

index c213003..1d05deb 100644 (file)
@@ -1,3 +1,18 @@
+2017-11-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r225089.
+        https://bugs.webkit.org/show_bug.cgi?id=179937
+
+        This patch caused compilation failures (Requested by fredw on
+        #webkit).
+
+        Reverted changeset:
+
+        "Async frame scrolling: handle fixed root backgrounds in
+        frames"
+        https://bugs.webkit.org/show_bug.cgi?id=176261
+        https://trac.webkit.org/changeset/225089
+
 2017-11-21  Frederic Wang  <fwang@igalia.com>
 
         Async frame scrolling: handle fixed root backgrounds in frames
index 7bb683d..9c25a24 100644 (file)
                 testRunner.notifyDone();
             }
         }
-
-       var frameToLoadCount = 3;
-       function newFrameLoaded() {
-           frameToLoadCount--;
-           if (frameToLoadCount === 0)
-               doTest();
-        }
     </script>
-    <style>
-        frame {
-            width: 200px;
-            height: 100px;
-        }
-    </style>
   </head>
   <body>
-    <iframe onload="newFrameLoaded()" scrolling="yes" srcdoc="<html style='
-            background: transparent;
-            height: 300px; width: 400px;'></html>"></iframe>
-    <iframe onload="newFrameLoaded()" scrolling="yes" srcdoc="<html style='
-            background: #ABCDEF;
-            height: 300px; width: 400px;'></html>"></iframe>
-    <iframe onload="newFrameLoaded()" scrolling="yes" srcdoc="<html style='
-            background-image: linear-gradient(45deg, black, white);
-            background-attachment: fixed;
-           height: 300px; width: 400px;'></html>"></iframe>
-    <pre id="layers">Layer tree goes here</pre>
+    <iframe onload="setTimeout(doTest, 0)" id="frame" style="height: 100px; width: 200px;" scrolling="yes" srcdoc="&lt;div style='height: 300px; width: 400px;'&gt;&lt;/div&gt;"></iframe>
+    <pre id="layers">Layer tree goes here</p>
   </body>
 </html>
index 6eb430d..336f0ab 100644 (file)
@@ -1,4 +1,4 @@
-   
+
 (GraphicsLayer
   (anchor 0.00 0.00)
   (bounds 800.00 600.00)
       (tile size 800 x 600)
       (top left tile 0, 0 tiles grid 1 x 1)
       (in window 1)
-      (children 3
+      (children 1
         (GraphicsLayer
           (position 8.00 8.00)
-          (bounds 304.00 154.00)
+          (bounds 204.00 104.00)
           (drawsContent 1)
           (backingStoreAttached 1)
-          (visible rect 0.00, 0.00 304.00 x 154.00)
+          (visible rect 0.00, 0.00 204.00 x 104.00)
           (coverage rect -8.00, -8.00 800.00 x 600.00)
           (intersects coverage rect 1)
           (contentsScale 2.00)
               (children 1
                 (GraphicsLayer
                   (anchor 0.00 0.00)
-                  (bounds 300.00 150.00)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 300.00 x 150.00)
-                  (coverage rect 0.00, 0.00 300.00 x 150.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 2.00)
-                  (children 1
-                    (GraphicsLayer
-                      (backingStoreAttached 0)
-                      (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (coverage rect 0.00, 0.00 300.00 x 150.00)
-                      (intersects coverage rect 0)
-                      (contentsScale 2.00)
-                      (children 1
-                        (GraphicsLayer
-                          (anchor 0.00 0.00)
-                          (bounds 400.00 300.00)
-                          (backingStoreAttached 1)
-                          (visible rect 0.00, 0.00 300.00 x 150.00)
-                          (coverage rect 0.00, 0.00 300.00 x 150.00)
-                          (intersects coverage rect 1)
-                          (contentsScale 2.00)
-                          (children 1
-                            (GraphicsLayer
-                              (bounds 400.00 300.00)
-                              (drawsContent 1)
-                              (backingStoreAttached 1)
-                              (visible rect 0.00, 0.00 300.00 x 150.00)
-                              (coverage rect 0.00, 0.00 300.00 x 150.00)
-                              (intersects coverage rect 1)
-                              (contentsScale 2.00)
-                              (tile cache coverage 0, 0 400 x 300)
-                              (tile size 512 x 512)
-                              (top left tile 0, 0 tiles grid 1 x 1)
-                              (in window 1)
-                              (children 1
-                                (GraphicsLayer
-                                  (backingStoreAttached 0)
-                                  (visible rect 0.00, 0.00 0.00 x 0.00)
-                                  (coverage rect 0.00, 0.00 300.00 x 150.00)
-                                  (intersects coverage rect 0)
-                                  (contentsScale 2.00)
-                                )
-                              )
-                            )
-                          )
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 316.00 8.00)
-          (bounds 304.00 154.00)
-          (drawsContent 1)
-          (backingStoreAttached 1)
-          (visible rect 0.00, 0.00 304.00 x 154.00)
-          (coverage rect -316.00, -8.00 800.00 x 600.00)
-          (intersects coverage rect 1)
-          (contentsScale 2.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (backingStoreAttached 0)
-              (visible rect 0.00, 0.00 0.00 x 0.00)
-              (coverage rect -318.00, -10.00 800.00 x 600.00)
-              (intersects coverage rect 0)
-              (contentsScale 2.00)
-              (children 1
-                (GraphicsLayer
-                  (anchor 0.00 0.00)
-                  (bounds 300.00 150.00)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 300.00 x 150.00)
-                  (coverage rect 0.00, 0.00 300.00 x 150.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 2.00)
-                  (children 1
-                    (GraphicsLayer
-                      (backingStoreAttached 0)
-                      (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (coverage rect 0.00, 0.00 300.00 x 150.00)
-                      (intersects coverage rect 0)
-                      (contentsScale 2.00)
-                      (children 1
-                        (GraphicsLayer
-                          (anchor 0.00 0.00)
-                          (bounds 400.00 300.00)
-                          (backingStoreAttached 1)
-                          (visible rect 0.00, 0.00 300.00 x 150.00)
-                          (coverage rect 0.00, 0.00 300.00 x 150.00)
-                          (intersects coverage rect 1)
-                          (contentsScale 2.00)
-                          (children 1
-                            (GraphicsLayer
-                              (bounds 400.00 300.00)
-                              (drawsContent 1)
-                              (backingStoreAttached 1)
-                              (visible rect 0.00, 0.00 300.00 x 150.00)
-                              (coverage rect 0.00, 0.00 300.00 x 150.00)
-                              (intersects coverage rect 1)
-                              (contentsScale 2.00)
-                              (tile cache coverage 0, 0 400 x 300)
-                              (tile size 512 x 512)
-                              (top left tile 0, 0 tiles grid 1 x 1)
-                              (in window 1)
-                              (children 1
-                                (GraphicsLayer
-                                  (backingStoreAttached 0)
-                                  (visible rect 0.00, 0.00 0.00 x 0.00)
-                                  (coverage rect 0.00, 0.00 300.00 x 150.00)
-                                  (intersects coverage rect 0)
-                                  (contentsScale 2.00)
-                                )
-                              )
-                            )
-                          )
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 8.00 167.00)
-          (bounds 304.00 154.00)
-          (drawsContent 1)
-          (backingStoreAttached 1)
-          (visible rect 0.00, 0.00 304.00 x 154.00)
-          (coverage rect -8.00, -167.00 800.00 x 600.00)
-          (intersects coverage rect 1)
-          (contentsScale 2.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (backingStoreAttached 0)
-              (visible rect 0.00, 0.00 0.00 x 0.00)
-              (coverage rect -10.00, -169.00 800.00 x 600.00)
-              (intersects coverage rect 0)
-              (contentsScale 2.00)
-              (children 1
-                (GraphicsLayer
-                  (anchor 0.00 0.00)
-                  (bounds 300.00 150.00)
+                  (bounds 200.00 100.00)
                   (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 300.00 x 150.00)
-                  (coverage rect 0.00, 0.00 300.00 x 150.00)
+                  (visible rect 0.00, 0.00 200.00 x 100.00)
+                  (coverage rect 0.00, 0.00 200.00 x 100.00)
                   (intersects coverage rect 1)
                   (contentsScale 2.00)
                   (children 1
                     (GraphicsLayer
                       (backingStoreAttached 0)
                       (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (coverage rect 0.00, 0.00 300.00 x 150.00)
+                      (coverage rect 0.00, 0.00 200.00 x 100.00)
                       (intersects coverage rect 0)
                       (contentsScale 2.00)
                       (children 1
                         (GraphicsLayer
                           (anchor 0.00 0.00)
-                          (bounds 400.00 300.00)
+                          (bounds 408.00 316.00)
                           (backingStoreAttached 1)
-                          (visible rect 0.00, 0.00 300.00 x 150.00)
-                          (coverage rect 0.00, 0.00 300.00 x 150.00)
+                          (visible rect 0.00, 0.00 200.00 x 100.00)
+                          (coverage rect 0.00, 0.00 200.00 x 100.00)
                           (intersects coverage rect 1)
                           (contentsScale 2.00)
                           (children 1
                             (GraphicsLayer
-                              (bounds 400.00 300.00)
+                              (bounds 408.00 316.00)
                               (drawsContent 1)
+                              (backgroundColor #FFFFFF)
                               (backingStoreAttached 1)
-                              (visible rect 0.00, 0.00 300.00 x 150.00)
-                              (coverage rect 0.00, 0.00 300.00 x 150.00)
+                              (visible rect 0.00, 0.00 200.00 x 100.00)
+                              (coverage rect 0.00, 0.00 200.00 x 100.00)
                               (intersects coverage rect 1)
                               (contentsScale 2.00)
-                              (tile cache coverage 0, 0 400 x 300)
+                              (tile cache coverage 0, 0 408 x 316)
                               (tile size 512 x 512)
                               (top left tile 0, 0 tiles grid 1 x 1)
                               (in window 1)
                                 (GraphicsLayer
                                   (backingStoreAttached 0)
                                   (visible rect 0.00, 0.00 0.00 x 0.00)
-                                  (coverage rect 0.00, 0.00 300.00 x 150.00)
+                                  (coverage rect 0.00, 0.00 200.00 x 100.00)
                                   (intersects coverage rect 0)
                                   (contentsScale 2.00)
                                 )
index 13a3ecd..b09eebe 100644 (file)
@@ -1,4 +1,4 @@
-   
+
 (GraphicsLayer
   (anchor 0.00 0.00)
   (bounds 800.00 600.00)
       (tile size 800 x 600)
       (top left tile 0, 0 tiles grid 1 x 1)
       (in window 1)
-      (children 3
+      (children 1
         (GraphicsLayer
           (position 8.00 8.00)
-          (bounds 304.00 154.00)
+          (bounds 204.00 104.00)
           (drawsContent 1)
           (backingStoreAttached 1)
-          (visible rect 0.00, 0.00 304.00 x 154.00)
+          (visible rect 0.00, 0.00 204.00 x 104.00)
           (coverage rect -8.00, -8.00 800.00 x 600.00)
           (intersects coverage rect 1)
           (contentsScale 1.00)
               (children 4
                 (GraphicsLayer
                   (anchor 0.00 0.00)
-                  (bounds 285.00 135.00)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 285.00 x 135.00)
-                  (coverage rect 0.00, 0.00 285.00 x 135.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 1.00)
-                  (children 1
-                    (GraphicsLayer
-                      (backingStoreAttached 0)
-                      (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (coverage rect 0.00, 0.00 285.00 x 135.00)
-                      (intersects coverage rect 0)
-                      (contentsScale 1.00)
-                      (children 1
-                        (GraphicsLayer
-                          (anchor 0.00 0.00)
-                          (bounds 400.00 300.00)
-                          (backingStoreAttached 1)
-                          (visible rect 0.00, 0.00 285.00 x 135.00)
-                          (coverage rect 0.00, 0.00 285.00 x 135.00)
-                          (intersects coverage rect 1)
-                          (contentsScale 1.00)
-                          (children 1
-                            (GraphicsLayer
-                              (bounds 400.00 300.00)
-                              (drawsContent 1)
-                              (backingStoreAttached 1)
-                              (visible rect 0.00, 0.00 285.00 x 135.00)
-                              (coverage rect 0.00, 0.00 285.00 x 135.00)
-                              (intersects coverage rect 1)
-                              (contentsScale 1.00)
-                              (tile cache coverage 0, 0 400 x 300)
-                              (tile size 512 x 512)
-                              (top left tile 0, 0 tiles grid 1 x 1)
-                              (in window 1)
-                              (children 1
-                                (GraphicsLayer
-                                  (backingStoreAttached 0)
-                                  (visible rect 0.00, 0.00 0.00 x 0.00)
-                                  (coverage rect 0.00, 0.00 285.00 x 135.00)
-                                  (intersects coverage rect 0)
-                                  (contentsScale 1.00)
-                                )
-                              )
-                            )
-                          )
-                        )
-                      )
-                    )
-                  )
-                )
-                (GraphicsLayer
-                  (position 0.00 135.00)
-                  (bounds 285.00 15.00)
-                  (drawsContent 1)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 285.00 x 15.00)
-                  (coverage rect -10.00, -145.00 800.00 x 600.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 1.00)
-                )
-                (GraphicsLayer
-                  (position 285.00 0.00)
-                  (bounds 15.00 135.00)
-                  (drawsContent 1)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 15.00 x 135.00)
-                  (coverage rect -295.00, -10.00 800.00 x 600.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 1.00)
-                )
-                (GraphicsLayer
-                  (position 285.00 135.00)
-                  (bounds 15.00 15.00)
-                  (drawsContent 1)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 15.00 x 15.00)
-                  (coverage rect -295.00, -145.00 800.00 x 600.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 1.00)
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 316.00 8.00)
-          (bounds 304.00 154.00)
-          (drawsContent 1)
-          (backingStoreAttached 1)
-          (visible rect 0.00, 0.00 304.00 x 154.00)
-          (coverage rect -316.00, -8.00 800.00 x 600.00)
-          (intersects coverage rect 1)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (backingStoreAttached 0)
-              (visible rect 0.00, 0.00 0.00 x 0.00)
-              (coverage rect -318.00, -10.00 800.00 x 600.00)
-              (intersects coverage rect 0)
-              (contentsScale 1.00)
-              (children 4
-                (GraphicsLayer
-                  (anchor 0.00 0.00)
-                  (bounds 285.00 135.00)
+                  (bounds 185.00 85.00)
                   (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 285.00 x 135.00)
-                  (coverage rect 0.00, 0.00 285.00 x 135.00)
+                  (visible rect 0.00, 0.00 185.00 x 85.00)
+                  (coverage rect 0.00, 0.00 185.00 x 85.00)
                   (intersects coverage rect 1)
                   (contentsScale 1.00)
                   (children 1
                     (GraphicsLayer
                       (backingStoreAttached 0)
                       (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (coverage rect 0.00, 0.00 285.00 x 135.00)
+                      (coverage rect 0.00, 0.00 185.00 x 85.00)
                       (intersects coverage rect 0)
                       (contentsScale 1.00)
                       (children 1
                         (GraphicsLayer
                           (anchor 0.00 0.00)
-                          (bounds 400.00 300.00)
+                          (bounds 408.00 316.00)
                           (backingStoreAttached 1)
-                          (visible rect 0.00, 0.00 285.00 x 135.00)
-                          (coverage rect 0.00, 0.00 285.00 x 135.00)
+                          (visible rect 0.00, 0.00 185.00 x 85.00)
+                          (coverage rect 0.00, 0.00 185.00 x 85.00)
                           (intersects coverage rect 1)
                           (contentsScale 1.00)
                           (children 1
                             (GraphicsLayer
-                              (bounds 400.00 300.00)
+                              (bounds 408.00 316.00)
                               (drawsContent 1)
+                              (backgroundColor #FFFFFF)
                               (backingStoreAttached 1)
-                              (visible rect 0.00, 0.00 285.00 x 135.00)
-                              (coverage rect 0.00, 0.00 285.00 x 135.00)
+                              (visible rect 0.00, 0.00 185.00 x 85.00)
+                              (coverage rect 0.00, 0.00 185.00 x 85.00)
                               (intersects coverage rect 1)
                               (contentsScale 1.00)
-                              (tile cache coverage 0, 0 400 x 300)
+                              (tile cache coverage 0, 0 408 x 316)
                               (tile size 512 x 512)
                               (top left tile 0, 0 tiles grid 1 x 1)
                               (in window 1)
                                 (GraphicsLayer
                                   (backingStoreAttached 0)
                                   (visible rect 0.00, 0.00 0.00 x 0.00)
-                                  (coverage rect 0.00, 0.00 285.00 x 135.00)
+                                  (coverage rect 0.00, 0.00 185.00 x 85.00)
                                   (intersects coverage rect 0)
                                   (contentsScale 1.00)
                                 )
                   )
                 )
                 (GraphicsLayer
-                  (position 0.00 135.00)
-                  (bounds 285.00 15.00)
-                  (drawsContent 1)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 285.00 x 15.00)
-                  (coverage rect -318.00, -145.00 800.00 x 600.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 1.00)
-                )
-                (GraphicsLayer
-                  (position 285.00 0.00)
-                  (bounds 15.00 135.00)
-                  (drawsContent 1)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 15.00 x 135.00)
-                  (coverage rect -603.00, -10.00 800.00 x 600.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 1.00)
-                )
-                (GraphicsLayer
-                  (position 285.00 135.00)
-                  (bounds 15.00 15.00)
-                  (drawsContent 1)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 15.00 x 15.00)
-                  (coverage rect -603.00, -145.00 800.00 x 600.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 1.00)
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 8.00 166.00)
-          (bounds 304.00 154.00)
-          (drawsContent 1)
-          (backingStoreAttached 1)
-          (visible rect 0.00, 0.00 304.00 x 154.00)
-          (coverage rect -8.00, -166.00 800.00 x 600.00)
-          (intersects coverage rect 1)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (backingStoreAttached 0)
-              (visible rect 0.00, 0.00 0.00 x 0.00)
-              (coverage rect -10.00, -168.00 800.00 x 600.00)
-              (intersects coverage rect 0)
-              (contentsScale 1.00)
-              (children 4
-                (GraphicsLayer
-                  (anchor 0.00 0.00)
-                  (bounds 285.00 135.00)
-                  (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 285.00 x 135.00)
-                  (coverage rect 0.00, 0.00 285.00 x 135.00)
-                  (intersects coverage rect 1)
-                  (contentsScale 1.00)
-                  (children 1
-                    (GraphicsLayer
-                      (backingStoreAttached 0)
-                      (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (coverage rect 0.00, 0.00 285.00 x 135.00)
-                      (intersects coverage rect 0)
-                      (contentsScale 1.00)
-                      (children 1
-                        (GraphicsLayer
-                          (anchor 0.00 0.00)
-                          (bounds 400.00 300.00)
-                          (backingStoreAttached 1)
-                          (visible rect 0.00, 0.00 285.00 x 135.00)
-                          (coverage rect 0.00, 0.00 285.00 x 135.00)
-                          (intersects coverage rect 1)
-                          (contentsScale 1.00)
-                          (children 1
-                            (GraphicsLayer
-                              (bounds 400.00 300.00)
-                              (backingStoreAttached 1)
-                              (visible rect 0.00, 0.00 285.00 x 135.00)
-                              (coverage rect 0.00, 0.00 285.00 x 135.00)
-                              (intersects coverage rect 1)
-                              (contentsScale 1.00)
-                              (children 2
-                                (GraphicsLayer
-                                  (anchor 0.00 0.00)
-                                  (bounds 285.00 135.00)
-                                  (drawsContent 1)
-                                  (backingStoreAttached 1)
-                                  (visible rect 0.00, 0.00 285.00 x 135.00)
-                                  (coverage rect 0.00, 0.00 285.00 x 135.00)
-                                  (intersects coverage rect 1)
-                                  (contentsScale 1.00)
-                                )
-                                (GraphicsLayer
-                                  (bounds 400.00 300.00)
-                                  (drawsContent 1)
-                                  (backingStoreAttached 1)
-                                  (visible rect 0.00, 0.00 285.00 x 135.00)
-                                  (coverage rect 0.00, 0.00 285.00 x 135.00)
-                                  (intersects coverage rect 1)
-                                  (contentsScale 1.00)
-                                  (tile cache coverage 0, 0 400 x 300)
-                                  (tile size 512 x 512)
-                                  (top left tile 0, 0 tiles grid 1 x 1)
-                                  (in window 1)
-                                  (children 1
-                                    (GraphicsLayer
-                                      (backingStoreAttached 0)
-                                      (visible rect 0.00, 0.00 0.00 x 0.00)
-                                      (coverage rect 0.00, 0.00 285.00 x 135.00)
-                                      (intersects coverage rect 0)
-                                      (contentsScale 1.00)
-                                    )
-                                  )
-                                )
-                              )
-                            )
-                          )
-                        )
-                      )
-                    )
-                  )
-                )
-                (GraphicsLayer
-                  (position 0.00 135.00)
-                  (bounds 285.00 15.00)
+                  (position 0.00 85.00)
+                  (bounds 185.00 15.00)
                   (drawsContent 1)
                   (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 285.00 x 15.00)
-                  (coverage rect -10.00, -303.00 800.00 x 600.00)
+                  (visible rect 0.00, 0.00 185.00 x 15.00)
+                  (coverage rect -10.00, -95.00 800.00 x 600.00)
                   (intersects coverage rect 1)
                   (contentsScale 1.00)
                 )
                 (GraphicsLayer
-                  (position 285.00 0.00)
-                  (bounds 15.00 135.00)
+                  (position 185.00 0.00)
+                  (bounds 15.00 85.00)
                   (drawsContent 1)
                   (backingStoreAttached 1)
-                  (visible rect 0.00, 0.00 15.00 x 135.00)
-                  (coverage rect -295.00, -168.00 800.00 x 600.00)
+                  (visible rect 0.00, 0.00 15.00 x 85.00)
+                  (coverage rect -195.00, -10.00 800.00 x 600.00)
                   (intersects coverage rect 1)
                   (contentsScale 1.00)
                 )
                 (GraphicsLayer
-                  (position 285.00 135.00)
+                  (position 185.00 85.00)
                   (bounds 15.00 15.00)
                   (drawsContent 1)
                   (backingStoreAttached 1)
                   (visible rect 0.00, 0.00 15.00 x 15.00)
-                  (coverage rect -295.00, -303.00 800.00 x 600.00)
+                  (coverage rect -195.00, -95.00 800.00 x 600.00)
                   (intersects coverage rect 1)
                   (contentsScale 1.00)
                 )
index fb0b1b4..b2a8c43 100644 (file)
@@ -1,3 +1,18 @@
+2017-11-21  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r225089.
+        https://bugs.webkit.org/show_bug.cgi?id=179937
+
+        This patch caused compilation failures (Requested by fredw on
+        #webkit).
+
+        Reverted changeset:
+
+        "Async frame scrolling: handle fixed root backgrounds in
+        frames"
+        https://bugs.webkit.org/show_bug.cgi?id=176261
+        https://trac.webkit.org/changeset/225089
+
 2017-11-21  Frederic Wang  <fwang@igalia.com>
 
         Async frame scrolling: handle fixed root backgrounds in frames
index 4b27fe2..62f1869 100644 (file)
@@ -1019,7 +1019,7 @@ void RenderLayerBacking::updateGeometry()
         positionOverflowControlsLayers();
     }
 
-    if (!m_isMainFrameRenderViewLayer && !m_isFrameLayerWithTiledBacking) {
+    if (!m_isMainFrameRenderViewLayer) {
         // For non-root layers, background is always painted by the primary graphics layer.
         ASSERT(!m_backgroundLayer);
         // Subpixel offset from graphics layer or size changed.
@@ -1421,15 +1421,7 @@ bool RenderLayerBacking::updateDescendantClippingLayer(bool needsDescendantClip)
 
 void RenderLayerBacking::setBackgroundLayerPaintsFixedRootBackground(bool backgroundLayerPaintsFixedRootBackground)
 {
-    if (backgroundLayerPaintsFixedRootBackground == m_backgroundLayerPaintsFixedRootBackground)
-        return;
-
     m_backgroundLayerPaintsFixedRootBackground = backgroundLayerPaintsFixedRootBackground;
-
-    if (m_backgroundLayerPaintsFixedRootBackground) {
-        ASSERT(m_isFrameLayerWithTiledBacking);
-        renderer().view().frameView().removeSlowRepaintObject(renderer().view().rendererForRootBackground());
-    }
 }
 
 bool RenderLayerBacking::requiresHorizontalScrollbarLayer() const
@@ -1931,14 +1923,12 @@ void RenderLayerBacking::updateRootLayerConfiguration()
     bool viewIsTransparent = compositor().viewHasTransparentBackground(&backgroundColor);
 
     if (m_backgroundLayerPaintsFixedRootBackground && m_backgroundLayer) {
-        if (m_isMainFrameRenderViewLayer) {
-            m_backgroundLayer->setBackgroundColor(backgroundColor);
-            m_backgroundLayer->setContentsOpaque(!viewIsTransparent);
-        }
+        m_backgroundLayer->setBackgroundColor(backgroundColor);
+        m_backgroundLayer->setContentsOpaque(!viewIsTransparent);
 
         m_graphicsLayer->setBackgroundColor(Color());
         m_graphicsLayer->setContentsOpaque(false);
-    } else if (m_isMainFrameRenderViewLayer) {
+    } else {
         m_graphicsLayer->setBackgroundColor(backgroundColor);
         m_graphicsLayer->setContentsOpaque(!viewIsTransparent);
     }