Unreviewed, rolling out r155977.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Sep 2013 20:54:00 +0000 (20:54 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Sep 2013 20:54:00 +0000 (20:54 +0000)
http://trac.webkit.org/changeset/155977
https://bugs.webkit.org/show_bug.cgi?id=121515

Broke over a dozen tests on Mac WK2 (Requested by ap on
#webkit).

Source/WebCore:

* platform/graphics/ca/GraphicsLayerCA.cpp:
(WebCore::GraphicsLayerCA::GraphicsLayerCA):
(WebCore::GraphicsLayerCA::flushCompositingState):
(WebCore::GraphicsLayerCA::computeVisibleRect):
(WebCore::GraphicsLayerCA::recursiveCommitChanges):
(WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
(WebCore::GraphicsLayerCA::updateAnimations):
(WebCore::GraphicsLayerCA::setAnimationOnLayer):
(WebCore::GraphicsLayerCA::appendToUncommittedAnimations):
(WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
(WebCore::GraphicsLayerCA::setTransformAnimationKeyframes):
(WebCore::GraphicsLayerCA::updateContentsScale):
(WebCore::GraphicsLayerCA::dumpAdditionalProperties):
* platform/graphics/ca/GraphicsLayerCA.h:
(WebCore::GraphicsLayerCA::LayerPropertyAnimation::LayerPropertyAnimation):

LayoutTests:

* compositing/contents-scale/animating-expected.txt: Removed.
* compositing/contents-scale/animating.html: Removed.
* compositing/contents-scale/scaled-ancestor-expected.txt: Removed.
* compositing/contents-scale/scaled-ancestor.html: Removed.
* compositing/contents-scale/simple-scale-expected.txt: Removed.
* compositing/contents-scale/simple-scale.html: Removed.
* compositing/contents-scale/z-translate-expected.txt: Removed.
* compositing/contents-scale/z-translate.html: Removed.
* compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt:
* compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt:
* compositing/visible-rect/2d-transformed-expected.txt:
* compositing/visible-rect/3d-transform-style-expected.txt:
* compositing/visible-rect/3d-transformed-expected.txt:
* compositing/visible-rect/animated-expected.txt:
* compositing/visible-rect/animated-from-none-expected.txt:
* compositing/visible-rect/clipped-by-viewport-expected.txt:
* compositing/visible-rect/clipped-visible-rect-expected.txt:
* compositing/visible-rect/flipped-preserve-3d-expected.txt:
* compositing/visible-rect/iframe-and-layers-expected.txt:
* compositing/visible-rect/nested-transform-expected.txt:
* compositing/visible-rect/scrolled-expected.txt:
* platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt: Removed.
* platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt: Removed.
* platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt:
* platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt:
* platform/mac/compositing/tiling/tile-cache-zoomed-expected.txt:
* platform/mac/compositing/visible-rect/2d-transformed-expected.txt: Removed.
* platform/mac/compositing/visible-rect/3d-transform-style-expected.txt: Removed.
* platform/mac/compositing/visible-rect/3d-transformed-expected.txt: Removed.
* platform/mac/compositing/visible-rect/animated-expected.txt: Removed.
* platform/mac/compositing/visible-rect/animated-from-none-expected.txt: Removed.
* platform/mac/compositing/visible-rect/clipped-by-viewport-expected.txt: Removed.
* platform/mac/compositing/visible-rect/clipped-visible-rect-expected.txt: Removed.
* platform/mac/compositing/visible-rect/flipped-preserve-3d-expected.txt: Removed.
* platform/mac/compositing/visible-rect/iframe-and-layers-expected.txt: Removed.
* platform/mac/compositing/visible-rect/iframe-no-layers-expected.txt:
* platform/mac/compositing/visible-rect/nested-transform-expected.txt: Removed.
* platform/mac/compositing/visible-rect/scrolled-expected.txt: Removed.

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

42 files changed:
LayoutTests/ChangeLog
LayoutTests/compositing/contents-scale/animating-expected.txt [deleted file]
LayoutTests/compositing/contents-scale/animating.html [deleted file]
LayoutTests/compositing/contents-scale/scaled-ancestor-expected.txt [deleted file]
LayoutTests/compositing/contents-scale/scaled-ancestor.html [deleted file]
LayoutTests/compositing/contents-scale/simple-scale-expected.txt [deleted file]
LayoutTests/compositing/contents-scale/simple-scale.html [deleted file]
LayoutTests/compositing/contents-scale/z-translate-expected.txt [deleted file]
LayoutTests/compositing/contents-scale/z-translate.html [deleted file]
LayoutTests/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt
LayoutTests/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt
LayoutTests/compositing/visible-rect/2d-transformed-expected.txt
LayoutTests/compositing/visible-rect/3d-transform-style-expected.txt
LayoutTests/compositing/visible-rect/3d-transformed-expected.txt
LayoutTests/compositing/visible-rect/animated-expected.txt
LayoutTests/compositing/visible-rect/animated-from-none-expected.txt
LayoutTests/compositing/visible-rect/clipped-by-viewport-expected.txt
LayoutTests/compositing/visible-rect/clipped-visible-rect-expected.txt
LayoutTests/compositing/visible-rect/flipped-preserve-3d-expected.txt
LayoutTests/compositing/visible-rect/iframe-and-layers-expected.txt
LayoutTests/compositing/visible-rect/nested-transform-expected.txt
LayoutTests/compositing/visible-rect/scrolled-expected.txt
LayoutTests/platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt
LayoutTests/platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt
LayoutTests/platform/mac/compositing/tiling/tile-cache-zoomed-expected.txt
LayoutTests/platform/mac/compositing/visible-rect/2d-transformed-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/3d-transform-style-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/3d-transformed-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/animated-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/animated-from-none-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/clipped-by-viewport-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/clipped-visible-rect-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/flipped-preserve-3d-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/iframe-and-layers-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/iframe-no-layers-expected.txt
LayoutTests/platform/mac/compositing/visible-rect/nested-transform-expected.txt [deleted file]
LayoutTests/platform/mac/compositing/visible-rect/scrolled-expected.txt [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h

index 5a8c4da..158f56c 100644 (file)
@@ -1,3 +1,51 @@
+2013-09-17  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r155977.
+        http://trac.webkit.org/changeset/155977
+        https://bugs.webkit.org/show_bug.cgi?id=121515
+
+        Broke over a dozen tests on Mac WK2 (Requested by ap on
+        #webkit).
+
+        * compositing/contents-scale/animating-expected.txt: Removed.
+        * compositing/contents-scale/animating.html: Removed.
+        * compositing/contents-scale/scaled-ancestor-expected.txt: Removed.
+        * compositing/contents-scale/scaled-ancestor.html: Removed.
+        * compositing/contents-scale/simple-scale-expected.txt: Removed.
+        * compositing/contents-scale/simple-scale.html: Removed.
+        * compositing/contents-scale/z-translate-expected.txt: Removed.
+        * compositing/contents-scale/z-translate.html: Removed.
+        * compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt:
+        * compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt:
+        * compositing/visible-rect/2d-transformed-expected.txt:
+        * compositing/visible-rect/3d-transform-style-expected.txt:
+        * compositing/visible-rect/3d-transformed-expected.txt:
+        * compositing/visible-rect/animated-expected.txt:
+        * compositing/visible-rect/animated-from-none-expected.txt:
+        * compositing/visible-rect/clipped-by-viewport-expected.txt:
+        * compositing/visible-rect/clipped-visible-rect-expected.txt:
+        * compositing/visible-rect/flipped-preserve-3d-expected.txt:
+        * compositing/visible-rect/iframe-and-layers-expected.txt:
+        * compositing/visible-rect/nested-transform-expected.txt:
+        * compositing/visible-rect/scrolled-expected.txt:
+        * platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt: Removed.
+        * platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt: Removed.
+        * platform/mac/compositing/tiling/rotated-tiled-clamped-expected.txt:
+        * platform/mac/compositing/tiling/rotated-tiled-preserve3d-clamped-expected.txt:
+        * platform/mac/compositing/tiling/tile-cache-zoomed-expected.txt:
+        * platform/mac/compositing/visible-rect/2d-transformed-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/3d-transform-style-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/3d-transformed-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/animated-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/animated-from-none-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/clipped-by-viewport-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/clipped-visible-rect-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/flipped-preserve-3d-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/iframe-and-layers-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/iframe-no-layers-expected.txt:
+        * platform/mac/compositing/visible-rect/nested-transform-expected.txt: Removed.
+        * platform/mac/compositing/visible-rect/scrolled-expected.txt: Removed.
+
 2013-09-17  Eric Carlson  <eric.carlson@apple.com>
 
         MediaStream API: Changing the device enumeration to be async
diff --git a/LayoutTests/compositing/contents-scale/animating-expected.txt b/LayoutTests/compositing/contents-scale/animating-expected.txt
deleted file mode 100644 (file)
index 97662c0..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-Box
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 18.00 10.00)
-          (anchor 0.00 0.00)
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-          (transform [1.50 0.00 0.00 0.00] [0.00 1.50 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
-          (visible rect 0.00, 0.00 100.00 x 100.00)
-          (contentsScale 3.00)
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/compositing/contents-scale/animating.html b/LayoutTests/compositing/contents-scale/animating.html
deleted file mode 100644 (file)
index ed12486..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<style>
-    #box {
-        width: 100px;
-        height: 100px;
-        margin: 10px;
-        padding: 10px;
-        box-sizing: border-box;
-        background-color: silver;
-        -webkit-transform-origin: top left;
-    }
-    
-    .animating {
-        -webkit-animation: scale 100000000s infinite linear;
-    }
-    
-    @-webkit-keyframes scale {
-        from { -webkit-transform: scale(1.5); }
-        to   { -webkit-transform: scale(3); }
-    }
-</style>
-    <script>
-        if (window.testRunner) {
-            testRunner.dumpAsText();
-            testRunner.waitUntilDone();
-        }
-
-        function dumpLayers()
-        {
-            if (window.internals)
-                document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS)
-
-            if (window.testRunner)
-                testRunner.notifyDone();
-        }
-        
-        function doTest()
-        {
-            var box = document.getElementById('box');
-            box.addEventListener('webkitAnimationStart', dumpLayers, false);
-            box.classList.add('animating');
-        }
-        window.addEventListener('load', doTest, false);
-    </script>
-</head>
-<body>
-
-    <div id="box">Box</div>
-
-    <pre id="layers">Layer tree goes here when testing</pre>
-</body>
-</html>
diff --git a/LayoutTests/compositing/contents-scale/scaled-ancestor-expected.txt b/LayoutTests/compositing/contents-scale/scaled-ancestor-expected.txt
deleted file mode 100644 (file)
index 5fe95ae..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-Box
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (anchor 0.00 0.00)
-          (bounds 102.00 102.00)
-          (drawsContent 1)
-          (transform [2.00 0.00 0.00 0.00] [0.00 2.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
-          (visible rect 0.00, 0.00 102.00 x 102.00)
-          (contentsScale 2.00)
-          (children 1
-            (GraphicsLayer
-              (position 11.00 11.00)
-              (bounds 100.00 100.00)
-              (contentsOpaque 1)
-              (drawsContent 1)
-              (visible rect 0.00, 0.00 100.00 x 100.00)
-              (contentsScale 2.00)
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/compositing/contents-scale/scaled-ancestor.html b/LayoutTests/compositing/contents-scale/scaled-ancestor.html
deleted file mode 100644 (file)
index a4bd3c6..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<style>
-    .container {
-        width: 100px;
-        height: 100px;
-        border: 1px solid black;
-        -webkit-transform: scale3d(2, 2, 1);
-        -webkit-transform-origin: top left;
-        
-    }
-    .box {
-        width: 100px;
-        height: 100px;
-        margin: 10px;
-        padding: 10px;
-        box-sizing: border-box;
-        background-color: silver;
-    }
-    .composited {
-        -webkit-transform: translateZ(0);
-    }
-</style>
-    <script>
-        if (window.testRunner)
-            testRunner.dumpAsText();
-
-        function doTest()
-        {
-            if (window.internals)
-                document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS)
-        }
-        window.addEventListener('load', doTest, false);
-    </script>
-</head>
-<body>
-
-    <div class="container">
-        <div class="composited box">Box</div>
-    </div>
-
-    <pre id="layers">Layer tree goes here when testing</pre>
-</body>
-</html>
diff --git a/LayoutTests/compositing/contents-scale/simple-scale-expected.txt b/LayoutTests/compositing/contents-scale/simple-scale-expected.txt
deleted file mode 100644 (file)
index ff90caf..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-Box
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 18.00 10.00)
-          (anchor 0.00 0.00)
-          (bounds 100.00 100.00)
-          (contentsOpaque 1)
-          (drawsContent 1)
-          (transform [2.00 0.00 0.00 0.00] [0.00 2.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
-          (visible rect 0.00, 0.00 100.00 x 100.00)
-          (contentsScale 2.00)
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/compositing/contents-scale/simple-scale.html b/LayoutTests/compositing/contents-scale/simple-scale.html
deleted file mode 100644 (file)
index 7134124..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<style>
-    .box {
-        width: 100px;
-        height: 100px;
-        margin: 10px;
-        padding: 10px;
-        box-sizing: border-box;
-        background-color: silver;
-        -webkit-transform: scale3d(2, 2, 1);
-        -webkit-transform-origin: top left;
-    }
-</style>
-    <script>
-        if (window.testRunner)
-            testRunner.dumpAsText();
-
-        function doTest()
-        {
-            if (window.internals)
-                document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS)
-        }
-        window.addEventListener('load', doTest, false);
-    </script>
-</head>
-<body>
-
-    <div class="box">Box</div>
-
-    <pre id="layers">Layer tree goes here when testing</pre>
-</body>
-</html>
diff --git a/LayoutTests/compositing/contents-scale/z-translate-expected.txt b/LayoutTests/compositing/contents-scale/z-translate-expected.txt
deleted file mode 100644 (file)
index 13be723..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-Box
-Box
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 102.00 102.00)
-          (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
-          (visible rect 0.00, 0.00 102.00 x 102.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 11.00 11.00)
-              (bounds 100.00 100.00)
-              (contentsOpaque 1)
-              (preserves3D 1)
-              (drawsContent 1)
-              (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 100.00 1.00])
-              (visible rect 0.00, 0.00 100.00 x 100.00)
-              (contentsScale 1.25)
-              (children 1
-                (GraphicsLayer
-                  (position 20.00 38.00)
-                  (bounds 100.00 100.00)
-                  (contentsOpaque 1)
-                  (preserves3D 1)
-                  (drawsContent 1)
-                  (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 100.00 1.00])
-                  (visible rect 0.00, 0.00 100.00 x 100.00)
-                  (contentsScale 1.67)
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/compositing/contents-scale/z-translate.html b/LayoutTests/compositing/contents-scale/z-translate.html
deleted file mode 100644 (file)
index 81ca80f..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-
-<html>
-<head>
-<style>
-    .container {
-        width: 100px;
-        height: 100px;
-        border: 1px solid black;
-        -webkit-perspective: 500px;
-        
-    }
-    .box {
-        width: 100px;
-        height: 100px;
-        margin: 10px;
-        padding: 10px;
-        box-sizing: border-box;
-        background-color: silver;
-        -webkit-transform: translateZ(100px);
-        -webkit-transform-style: preserve-3d;
-    }
-</style>
-    <script>
-        if (window.testRunner)
-            testRunner.dumpAsText();
-
-        function doTest()
-        {
-            if (window.internals)
-                document.getElementById('layers').innerText = internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS)
-        }
-        window.addEventListener('load', doTest, false);
-    </script>
-</head>
-<body>
-
-    <div class="container">
-        <div class="box">Box
-            <div class="box">Box</div>
-        </div>
-    </div>
-
-    <pre id="layers">Layer tree goes here when testing</pre>
-</body>
-</html>
index 261c941..351f883 100644 (file)
@@ -5,25 +5,30 @@ Text in the green box should stay visible.
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 3
         (GraphicsLayer
           (position 8.00 96.00)
           (bounds 22.00 22.00)
           (drawsContent 1)
+          (visible rect 0.00, 0.00 22.00 x 22.00)
         )
         (GraphicsLayer
           (position 8.00 86.00)
           (bounds 102.00 20.00)
           (drawsContent 1)
+          (visible rect 0.00, 0.00 102.00 x 20.00)
         )
         (GraphicsLayer
           (position 0.00 87.00)
           (bounds 787.00 18.00)
           (drawsContent 1)
+          (visible rect 0.00, 0.00 787.00 x 18.00)
         )
       )
     )
index 206359d..612b9f0 100644 (file)
@@ -5,25 +5,30 @@ Text in the green box should stay visible.
 Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 3
         (GraphicsLayer
           (position 8.00 96.00)
           (bounds 22.00 22.00)
           (drawsContent 1)
+          (visible rect 0.00, 0.00 22.00 x 22.00)
         )
         (GraphicsLayer
           (position 8.00 86.00)
           (bounds 102.00 20.00)
           (drawsContent 1)
+          (visible rect 0.00, 0.00 102.00 x 20.00)
         )
         (GraphicsLayer
           (position 9.00 87.00)
           (bounds 778.00 18.00)
           (drawsContent 1)
+          (visible rect 0.00, 0.00 778.00 x 18.00)
         )
       )
     )
index 5d4fa16..34d75d8 100644 (file)
@@ -1,32 +1,39 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 1
         (GraphicsLayer
           (position 8.00 8.00)
           (bounds 502.00 202.00)
+          (visible rect 0.00, 0.00 502.00 x 202.00)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
               (bounds 500.00 200.00)
+              (visible rect 0.00, 0.00 500.00 x 200.00)
               (children 3
                 (GraphicsLayer
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00])
+                  (visible rect 100.00, 0.00 100.00 x 200.00)
                 )
                 (GraphicsLayer
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
                   (transform [0.71 0.71 0.00 0.00] [-0.71 0.71 0.00 0.00] [0.00 0.00 1.00 0.00] [150.00 0.00 0.00 1.00])
+                  (visible rect 0.00, 0.00 200.00 x 200.00)
                 )
                 (GraphicsLayer
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [400.00 0.00 0.00 1.00])
+                  (visible rect 0.00, 0.00 100.00 x 200.00)
                 )
               )
             )
index 5703d52..bc4d90b 100644 (file)
@@ -1,27 +1,33 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 2
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 204.00 204.00)
+          (visible rect 0.00, 0.00 204.00 x 204.00)
           (children 1
             (GraphicsLayer
               (position 2.00 2.00)
               (bounds 200.00 200.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00])
+              (visible rect 0.00, 0.00 200.00 x 200.00)
               (children 1
                 (GraphicsLayer
                   (bounds 200.00 0.00)
                   (preserves3D 1)
+                  (visible rect 0.00, 0.00 0.00 x 0.00)
                   (children 1
                     (GraphicsLayer
                       (bounds 300.00 300.00)
                       (contentsOpaque 1)
                       (transform [1.00 0.00 0.00 0.00] [0.00 0.91 0.42 0.00] [0.00 -0.42 0.91 0.00] [0.00 0.00 0.00 1.00])
+                      (visible rect 0.00, 0.00 213.67 x 200.68)
                     )
                   )
                 )
         (GraphicsLayer
           (position 18.00 224.00)
           (bounds 204.00 204.00)
+          (visible rect 0.00, 0.00 204.00 x 204.00)
           (children 1
             (GraphicsLayer
               (position 2.00 2.00)
               (bounds 200.00 200.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00])
+              (visible rect 0.00, 0.00 200.00 x 200.00)
               (children 1
                 (GraphicsLayer
                   (bounds 200.00 0.00)
                   (preserves3D 1)
+                  (visible rect 0.00, 0.00 0.00 x 0.00)
                   (children 1
                     (GraphicsLayer
                       (bounds 300.00 300.00)
                       (contentsOpaque 1)
                       (transform [0.91 0.00 0.42 0.00] [0.00 1.00 0.00 0.00] [-0.42 0.00 0.91 0.00] [0.00 0.00 0.00 1.00])
+                      (visible rect 0.00, 0.00 200.68 x 213.67)
                     )
                   )
                 )
index e776f0f..33430a2 100644 (file)
@@ -1,24 +1,29 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 2
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 204.00 204.00)
+          (visible rect 0.00, 0.00 204.00 x 204.00)
           (children 1
             (GraphicsLayer
               (position 2.00 2.00)
               (bounds 200.00 200.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00])
+              (visible rect 0.00, 0.00 200.00 x 200.00)
               (children 1
                 (GraphicsLayer
                   (anchor 0.20 0.20)
                   (bounds 500.00 500.00)
                   (contentsOpaque 1)
                   (transform [1.00 0.00 0.00 0.00] [0.00 0.71 0.71 0.00] [0.00 -0.71 0.71 0.00] [0.00 0.00 0.00 1.00])
+                  (visible rect 0.00, 0.00 220.62 x 218.46)
                 )
               )
             )
         (GraphicsLayer
           (position 18.00 224.00)
           (bounds 204.00 204.00)
+          (visible rect 0.00, 0.00 204.00 x 204.00)
           (children 1
             (GraphicsLayer
               (position 2.00 2.00)
               (bounds 200.00 200.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00])
+              (visible rect 0.00, 0.00 200.00 x 200.00)
               (children 1
                 (GraphicsLayer
                   (anchor 0.20 0.20)
                   (bounds 500.00 500.00)
                   (contentsOpaque 1)
                   (transform [0.71 0.00 0.71 0.00] [0.00 1.00 0.00 0.00] [-0.71 0.00 0.71 0.00] [0.00 0.00 0.00 1.00])
+                  (visible rect 0.00, 0.00 218.46 x 220.62)
                 )
               )
             )
index 7d5b805..178a640 100644 (file)
@@ -1,22 +1,27 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 1
         (GraphicsLayer
           (position 8.00 8.00)
           (bounds 502.00 202.00)
+          (visible rect 0.00, 0.00 502.00 x 202.00)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
               (bounds 500.00 200.00)
+              (visible rect 0.00, 0.00 500.00 x 200.00)
               (children 1
                 (GraphicsLayer
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00])
+                  (visible rect 100.00, 0.00 100.00 x 200.00)
                 )
               )
             )
index 4ebb3b5..76cf37f 100644 (file)
@@ -1,22 +1,27 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 1
         (GraphicsLayer
           (position 8.00 8.00)
           (bounds 502.00 202.00)
+          (visible rect 0.00, 0.00 502.00 x 202.00)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
               (bounds 500.00 200.00)
+              (visible rect 0.00, 0.00 500.00 x 200.00)
               (children 1
                 (GraphicsLayer
                   (position -100.00 0.00)
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
+                  (visible rect 100.00, 0.00 100.00 x 200.00)
                 )
               )
             )
index 4118680..aab9320 100644 (file)
@@ -1,21 +1,25 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 2
         (GraphicsLayer
           (position -100.00 -120.00)
           (bounds 200.00 200.00)
           (contentsOpaque 1)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+          (visible rect 100.00, 120.00 100.00 x 80.00)
         )
         (GraphicsLayer
           (position -100.00 200.00)
           (bounds 200.00 200.00)
           (contentsOpaque 1)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+          (visible rect 100.00, 0.00 100.00 x 200.00)
         )
       )
     )
index d975a62..79fcaff 100644 (file)
@@ -1,35 +1,42 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
+  (visible rect 0.00, 0.00 800.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 800.00 x 600.00)
       (children 1
         (GraphicsLayer
           (position 8.00 8.00)
           (bounds 502.00 202.00)
+          (visible rect 0.00, 0.00 502.00 x 202.00)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
               (bounds 500.00 200.00)
+              (visible rect 0.00, 0.00 500.00 x 200.00)
               (children 3
                 (GraphicsLayer
                   (position -100.00 0.00)
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+                  (visible rect 100.00, 0.00 100.00 x 200.00)
                 )
                 (GraphicsLayer
                   (position 150.00 0.00)
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+                  (visible rect 0.00, 0.00 200.00 x 200.00)
                 )
                 (GraphicsLayer
                   (position 400.00 0.00)
                   (bounds 200.00 200.00)
                   (contentsOpaque 1)
                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+                  (visible rect 0.00, 0.00 100.00 x 200.00)
                 )
               )
             )
index 9c3d7a4..08f8fc2 100644 (file)
@@ -6,15 +6,18 @@ Description
 Some text here.
 (GraphicsLayer
   (bounds 785.00 615.00)
+  (visible rect 0.00, 0.00 785.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 785.00 615.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 785.00 x 600.00)
       (children 1
         (GraphicsLayer
           (position 0.00 13.00)
           (bounds 602.00 602.00)
           (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
+          (visible rect 0.00, 0.00 602.00 x 587.00)
           (children 1
             (GraphicsLayer
               (position 101.00 101.00)
@@ -22,22 +25,27 @@ Some text here.
               (bounds 440.00 440.00)
               (preserves3D 1)
               (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00])
+              (visible rect 0.00, 0.00 440.00 x 440.00)
               (children 1
                 (GraphicsLayer
                   (bounds 420.00 420.00)
                   (contentsOpaque 1)
                   (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00])
+                  (visible rect 0.00, 0.00 420.00 x 420.00)
                   (children 1
                     (GraphicsLayer
                       (bounds 420.00 420.00)
+                      (visible rect 0.00, 0.00 420.00 x 420.00)
                       (children 1
                         (GraphicsLayer
                           (position 0.00 -90.00)
                           (bounds 418.00 510.00)
                           (contentsOpaque 1)
+                          (visible rect 0.00, 90.00 418.00 x 420.00)
                           (children 1
                             (GraphicsLayer
                               (bounds 418.00 510.00)
+                              (visible rect 0.00, 90.00 418.00 x 420.00)
                               (children 3
                                 (GraphicsLayer
                                   (position -3000.00 0.00)
@@ -45,6 +53,7 @@ Some text here.
                                   (bounds 3418.00 120.00)
                                   (usingTiledLayer 1)
                                   (drawsContent 1)
+                                  (visible rect 3000.00, 90.00 418.00 x 30.00)
                                 )
                                 (GraphicsLayer
                                   (position -3000.00 120.00)
@@ -52,6 +61,7 @@ Some text here.
                                   (bounds 3418.00 120.00)
                                   (usingTiledLayer 1)
                                   (drawsContent 1)
+                                  (visible rect 3000.00, 0.00 418.00 x 120.00)
                                 )
                                 (GraphicsLayer
                                   (position -3000.00 240.00)
@@ -59,6 +69,7 @@ Some text here.
                                   (bounds 3418.00 120.00)
                                   (usingTiledLayer 1)
                                   (drawsContent 1)
+                                  (visible rect 3000.00, 0.00 418.00 x 120.00)
                                 )
                               )
                             )
index 9979091..f02eb8e 100644 (file)
@@ -1,30 +1,38 @@
 
 (GraphicsLayer
   (bounds 1508.00 1516.00)
+  (visible rect 0.00, 0.00 785.00 x 585.00)
   (children 1
     (GraphicsLayer
       (bounds 1508.00 1516.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 785.00 x 585.00)
       (children 2
         (GraphicsLayer
           (position 10.00 10.00)
           (bounds 360.00 210.00)
           (drawsContent 1)
+          (visible rect 0.00, 0.00 360.00 x 210.00)
           (children 1
             (GraphicsLayer
               (position 30.00 30.00)
+              (visible rect 0.00, 0.00 0.00 x 0.00)
               (children 1
                 (GraphicsLayer
                   (bounds 285.00 135.00)
+                  (visible rect 0.00, 0.00 285.00 x 135.00)
                   (children 1
                     (GraphicsLayer
+                      (visible rect 0.00, 0.00 0.00 x 0.00)
                       (children 1
                         (GraphicsLayer
                           (bounds 1508.00 1516.00)
+                          (visible rect 0.00, 0.00 285.00 x 135.00)
                           (children 1
                             (GraphicsLayer
                               (bounds 1508.00 1516.00)
                               (drawsContent 1)
+                              (visible rect 0.00, 0.00 285.00 x 135.00)
                               (children 1
                                 (GraphicsLayer
                                   (position 8.00 8.00)
@@ -32,6 +40,7 @@
                                   (contentsOpaque 1)
                                   (drawsContent 1)
                                   (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+                                  (visible rect 0.00, 0.00 100.00 x 127.00)
                                 )
                               )
                             )
@@ -50,6 +59,7 @@
           (bounds 200.00 200.00)
           (contentsOpaque 1)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+          (visible rect 0.00, 0.00 200.00 x 200.00)
         )
       )
     )
index 0174c2e..7b29e0f 100644 (file)
@@ -1,33 +1,40 @@
 (GraphicsLayer
   (bounds 785.00 669.00)
+  (visible rect 0.00, 0.00 785.00 x 600.00)
   (children 1
     (GraphicsLayer
       (bounds 785.00 669.00)
       (contentsOpaque 1)
+      (visible rect 0.00, 0.00 785.00 x 600.00)
       (children 2
         (GraphicsLayer
           (position 18.00 10.00)
           (bounds 304.00 304.00)
+          (visible rect 0.00, 0.00 304.00 x 304.00)
           (children 1
             (GraphicsLayer
               (position 2.00 2.00)
               (bounds 300.00 300.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.26 0.26 1.00 -0.00] [0.00 0.00 0.00 1.00])
+              (visible rect 0.00, 0.00 300.00 x 300.00)
               (children 1
                 (GraphicsLayer
                   (bounds 300.00 0.00)
                   (preserves3D 1)
                   (transform [0.94 0.00 -0.34 0.00] [0.00 1.00 0.00 0.00] [0.34 0.00 0.94 0.00] [0.00 0.00 0.00 1.00])
+                  (visible rect 0.00, 0.00 0.00 x 0.00)
                   (children 1
                     (GraphicsLayer
                       (bounds 300.00 0.00)
                       (preserves3D 1)
                       (transform [0.94 0.00 -0.34 0.00] [0.00 1.00 0.00 0.00] [0.34 0.00 0.94 0.00] [0.00 0.00 0.00 1.00])
+                      (visible rect 0.00, 0.00 0.00 x 0.00)
                       (children 1
                         (GraphicsLayer
                           (bounds 500.00 500.00)
                           (contentsOpaque 1)
                           (transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00])
+                          (visible rect 0.00, 0.00 500.00 x 369.91)
                         )
                       )
                     )
         (GraphicsLayer
           (position 18.00 324.00)
           (bounds 304.00 304.00)
+          (visible rect 0.00, 0.00 304.00 x 276.00)
           (children 1
             (GraphicsLayer
               (position 2.00 2.00)
               (bounds 300.00 300.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.26 0.26 1.00 -0.00] [0.00 0.00 0.00 1.00])
+              (visible rect 0.00, 0.00 300.00 x 274.00)
               (children 1
                 (GraphicsLayer
                   (bounds 300.00 0.00)
                   (preserves3D 1)
+                  (visible rect 0.00, 0.00 0.00 x 0.00)
                   (children 1
                     (GraphicsLayer
                       (bounds 300.00 0.00)
                       (preserves3D 1)
                       (transform [0.77 0.00 -0.64 0.00] [0.00 1.00 0.00 0.00] [0.64 0.00 0.77 0.00] [0.00 0.00 0.00 1.00])
+                      (visible rect 0.00, 0.00 0.00 x 0.00)
                       (children 1
                         (GraphicsLayer
                           (bounds 500.00 500.00)
                           (contentsOpaque 1)
                           (transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00])
+                          (visible rect 0.00, 0.00 500.00 x 351.87)
                         )
                       )
                     )
index 33cfff6..2e090b1 100644 (file)
@@ -1,15 +1,18 @@
 (GraphicsLayer
   (bounds 1508.00 2008.00)
+  (visible rect 25.00, 200.00 785.00 x 585.00)
   (children 1
     (GraphicsLayer
       (bounds 1508.00 2008.00)
       (contentsOpaque 1)
+      (visible rect 25.00, 200.00 785.00 x 585.00)
       (children 1
         (GraphicsLayer
           (position 8.00 0.00)
           (bounds 200.00 500.00)
           (contentsOpaque 1)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+          (visible rect 17.00, 200.00 183.00 x 300.00)
         )
       )
     )
diff --git a/LayoutTests/platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt b/LayoutTests/platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants-expected.txt
deleted file mode 100644 (file)
index d9dfc92..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-This tests if changing the clipping behaviour on the parent compositing layer makes the child layer disappear.
-
-Text in the green box should stay visible.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 3
-        (GraphicsLayer
-          (position 8.00 96.00)
-          (bounds 22.00 22.00)
-          (drawsContent 1)
-          (visible rect 0.00, 0.00 22.00 x 22.00)
-          (contentsScale 1.00)
-        )
-        (GraphicsLayer
-          (position 8.00 86.00)
-          (bounds 102.00 20.00)
-          (drawsContent 1)
-          (visible rect 0.00, 0.00 102.00 x 20.00)
-          (contentsScale 1.00)
-        )
-        (GraphicsLayer
-          (position 0.00 87.00)
-          (bounds 787.00 18.00)
-          (drawsContent 1)
-          (visible rect 0.00, 0.00 787.00 x 18.00)
-          (contentsScale 1.00)
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt b/LayoutTests/platform/mac/compositing/overflow/clipping-behaviour-change-is-not-propagated-to-descendants2-expected.txt
deleted file mode 100644 (file)
index bec7e7a..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-This tests if changing the clipping behaviour on the parent compositing layer makes the child layer disappear.
-
-Text in the green box should stay visible.
-
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 3
-        (GraphicsLayer
-          (position 8.00 96.00)
-          (bounds 22.00 22.00)
-          (drawsContent 1)
-          (visible rect 0.00, 0.00 22.00 x 22.00)
-          (contentsScale 1.00)
-        )
-        (GraphicsLayer
-          (position 8.00 86.00)
-          (bounds 102.00 20.00)
-          (drawsContent 1)
-          (visible rect 0.00, 0.00 102.00 x 20.00)
-          (contentsScale 1.00)
-        )
-        (GraphicsLayer
-          (position 9.00 87.00)
-          (bounds 778.00 18.00)
-          (drawsContent 1)
-          (visible rect 0.00, 0.00 778.00 x 18.00)
-          (contentsScale 1.00)
-        )
-      )
-    )
-  )
-)
-
index f77e0fc..3b19f34 100644 (file)
@@ -1,26 +1,22 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
   (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
       (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
       (children 1
         (GraphicsLayer
           (position 58.00 50.00)
           (bounds 502.00 302.00)
           (visible rect 0.00, 0.00 502.00 x 302.00)
-          (contentsScale 1.00)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
               (bounds 500.00 300.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
               (visible rect 0.00, 0.00 500.00 x 300.00)
-              (contentsScale 1.00)
               (children 1
                 (GraphicsLayer
                   (position -1250.00 0.00)
                   (drawsContent 1)
                   (transform [0.17 0.00 -0.98 0.00] [0.00 1.00 0.00 0.00] [0.98 0.00 0.17 0.00] [0.00 0.00 0.00 1.00])
                   (visible rect 0.00, 0.00 2800.00 x 300.00)
-                  (contentsScale 1.00)
-                  (tile cache coverage 0, 0 2799 x 299)
+                  (tile cache coverage 0, 0 2800 x 300)
                   (tile size 512 x 512)
-                  (top left tile 0, 0 tiles grid 5 x 1)
+                  (top left tile 0, 0 tiles grid 6 x 1)
                 )
               )
             )
index 55e6b84..da9a664 100644 (file)
@@ -1,32 +1,27 @@
 (GraphicsLayer
   (bounds 800.00 600.00)
   (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
   (children 1
     (GraphicsLayer
       (bounds 800.00 600.00)
       (contentsOpaque 1)
       (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
       (children 1
         (GraphicsLayer
           (position 58.00 50.00)
           (bounds 502.00 302.00)
           (visible rect 0.00, 0.00 502.00 x 302.00)
-          (contentsScale 1.00)
           (children 1
             (GraphicsLayer
               (position 1.00 1.00)
               (bounds 500.00 300.00)
               (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
               (visible rect 0.00, 0.00 500.00 x 300.00)
-              (contentsScale 1.00)
               (children 1
                 (GraphicsLayer
                   (bounds 500.00 0.00)
                   (preserves3D 1)
                   (visible rect 0.00, 0.00 0.00 x 0.00)
-                  (contentsScale 1.00)
                   (children 1
                     (GraphicsLayer
                       (position -1250.00 0.00)
                       (drawsContent 1)
                       (transform [0.17 0.00 -0.98 0.00] [0.00 1.00 0.00 0.00] [0.98 0.00 0.17 0.00] [0.00 0.00 0.00 1.00])
                       (visible rect 0.00, 0.00 2800.00 x 300.00)
-                      (contentsScale 1.00)
-                      (tile cache coverage 0, 0 2799 x 299)
+                      (tile cache coverage 0, 0 2800 x 300)
                       (tile size 512 x 512)
-                      (top left tile 0, 0 tiles grid 5 x 1)
+                      (top left tile 0, 0 tiles grid 6 x 1)
                     )
                   )
                 )
index 9858d06..89e6502 100644 (file)
@@ -1,7 +1,6 @@
 (GraphicsLayer
   (bounds 1932.00 4150.00)
   (visible rect 0.00, 0.00 785.00 x 585.00)
-  (contentsScale 1.00)
   (children 1
     (GraphicsLayer
       (anchor 0.00 0.00)
@@ -9,7 +8,6 @@
       (contentsOpaque 1)
       (transform [1.60 0.00 0.00 0.00] [0.00 1.60 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
       (visible rect 0.00, 0.00 490.63 x 365.63)
-      (contentsScale 2.56)
       (children 1
         (GraphicsLayer
           (position 8.00 8.00)
@@ -17,7 +15,6 @@
           (contentsOpaque 1)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
           (visible rect 0.00, 0.00 482.63 x 357.63)
-          (contentsScale 2.56)
         )
       )
     )
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/2d-transformed-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/2d-transformed-expected.txt
deleted file mode 100644 (file)
index 5e80311..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 502.00 202.00)
-          (visible rect 0.00, 0.00 502.00 x 202.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 1.00 1.00)
-              (bounds 500.00 200.00)
-              (visible rect 0.00, 0.00 500.00 x 200.00)
-              (contentsScale 1.00)
-              (children 3
-                (GraphicsLayer
-                  (bounds 200.00 200.00)
-                  (contentsOpaque 1)
-                  (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00])
-                  (visible rect 100.00, 0.00 100.00 x 200.00)
-                  (contentsScale 1.00)
-                )
-                (GraphicsLayer
-                  (bounds 200.00 200.00)
-                  (contentsOpaque 1)
-                  (transform [0.71 0.71 0.00 0.00] [-0.71 0.71 0.00 0.00] [0.00 0.00 1.00 0.00] [150.00 0.00 0.00 1.00])
-                  (visible rect 0.00, 0.00 200.00 x 200.00)
-                  (contentsScale 1.00)
-                )
-                (GraphicsLayer
-                  (bounds 200.00 200.00)
-                  (contentsOpaque 1)
-                  (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [400.00 0.00 0.00 1.00])
-                  (visible rect 0.00, 0.00 100.00 x 200.00)
-                  (contentsScale 1.00)
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/3d-transform-style-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/3d-transform-style-expected.txt
deleted file mode 100644 (file)
index 4dae9d2..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 2
-        (GraphicsLayer
-          (position 18.00 10.00)
-          (bounds 204.00 204.00)
-          (visible rect 0.00, 0.00 204.00 x 204.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (bounds 200.00 200.00)
-              (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00])
-              (visible rect 0.00, 0.00 200.00 x 200.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 200.00 0.00)
-                  (preserves3D 1)
-                  (visible rect 0.00, 0.00 0.00 x 0.00)
-                  (contentsScale 1.00)
-                  (children 1
-                    (GraphicsLayer
-                      (bounds 300.00 300.00)
-                      (contentsOpaque 1)
-                      (transform [1.00 0.00 0.00 0.00] [0.00 0.91 0.42 0.00] [0.00 -0.42 0.91 0.00] [0.00 0.00 0.00 1.00])
-                      (visible rect 0.00, 0.00 213.67 x 200.68)
-                      (contentsScale 0.93)
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 18.00 224.00)
-          (bounds 204.00 204.00)
-          (visible rect 0.00, 0.00 204.00 x 204.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (bounds 200.00 200.00)
-              (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00])
-              (visible rect 0.00, 0.00 200.00 x 200.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 200.00 0.00)
-                  (preserves3D 1)
-                  (visible rect 0.00, 0.00 0.00 x 0.00)
-                  (contentsScale 1.00)
-                  (children 1
-                    (GraphicsLayer
-                      (bounds 300.00 300.00)
-                      (contentsOpaque 1)
-                      (transform [0.91 0.00 0.42 0.00] [0.00 1.00 0.00 0.00] [-0.42 0.00 0.91 0.00] [0.00 0.00 0.00 1.00])
-                      (visible rect 0.00, 0.00 200.68 x 213.67)
-                      (contentsScale 0.92)
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/3d-transformed-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/3d-transformed-expected.txt
deleted file mode 100644 (file)
index 00a7de4..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 2
-        (GraphicsLayer
-          (position 18.00 10.00)
-          (bounds 204.00 204.00)
-          (visible rect 0.00, 0.00 204.00 x 204.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (bounds 200.00 200.00)
-              (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00])
-              (visible rect 0.00, 0.00 200.00 x 200.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (anchor 0.20 0.20)
-                  (bounds 500.00 500.00)
-                  (contentsOpaque 1)
-                  (transform [1.00 0.00 0.00 0.00] [0.00 0.71 0.71 0.00] [0.00 -0.71 0.71 0.00] [0.00 0.00 0.00 1.00])
-                  (visible rect 0.00, 0.00 220.62 x 218.46)
-                  (contentsScale 0.92)
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 18.00 224.00)
-          (bounds 204.00 204.00)
-          (visible rect 0.00, 0.00 204.00 x 204.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (bounds 200.00 200.00)
-              (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.07 0.07 1.00 -0.00] [0.00 0.00 0.00 1.00])
-              (visible rect 0.00, 0.00 200.00 x 200.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (anchor 0.20 0.20)
-                  (bounds 500.00 500.00)
-                  (contentsOpaque 1)
-                  (transform [0.71 0.00 0.71 0.00] [0.00 1.00 0.00 0.00] [-0.71 0.00 0.71 0.00] [0.00 0.00 0.00 1.00])
-                  (visible rect 0.00, 0.00 218.46 x 220.62)
-                  (contentsScale 0.91)
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/animated-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/animated-expected.txt
deleted file mode 100644 (file)
index 5af90a0..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 502.00 202.00)
-          (visible rect 0.00, 0.00 502.00 x 202.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 1.00 1.00)
-              (bounds 500.00 200.00)
-              (visible rect 0.00, 0.00 500.00 x 200.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 200.00 200.00)
-                  (contentsOpaque 1)
-                  (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [-100.00 0.00 0.00 1.00])
-                  (visible rect 100.00, 0.00 100.00 x 200.00)
-                  (contentsScale 1.00)
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/animated-from-none-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/animated-from-none-expected.txt
deleted file mode 100644 (file)
index 73b99cd..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 502.00 202.00)
-          (visible rect 0.00, 0.00 502.00 x 202.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 1.00 1.00)
-              (bounds 500.00 200.00)
-              (visible rect 0.00, 0.00 500.00 x 200.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (position -100.00 0.00)
-                  (bounds 200.00 200.00)
-                  (contentsOpaque 1)
-                  (visible rect 100.00, 0.00 100.00 x 200.00)
-                  (contentsScale 1.00)
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/clipped-by-viewport-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/clipped-by-viewport-expected.txt
deleted file mode 100644 (file)
index 1b86d5d..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 2
-        (GraphicsLayer
-          (position -100.00 -120.00)
-          (bounds 200.00 200.00)
-          (contentsOpaque 1)
-          (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
-          (visible rect 100.00, 120.00 100.00 x 80.00)
-          (contentsScale 1.00)
-        )
-        (GraphicsLayer
-          (position -100.00 200.00)
-          (bounds 200.00 200.00)
-          (contentsOpaque 1)
-          (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
-          (visible rect 100.00, 0.00 100.00 x 200.00)
-          (contentsScale 1.00)
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/clipped-visible-rect-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/clipped-visible-rect-expected.txt
deleted file mode 100644 (file)
index b7141cc..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (visible rect 0.00, 0.00 800.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 800.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 502.00 202.00)
-          (visible rect 0.00, 0.00 502.00 x 202.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 1.00 1.00)
-              (bounds 500.00 200.00)
-              (visible rect 0.00, 0.00 500.00 x 200.00)
-              (contentsScale 1.00)
-              (children 3
-                (GraphicsLayer
-                  (position -100.00 0.00)
-                  (bounds 200.00 200.00)
-                  (contentsOpaque 1)
-                  (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
-                  (visible rect 100.00, 0.00 100.00 x 200.00)
-                  (contentsScale 1.00)
-                )
-                (GraphicsLayer
-                  (position 150.00 0.00)
-                  (bounds 200.00 200.00)
-                  (contentsOpaque 1)
-                  (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
-                  (visible rect 0.00, 0.00 200.00 x 200.00)
-                  (contentsScale 1.00)
-                )
-                (GraphicsLayer
-                  (position 400.00 0.00)
-                  (bounds 200.00 200.00)
-                  (contentsOpaque 1)
-                  (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
-                  (visible rect 0.00, 0.00 100.00 x 200.00)
-                  (contentsScale 1.00)
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/flipped-preserve-3d-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/flipped-preserve-3d-expected.txt
deleted file mode 100644 (file)
index d75b61e..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-Description
-Some text here.
-Description
-Some text here.
-Description
-Some text here.
-(GraphicsLayer
-  (bounds 785.00 615.00)
-  (visible rect 0.00, 0.00 785.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 785.00 615.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 600.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 0.00 13.00)
-          (bounds 602.00 602.00)
-          (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 -0.00] [0.00 0.00 0.00 1.00])
-          (visible rect 0.00, 0.00 602.00 x 587.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 101.00 101.00)
-              (anchor 0.57 0.50)
-              (bounds 440.00 440.00)
-              (preserves3D 1)
-              (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00])
-              (visible rect 0.00, 0.00 440.00 x 440.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 420.00 420.00)
-                  (contentsOpaque 1)
-                  (transform [-1.00 0.00 -0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 -1.00 0.00] [0.00 0.00 0.00 1.00])
-                  (visible rect 0.00, 0.00 420.00 x 420.00)
-                  (contentsScale 1.00)
-                  (children 1
-                    (GraphicsLayer
-                      (bounds 420.00 420.00)
-                      (visible rect 0.00, 0.00 420.00 x 420.00)
-                      (contentsScale 1.00)
-                      (children 1
-                        (GraphicsLayer
-                          (position 0.00 -90.00)
-                          (bounds 418.00 510.00)
-                          (contentsOpaque 1)
-                          (visible rect 0.00, 90.00 418.00 x 420.00)
-                          (contentsScale 1.00)
-                          (children 1
-                            (GraphicsLayer
-                              (bounds 418.00 510.00)
-                              (visible rect 0.00, 90.00 418.00 x 420.00)
-                              (contentsScale 1.00)
-                              (children 3
-                                (GraphicsLayer
-                                  (position -3000.00 0.00)
-                                  (anchor 0.94 0.50)
-                                  (bounds 3418.00 120.00)
-                                  (usingTiledLayer 1)
-                                  (drawsContent 1)
-                                  (visible rect 3000.00, 90.00 418.00 x 30.00)
-                                  (contentsScale 1.00)
-                                )
-                                (GraphicsLayer
-                                  (position -3000.00 120.00)
-                                  (anchor 0.94 0.50)
-                                  (bounds 3418.00 120.00)
-                                  (usingTiledLayer 1)
-                                  (drawsContent 1)
-                                  (visible rect 3000.00, 0.00 418.00 x 120.00)
-                                  (contentsScale 1.00)
-                                )
-                                (GraphicsLayer
-                                  (position -3000.00 240.00)
-                                  (anchor 0.94 0.50)
-                                  (bounds 3418.00 120.00)
-                                  (usingTiledLayer 1)
-                                  (drawsContent 1)
-                                  (visible rect 3000.00, 0.00 418.00 x 120.00)
-                                  (contentsScale 1.00)
-                                )
-                              )
-                            )
-                          )
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/iframe-and-layers-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/iframe-and-layers-expected.txt
deleted file mode 100644 (file)
index 172dfb3..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-
-(GraphicsLayer
-  (bounds 1508.00 1516.00)
-  (visible rect 0.00, 0.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 1508.00 1516.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (children 2
-        (GraphicsLayer
-          (position 10.00 10.00)
-          (bounds 360.00 210.00)
-          (drawsContent 1)
-          (visible rect 0.00, 0.00 360.00 x 210.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 30.00 30.00)
-              (visible rect 0.00, 0.00 0.00 x 0.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 285.00 135.00)
-                  (visible rect 0.00, 0.00 285.00 x 135.00)
-                  (contentsScale 1.00)
-                  (children 1
-                    (GraphicsLayer
-                      (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (contentsScale 1.00)
-                      (children 1
-                        (GraphicsLayer
-                          (bounds 1508.00 1516.00)
-                          (visible rect 0.00, 0.00 285.00 x 135.00)
-                          (contentsScale 1.00)
-                          (children 1
-                            (GraphicsLayer
-                              (bounds 1508.00 1516.00)
-                              (drawsContent 1)
-                              (visible rect 0.00, 0.00 285.00 x 135.00)
-                              (contentsScale 1.00)
-                              (children 1
-                                (GraphicsLayer
-                                  (position 8.00 8.00)
-                                  (bounds 100.00 300.00)
-                                  (contentsOpaque 1)
-                                  (drawsContent 1)
-                                  (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
-                                  (visible rect 0.00, 0.00 100.00 x 127.00)
-                                  (contentsScale 1.00)
-                                )
-                              )
-                            )
-                          )
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 8.00 226.00)
-          (bounds 200.00 200.00)
-          (contentsOpaque 1)
-          (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
-          (visible rect 0.00, 0.00 200.00 x 200.00)
-          (contentsScale 1.00)
-        )
-      )
-    )
-  )
-)
-
index 555d2b4..1f9f232 100644 (file)
@@ -2,12 +2,10 @@
 (GraphicsLayer
   (bounds 1508.00 1516.00)
   (visible rect 0.00, 0.00 285.00 x 135.00)
-  (contentsScale 1.00)
   (children 1
     (GraphicsLayer
       (bounds 1508.00 1516.00)
       (visible rect 0.00, 0.00 285.00 x 135.00)
-      (contentsScale 1.00)
       (children 1
         (GraphicsLayer
           (position 8.00 8.00)
@@ -16,7 +14,6 @@
           (drawsContent 1)
           (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
           (visible rect 0.00, 0.00 100.00 x 127.00)
-          (contentsScale 1.00)
         )
       )
     )
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/nested-transform-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/nested-transform-expected.txt
deleted file mode 100644 (file)
index 56ba47f..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-(GraphicsLayer
-  (bounds 785.00 669.00)
-  (visible rect 0.00, 0.00 785.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 785.00 669.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 600.00)
-      (contentsScale 1.00)
-      (children 2
-        (GraphicsLayer
-          (position 18.00 10.00)
-          (bounds 304.00 304.00)
-          (visible rect 0.00, 0.00 304.00 x 304.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (bounds 300.00 300.00)
-              (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.26 0.26 1.00 -0.00] [0.00 0.00 0.00 1.00])
-              (visible rect 0.00, 0.00 300.00 x 300.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 300.00 0.00)
-                  (preserves3D 1)
-                  (transform [0.94 0.00 -0.34 0.00] [0.00 1.00 0.00 0.00] [0.34 0.00 0.94 0.00] [0.00 0.00 0.00 1.00])
-                  (visible rect 0.00, 0.00 0.00 x 0.00)
-                  (contentsScale 1.21)
-                  (children 1
-                    (GraphicsLayer
-                      (bounds 300.00 0.00)
-                      (preserves3D 1)
-                      (transform [0.94 0.00 -0.34 0.00] [0.00 1.00 0.00 0.00] [0.34 0.00 0.94 0.00] [0.00 0.00 0.00 1.00])
-                      (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (contentsScale 1.44)
-                      (children 1
-                        (GraphicsLayer
-                          (bounds 500.00 500.00)
-                          (contentsOpaque 1)
-                          (transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00])
-                          (visible rect 0.00, 0.00 500.00 x 369.91)
-                          (contentsScale 1.05)
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 18.00 324.00)
-          (bounds 304.00 304.00)
-          (visible rect 0.00, 0.00 304.00 x 276.00)
-          (contentsScale 1.00)
-          (children 1
-            (GraphicsLayer
-              (position 2.00 2.00)
-              (bounds 300.00 300.00)
-              (childrenTransform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.26 0.26 1.00 -0.00] [0.00 0.00 0.00 1.00])
-              (visible rect 0.00, 0.00 300.00 x 274.00)
-              (contentsScale 1.00)
-              (children 1
-                (GraphicsLayer
-                  (bounds 300.00 0.00)
-                  (preserves3D 1)
-                  (visible rect 0.00, 0.00 0.00 x 0.00)
-                  (contentsScale 1.00)
-                  (children 1
-                    (GraphicsLayer
-                      (bounds 300.00 0.00)
-                      (preserves3D 1)
-                      (transform [0.77 0.00 -0.64 0.00] [0.00 1.00 0.00 0.00] [0.64 0.00 0.77 0.00] [0.00 0.00 0.00 1.00])
-                      (visible rect 0.00, 0.00 0.00 x 0.00)
-                      (contentsScale 1.64)
-                      (children 1
-                        (GraphicsLayer
-                          (bounds 500.00 500.00)
-                          (contentsOpaque 1)
-                          (transform [1.00 0.00 0.00 0.00] [0.00 0.82 0.57 0.00] [0.00 -0.57 0.82 0.00] [0.00 0.00 0.00 1.00])
-                          (visible rect 0.00, 0.00 500.00 x 351.87)
-                          (contentsScale 1.20)
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac/compositing/visible-rect/scrolled-expected.txt b/LayoutTests/platform/mac/compositing/visible-rect/scrolled-expected.txt
deleted file mode 100644 (file)
index c08bf1c..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-(GraphicsLayer
-  (bounds 1508.00 2008.00)
-  (visible rect 25.00, 200.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 1508.00 2008.00)
-      (contentsOpaque 1)
-      (visible rect 25.00, 200.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 0.00)
-          (bounds 200.00 500.00)
-          (contentsOpaque 1)
-          (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
-          (visible rect 17.00, 200.00 183.00 x 300.00)
-          (contentsScale 1.00)
-        )
-      )
-    )
-  )
-)
-
index 487a365..8a11994 100644 (file)
@@ -1,3 +1,28 @@
+2013-09-17  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r155977.
+        http://trac.webkit.org/changeset/155977
+        https://bugs.webkit.org/show_bug.cgi?id=121515
+
+        Broke over a dozen tests on Mac WK2 (Requested by ap on
+        #webkit).
+
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::GraphicsLayerCA):
+        (WebCore::GraphicsLayerCA::flushCompositingState):
+        (WebCore::GraphicsLayerCA::computeVisibleRect):
+        (WebCore::GraphicsLayerCA::recursiveCommitChanges):
+        (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers):
+        (WebCore::GraphicsLayerCA::updateAnimations):
+        (WebCore::GraphicsLayerCA::setAnimationOnLayer):
+        (WebCore::GraphicsLayerCA::appendToUncommittedAnimations):
+        (WebCore::GraphicsLayerCA::setTransformAnimationEndpoints):
+        (WebCore::GraphicsLayerCA::setTransformAnimationKeyframes):
+        (WebCore::GraphicsLayerCA::updateContentsScale):
+        (WebCore::GraphicsLayerCA::dumpAdditionalProperties):
+        * platform/graphics/ca/GraphicsLayerCA.h:
+        (WebCore::GraphicsLayerCA::LayerPropertyAnimation::LayerPropertyAnimation):
+
 2013-09-17  Eric Carlson  <eric.carlson@apple.com>
 
         MediaStream API: Changing the device enumeration to be async
index 32c6a3c..b063bee 100644 (file)
@@ -250,16 +250,6 @@ static bool animationHasStepsTimingFunction(const KeyframeValueList& valueList,
     return false;
 }
 
-static float maxScaleFromTransform(const TransformationMatrix& t)
-{
-    if (t.isIdentityOrTranslation())
-        return 1;
-
-    TransformationMatrix::DecomposedType decomposeData;
-    t.decompose(decomposeData);
-    return std::max(fabsf(decomposeData.scaleX), fabsf(decomposeData.scaleY));
-}
-
 #if ENABLE(CSS_FILTERS) || !ASSERT_DISABLED
 static inline bool supportsAcceleratedFilterAnimations()
 {
@@ -285,7 +275,6 @@ GraphicsLayerCA::GraphicsLayerCA(GraphicsLayerClient* client)
     , m_contentsLayerPurpose(NoContentsLayer)
     , m_allowTiledLayer(true)
     , m_isPageTiledBackingLayer(false)
-    , m_rootRelativeScaleFactor(1)
     , m_uncommittedChanges(0)
 {
     PlatformCALayer::LayerType layerType = PlatformCALayer::LayerTypeWebLayer;
@@ -917,8 +906,7 @@ FloatPoint GraphicsLayerCA::computePositionRelativeToBase(float& pageScale) cons
 void GraphicsLayerCA::flushCompositingState(const FloatRect& clipRect)
 {
     TransformState state(TransformState::UnapplyInverseTransformDirection, FloatQuad(clipRect));
-    TransformationMatrix rootRelativeTransform;
-    recursiveCommitChanges(CommitState(), state, rootRelativeTransform);
+    recursiveCommitChanges(CommitState(), state);
 }
 
 void GraphicsLayerCA::flushCompositingStateForThisLayerOnly()
@@ -986,19 +974,28 @@ TiledBacking* GraphicsLayerCA::tiledBacking() const
     return m_layer->tiledBacking();
 }
 
-TransformationMatrix GraphicsLayerCA::layerTransform(const FloatPoint& position, const TransformationMatrix* customTransform) const
+FloatRect GraphicsLayerCA::computeVisibleRect(TransformState& state, ComputeVisibleRectFlags flags) const
 {
-    TransformationMatrix transform;
-    transform.translate(position.x(), position.y());
+    bool preserve3D = preserves3D() || (parent() ? parent()->preserves3D() : false);
+    TransformState::TransformAccumulation accumulation = preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform;
+
+    TransformationMatrix layerTransform;
+    FloatPoint position = m_position;
+    if (client())
+        client()->customPositionForVisibleRectComputation(this, position);
+
+    layerTransform.translate(position.x(), position.y());
 
-    TransformationMatrix currentTransform = customTransform ? *customTransform : m_transform;
+    TransformationMatrix currentTransform;
+    if (!(flags & RespectAnimatingTransforms) || !client() || !client()->getCurrentTransform(this, currentTransform))
+        currentTransform = m_transform;
     
     if (!currentTransform.isIdentity()) {
         FloatPoint3D absoluteAnchorPoint(anchorPoint());
         absoluteAnchorPoint.scale(size().width(), size().height(), 1);
-        transform.translate3d(absoluteAnchorPoint.x(), absoluteAnchorPoint.y(), absoluteAnchorPoint.z());
-        transform.multiply(currentTransform);
-        transform.translate3d(-absoluteAnchorPoint.x(), -absoluteAnchorPoint.y(), -absoluteAnchorPoint.z());
+        layerTransform.translate3d(absoluteAnchorPoint.x(), absoluteAnchorPoint.y(), absoluteAnchorPoint.z());
+        layerTransform.multiply(currentTransform);
+        layerTransform.translate3d(-absoluteAnchorPoint.x(), -absoluteAnchorPoint.y(), -absoluteAnchorPoint.z());
     }
 
     if (GraphicsLayer* parentLayer = parent()) {
@@ -1006,34 +1003,15 @@ TransformationMatrix GraphicsLayerCA::layerTransform(const FloatPoint& position,
             FloatPoint3D parentAnchorPoint(parentLayer->anchorPoint());
             parentAnchorPoint.scale(parentLayer->size().width(), parentLayer->size().height(), 1);
 
-            transform.translateRight3d(-parentAnchorPoint.x(), -parentAnchorPoint.y(), -parentAnchorPoint.z());
-            transform = parentLayer->childrenTransform() * transform;
-            transform.translateRight3d(parentAnchorPoint.x(), parentAnchorPoint.y(), parentAnchorPoint.z());
+            layerTransform.translateRight3d(-parentAnchorPoint.x(), -parentAnchorPoint.y(), -parentAnchorPoint.z());
+            layerTransform = parentLayer->childrenTransform() * layerTransform;
+            layerTransform.translateRight3d(parentAnchorPoint.x(), parentAnchorPoint.y(), parentAnchorPoint.z());
         }
     }
-    
-    return transform;
-}
-
-FloatRect GraphicsLayerCA::computeVisibleRect(TransformState& state, ComputeVisibleRectFlags flags) const
-{
-    bool preserve3D = preserves3D() || (parent() ? parent()->preserves3D() : false);
-    TransformState::TransformAccumulation accumulation = preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform;
-
-    FloatPoint position = m_position;
-    if (client())
-        client()->customPositionForVisibleRectComputation(this, position);
-
-    TransformationMatrix layerTransform;
-    TransformationMatrix currentTransform;
-    if ((flags & RespectAnimatingTransforms) && client() && client()->getCurrentTransform(this, currentTransform))
-        layerTransform = this->layerTransform(position, &currentTransform);
-    else
-        layerTransform = this->layerTransform(position);
 
     bool applyWasClamped;
     state.applyTransform(layerTransform, accumulation, &applyWasClamped);
-
+    
     bool mapWasClamped;
     FloatRect clipRectForChildren = state.mappedQuad(&mapWasClamped).boundingBox();
     FloatPoint boundsOrigin = m_boundsOrigin;
@@ -1052,31 +1030,7 @@ FloatRect GraphicsLayerCA::computeVisibleRect(TransformState& state, ComputeVisi
     return clipRectForSelf;
 }
 
-void GraphicsLayerCA::updateRootRelativeScale(TransformationMatrix* transformFromRoot)
-{
-    if (!transformFromRoot)
-        return;
-
-    float rootRelativeScaleFactor;
-    TransformationMatrix maxScaleImpactTransform;
-    bool haveTransformAnimation = getTransformFromAnimationsWithMaxScaleImpact(*transformFromRoot, maxScaleImpactTransform, rootRelativeScaleFactor);
-    if (haveTransformAnimation)
-        transformFromRoot->multiply(maxScaleImpactTransform);
-    else {
-        TransformationMatrix unanimatedTransform = this->layerTransform(m_position);
-        transformFromRoot->multiply(unanimatedTransform);
-        rootRelativeScaleFactor = maxScaleFromTransform(*transformFromRoot);
-    }
-    
-    if (rootRelativeScaleFactor != m_rootRelativeScaleFactor) {
-        m_rootRelativeScaleFactor = rootRelativeScaleFactor;
-        m_uncommittedChanges |= ContentsScaleChanged;
-    }
-}
-
-// rootRelativeTransformForScaling is a transform from the root, but for layers with transform animations, it cherry-picked the state of the
-// animation that contributes maximally to the scale (on every layer with animations down the hierarchy).
-void GraphicsLayerCA::recursiveCommitChanges(const CommitState& commitState, const TransformState& state, const TransformationMatrix& rootRelativeTransformForScaling, float pageScaleFactor, const FloatPoint& positionRelativeToBase, bool affectedByPageScale)
+void GraphicsLayerCA::recursiveCommitChanges(const CommitState& commitState, const TransformState& state, float pageScaleFactor, const FloatPoint& positionRelativeToBase, bool affectedByPageScale)
 {
     TransformState localState = state;
     CommitState childCommitState = commitState;
@@ -1122,8 +1076,7 @@ void GraphicsLayerCA::recursiveCommitChanges(const CommitState& commitState, con
     if (affectedByPageScale)
         baseRelativePosition += m_position;
     
-    TransformationMatrix transformFromRoot = rootRelativeTransformForScaling;
-    commitLayerChangesBeforeSublayers(childCommitState, pageScaleFactor, baseRelativePosition, oldVisibleRect, &transformFromRoot);
+    commitLayerChangesBeforeSublayers(childCommitState, pageScaleFactor, baseRelativePosition, oldVisibleRect);
 
     if (isRunningTransformAnimation()) {
         childCommitState.ancestorHasTransformAnimation = true;
@@ -1140,11 +1093,11 @@ void GraphicsLayerCA::recursiveCommitChanges(const CommitState& commitState, con
     
     for (size_t i = 0; i < numChildren; ++i) {
         GraphicsLayerCA* curChild = static_cast<GraphicsLayerCA*>(childLayers[i]);
-        curChild->recursiveCommitChanges(childCommitState, localState, transformFromRoot, pageScaleFactor, baseRelativePosition, affectedByPageScale);
+        curChild->recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
     }
 
     if (m_replicaLayer)
-        static_cast<GraphicsLayerCA*>(m_replicaLayer)->recursiveCommitChanges(childCommitState, localState, transformFromRoot, pageScaleFactor, baseRelativePosition, affectedByPageScale);
+        static_cast<GraphicsLayerCA*>(m_replicaLayer)->recursiveCommitChanges(childCommitState, localState, pageScaleFactor, baseRelativePosition, affectedByPageScale);
 
     if (m_maskLayer)
         static_cast<GraphicsLayerCA*>(m_maskLayer)->commitLayerChangesAfterSublayers(childCommitState);
@@ -1188,7 +1141,7 @@ float GraphicsLayerCA::platformCALayerDeviceScaleFactor()
     return deviceScaleFactor();
 }
 
-void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect, TransformationMatrix* transformFromRoot)
+void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect)
 {
     ++commitState.treeDepth;
     if (m_structuralLayer)
@@ -1262,9 +1215,6 @@ void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState
     if (m_uncommittedChanges & AnimationChanged)
         updateAnimations();
 
-    // After committing animations, see if we need to adjust contentsScale accordingly.
-    updateRootRelativeScale(transformFromRoot);
-
     // Updating the contents scale can cause parts of the layer to be invalidated,
     // so make sure to update the contents scale before updating the dirty rects.
     if (m_uncommittedChanges & ContentsScaleChanged)
@@ -1975,8 +1925,6 @@ PassRefPtr<PlatformCALayer> GraphicsLayerCA::replicatedLayerRoot(ReplicaState& r
 
 void GraphicsLayerCA::updateAnimations()
 {
-    HashSet<String> finishedAnimations;
-
     if (m_animationsToProcess.size()) {
         AnimationsToProcessMap::const_iterator end = m_animationsToProcess.end();
         for (AnimationsToProcessMap::const_iterator it = m_animationsToProcess.begin(); it != end; ++it) {
@@ -1999,10 +1947,8 @@ void GraphicsLayerCA::updateAnimations()
                 }
             }
 
-            if (processingInfo.action == Remove) {
+            if (processingInfo.action == Remove)
                 m_runningAnimations.remove(currAnimationName);
-                finishedAnimations.add(currAnimationName);
-            }
         }
     
         m_animationsToProcess.clear();
@@ -2019,20 +1965,14 @@ void GraphicsLayerCA::updateAnimations()
                 Vector<LayerPropertyAnimation> animations;
                 animations.append(pendingAnimation);
                 m_runningAnimations.add(pendingAnimation.m_name, animations);
-
             } else {
                 Vector<LayerPropertyAnimation>& animations = it->value;
                 animations.append(pendingAnimation);
             }
-
-            finishedAnimations.remove(pendingAnimation.m_name);
         }
+        
         m_uncomittedAnimations.clear();
     }
-    
-    HashSet<String>::const_iterator end = finishedAnimations.end();
-    for (HashSet<String>::const_iterator it = finishedAnimations.begin(); it != end; ++it)
-        m_animationTransforms.remove(*it);
 }
 
 bool GraphicsLayerCA::isRunningTransformAnimation() const
@@ -2053,7 +1993,7 @@ bool GraphicsLayerCA::isRunningTransformAnimation() const
 void GraphicsLayerCA::setAnimationOnLayer(PlatformCAAnimation* caAnim, AnimatedPropertyID property, const String& animationName, int index, int subIndex, double timeOffset)
 {
     PlatformCALayer* layer = animatedLayer(property);
-
+    
     if (timeOffset)
         caAnim->setBeginTime(CACurrentMediaTime() - timeOffset);
 
@@ -2196,64 +2136,22 @@ bool GraphicsLayerCA::appendToUncommittedAnimations(const KeyframeValueList& val
     bool isKeyframe = valueList.size() > 2;
 
     RefPtr<PlatformCAAnimation> caAnimation;
-    Vector<TransformationMatrix> matrices;
     bool validMatrices = true;
     if (isKeyframe) {
         caAnimation = createKeyframeAnimation(animation, propertyIdToString(valueList.property()), additive);
-        validMatrices = setTransformAnimationKeyframes(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize, matrices);
+        validMatrices = setTransformAnimationKeyframes(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize);
     } else {
         caAnimation = createBasicAnimation(animation, propertyIdToString(valueList.property()), additive);
-        validMatrices = setTransformAnimationEndpoints(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize, matrices);
+        validMatrices = setTransformAnimationEndpoints(valueList, animation, caAnimation.get(), animationIndex, transformOp, isMatrixAnimation, boxSize);
     }
     
     if (!validMatrices)
         return false;
 
-    m_animationTransforms.set(animationName, matrices);
-
     m_uncomittedAnimations.append(LayerPropertyAnimation(caAnimation, animationName, valueList.property(), animationIndex, 0, timeOffset));
     return true;
 }
 
-bool GraphicsLayerCA::getTransformFromAnimationsWithMaxScaleImpact(const TransformationMatrix& parentTransformFromRoot, TransformationMatrix& maxScaleTransform, float& maxScale) const
-{
-    maxScale = 1;
-    
-    bool haveTransformAnimation = false;
-    AnimationsMap::const_iterator end = m_runningAnimations.end();
-    for (AnimationsMap::const_iterator it = m_runningAnimations.begin(); it != end; ++it) {
-        const Vector<LayerPropertyAnimation>& propertyAnimations = it->value;
-        size_t numAnimations = propertyAnimations.size();
-        for (size_t i = 0; i < numAnimations; ++i) {
-            const LayerPropertyAnimation& animation = propertyAnimations[i];
-            if (animation.m_property != AnimatedPropertyWebkitTransform)
-                continue;
-
-            haveTransformAnimation = true;
-
-            TransformsMap::const_iterator it = m_animationTransforms.find(animation.m_name);
-            if (it != m_animationTransforms.end()) {
-                const Vector<TransformationMatrix>& matrices = it->value;
-                
-                for (size_t i = 0; i < matrices.size(); ++i) {
-                    TransformationMatrix roootRelativeTransformWithAnimation = parentTransformFromRoot;
-                    TransformationMatrix layerTransformWithAnimation = layerTransform(m_position, &matrices[i]);
-
-                    roootRelativeTransformWithAnimation.multiply(layerTransformWithAnimation);
-                    
-                    float rootRelativeScale = maxScaleFromTransform(roootRelativeTransformWithAnimation);
-                    if (rootRelativeScale > maxScale) {
-                        maxScale = rootRelativeScale;
-                        maxScaleTransform = matrices[i];
-                    }
-                }
-            }
-        }
-    }
-    
-    return haveTransformAnimation;
-}
-
 bool GraphicsLayerCA::createTransformAnimationsFromKeyframes(const KeyframeValueList& valueList, const Animation* animation, const String& animationName, double timeOffset, const IntSize& boxSize)
 {
     ASSERT(valueList.property() == AnimatedPropertyWebkitTransform);
@@ -2494,7 +2392,7 @@ bool GraphicsLayerCA::setAnimationKeyframes(const KeyframeValueList& valueList,
     return true;
 }
 
-bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* basicAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize, Vector<TransformationMatrix>& matrixes)
+bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* basicAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize)
 {
     ASSERT(valueList.size() == 2);
 
@@ -2505,16 +2403,18 @@ bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& va
     
     const TransformAnimationValue& startValue = static_cast<const TransformAnimationValue&>(valueList.at(fromIndex));
     const TransformAnimationValue& endValue = static_cast<const TransformAnimationValue&>(valueList.at(toIndex));
-
-    TransformationMatrix fromTransform, toTransform;
     
     if (isMatrixAnimation) {
+        TransformationMatrix fromTransform, toTransform;
         startValue.value().apply(boxSize, fromTransform);
         endValue.value().apply(boxSize, toTransform);
 
         // If any matrix is singular, CA won't animate it correctly. So fall back to software animation
         if (!fromTransform.isInvertible() || !toTransform.isInvertible())
             return false;
+            
+        basicAnim->setFromValue(fromTransform);
+        basicAnim->setToValue(toTransform);
     } else {
         if (isTransformTypeNumber(transformOpType)) {
             float fromValue;
@@ -2541,12 +2441,7 @@ bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& va
             getTransformFunctionValue(endValue.value().at(functionIndex), transformOpType, boxSize, toValue);
             basicAnim->setToValue(toValue);
         }
-
-        startValue.value().apply(boxSize, fromTransform);
-        endValue.value().apply(boxSize, toTransform);
     }
-    matrixes.append(fromTransform);
-    matrixes.append(toTransform);
 
     // This codepath is used for 2-keyframe animations, so we still need to look in the start
     // for a timing function. Even in the reversing animation case, the first keyframe provides the timing function.
@@ -2560,7 +2455,7 @@ bool GraphicsLayerCA::setTransformAnimationEndpoints(const KeyframeValueList& va
     return true;
 }
 
-bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* keyframeAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize, Vector<TransformationMatrix>& matrixes)
+bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& valueList, const Animation* animation, PlatformCAAnimation* keyframeAnim, int functionIndex, TransformOperation::OperationType transformOpType, bool isMatrixAnimation, const IntSize& boxSize)
 {
     Vector<float> keyTimes;
     Vector<float> floatValues;
@@ -2575,9 +2470,8 @@ bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& va
         const TransformAnimationValue& curValue = static_cast<const TransformAnimationValue&>(valueList.at(index));
         keyTimes.append(forwards ? curValue.keyTime() : (1 - curValue.keyTime()));
 
-        TransformationMatrix transform;
-
         if (isMatrixAnimation) {
+            TransformationMatrix transform;
             curValue.value().apply(boxSize, transform);
 
             // If any matrix is singular, CA won't animate it correctly. So fall back to software animation
@@ -2600,12 +2494,8 @@ bool GraphicsLayerCA::setTransformAnimationKeyframes(const KeyframeValueList& va
                 getTransformFunctionValue(transformOp, transformOpType, boxSize, value);
                 transformationMatrixValues.append(value);
             }
-
-            curValue.value().apply(boxSize, transform);
         }
 
-        matrixes.append(transform);
-
         if (i < (valueList.size() - 1))
             timingFunctions.append(timingFunctionForAnimationValue(forwards ? curValue : valueList.at(index - 1), *animation));
     }
@@ -2765,7 +2655,8 @@ static float clampedContentsScaleForScale(float scale)
 
 void GraphicsLayerCA::updateContentsScale(float pageScaleFactor)
 {
-    float contentsScale = clampedContentsScaleForScale(m_rootRelativeScaleFactor * pageScaleFactor * deviceScaleFactor());
+    float contentsScale = clampedContentsScaleForScale(pageScaleFactor * deviceScaleFactor());
+    
     m_layer->setContentsScale(contentsScale);
     if (drawsContent())
         m_layer->setNeedsDisplay();
@@ -2813,9 +2704,6 @@ void GraphicsLayerCA::dumpAdditionalProperties(TextStream& textStream, int inden
     if (behavior & LayerTreeAsTextIncludeVisibleRects) {
         writeIndent(textStream, indent + 1);
         textStream << "(visible rect " << m_visibleRect.x() << ", " << m_visibleRect.y() << " " << m_visibleRect.width() << " x " << m_visibleRect.height() << ")\n";
-
-        writeIndent(textStream, indent + 1);
-        textStream << "(contentsScale " << m_layer->contentsScale() << ")\n";
     }
 
     if (tiledBacking() && (behavior & LayerTreeAsTextIncludeTileCaches)) {
index 4aaa145..958eff1 100644 (file)
@@ -140,7 +140,7 @@ public:
             , treeDepth(0)
         { }
     };
-    void recursiveCommitChanges(const CommitState&, const TransformState&, const TransformationMatrix& rootRelativeTransformForScaling, float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false);
+    void recursiveCommitChanges(const CommitState&, const TransformState&, float pageScaleFactor = 1, const FloatPoint& positionRelativeToBase = FloatPoint(), bool affectedByPageScale = false);
 
     virtual void flushCompositingState(const FloatRect&);
     virtual void flushCompositingStateForThisLayerOnly();
@@ -213,8 +213,8 @@ private:
     bool setAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*);
     bool setAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*);
 
-    bool setTransformAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize, Vector<TransformationMatrix>& matrixes);
-    bool setTransformAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize, Vector<TransformationMatrix>& matrixes);
+    bool setTransformAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize);
+    bool setTransformAnimationKeyframes(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, TransformOperation::OperationType, bool isMatrixAnimation, const IntSize& boxSize);
     
 #if ENABLE(CSS_FILTERS)
     bool setFilterAnimationEndpoints(const KeyframeValueList&, const Animation*, PlatformCAAnimation*, int functionIndex, int internalFilterPropertyIndex);
@@ -228,7 +228,7 @@ private:
         return m_runningAnimations.find(animationName) != m_runningAnimations.end();
     }
 
-    void commitLayerChangesBeforeSublayers(CommitState&, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect, TransformationMatrix* transformFromRoot = 0);
+    void commitLayerChangesBeforeSublayers(CommitState&, float pageScaleFactor, const FloatPoint& positionRelativeToBase, const FloatRect& oldVisibleRect);
     void commitLayerChangesAfterSublayers(CommitState&);
 
     FloatPoint computePositionRelativeToBase(float& pageScale) const;
@@ -248,10 +248,6 @@ private:
 
     void computePixelAlignment(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase,
         FloatPoint& position, FloatSize&, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset) const;
-
-    TransformationMatrix layerTransform(const FloatPoint& position, const TransformationMatrix* customTransform = 0) const;
-    void updateRootRelativeScale(TransformationMatrix* transformFromRoot);
-
     enum ComputeVisibleRectFlag { RespectAnimatingTransforms = 1 << 0 };
     typedef unsigned ComputeVisibleRectFlags;
     FloatRect computeVisibleRect(TransformState&, ComputeVisibleRectFlags = RespectAnimatingTransforms) const;
@@ -377,9 +373,6 @@ private:
 #if ENABLE(CSS_FILTERS)
     bool appendToUncommittedAnimations(const KeyframeValueList&, const FilterOperation*, const Animation*, const String& animationName, int animationIndex, double timeOffset);
 #endif
-
-    // Returns true if any transform animations are running.
-    bool getTransformFromAnimationsWithMaxScaleImpact(const TransformationMatrix& parentTransformFromRoot, TransformationMatrix&, float& maxScale) const;
     
     enum LayerChange {
         NoChange = 0,
@@ -449,8 +442,6 @@ private:
     bool m_allowTiledLayer : 1;
     bool m_isPageTiledBackingLayer : 1;
     
-    float m_rootRelativeScaleFactor;
-    
     Color m_contentsSolidColor;
 
     RetainPtr<CGImageRef> m_uncorrectedContentsImage;
@@ -460,12 +451,12 @@ private:
     // a single transition or keyframe animation, so index is used to distinguish these.
     struct LayerPropertyAnimation {
         LayerPropertyAnimation(PassRefPtr<PlatformCAAnimation> caAnimation, const String& animationName, AnimatedPropertyID property, int index, int subIndex, double timeOffset)
-            : m_animation(caAnimation)
-            , m_name(animationName)
-            , m_property(property)
-            , m_index(index)
-            , m_subIndex(subIndex)
-            , m_timeOffset(timeOffset)
+        : m_animation(caAnimation)
+        , m_name(animationName)
+        , m_property(property)
+        , m_index(index)
+        , m_subIndex(subIndex)
+        , m_timeOffset(timeOffset)
         { }
 
         RefPtr<PlatformCAAnimation> m_animation;
@@ -496,11 +487,6 @@ private:
     typedef HashMap<String, Vector<LayerPropertyAnimation> > AnimationsMap;
     AnimationsMap m_runningAnimations;
 
-    // Map from animation key to TransformationMatrices for animations of transform. The vector contains a matrix for
-    // the two endpoints, or each keyframe. Used for contentsScale adjustment.
-    typedef HashMap<String, Vector<TransformationMatrix> > TransformsMap;
-    TransformsMap m_animationTransforms;
-
     Vector<FloatRect> m_dirtyRects;
     FloatSize m_pixelAlignmentOffset;