2010-05-12 Simon Fraser <simon.fraser@apple.com>
authorsimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 May 2010 05:28:58 +0000 (05:28 +0000)
committersimon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 May 2010 05:28:58 +0000 (05:28 +0000)
        Reviewed by Mark Rowe.

        Fix layer dump to avoid spurious platform differences
        https://bugs.webkit.org/show_bug.cgi?id=39045

        Only dump the children transform on layers that are not the root layer.
        The children transform on the root layer is used on Leopard to implement
        geometry flipping, so avoid this supurious difference in test output.

        * platform/graphics/GraphicsLayer.cpp:
        (WebCore::GraphicsLayer::dumpProperties):

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

18 files changed:
LayoutTests/ChangeLog
LayoutTests/compositing/geometry/preserve-3d-switching-expected.txt
LayoutTests/compositing/iframes/composited-parent-iframe-expected.txt
LayoutTests/compositing/iframes/connect-compositing-iframe-delayed-expected.txt
LayoutTests/compositing/iframes/connect-compositing-iframe-expected.txt
LayoutTests/compositing/iframes/connect-compositing-iframe2-expected.txt
LayoutTests/compositing/iframes/connect-compositing-iframe3-expected.txt
LayoutTests/compositing/iframes/enter-compositing-iframe-expected.txt
LayoutTests/compositing/iframes/iframe-resize-expected.txt
LayoutTests/compositing/iframes/overlapped-iframe-expected.txt
LayoutTests/compositing/layer-creation/overflow-scroll-overlap-expected.txt
LayoutTests/platform/mac-leopard/compositing/iframes/composited-parent-iframe-expected.txt [deleted file]
LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe-expected.txt [deleted file]
LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe2-expected.txt [deleted file]
LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe3-expected.txt [deleted file]
LayoutTests/platform/mac-leopard/compositing/iframes/enter-compositing-iframe-expected.txt [deleted file]
WebCore/ChangeLog
WebCore/platform/graphics/GraphicsLayer.cpp

index dfed16f..6ef72b0 100644 (file)
@@ -1,3 +1,28 @@
+2010-05-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Fix layer dump to avoid spurious platform differences
+        https://bugs.webkit.org/show_bug.cgi?id=39045
+        
+        Updated shared results, and removed Leopard-specific results now that they are no longer required.
+
+        * compositing/geometry/preserve-3d-switching-expected.txt:
+        * compositing/iframes/composited-parent-iframe-expected.txt:
+        * compositing/iframes/connect-compositing-iframe-delayed-expected.txt:
+        * compositing/iframes/connect-compositing-iframe-expected.txt:
+        * compositing/iframes/connect-compositing-iframe2-expected.txt:
+        * compositing/iframes/connect-compositing-iframe3-expected.txt:
+        * compositing/iframes/enter-compositing-iframe-expected.txt:
+        * compositing/iframes/iframe-resize-expected.txt:
+        * compositing/iframes/overlapped-iframe-expected.txt:
+        * compositing/layer-creation/overflow-scroll-overlap-expected.txt:
+        * platform/mac-leopard/compositing/iframes/composited-parent-iframe-expected.txt: Removed.
+        * platform/mac-leopard/compositing/iframes/connect-compositing-iframe-expected.txt: Removed.
+        * platform/mac-leopard/compositing/iframes/connect-compositing-iframe2-expected.txt: Removed.
+        * platform/mac-leopard/compositing/iframes/connect-compositing-iframe3-expected.txt: Removed.
+        * platform/mac-leopard/compositing/iframes/enter-compositing-iframe-expected.txt: Removed.
+
 2010-05-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r59270.
index d863d37..1fa992e 100644 (file)
@@ -12,7 +12,6 @@ The green box appear angled out from the yellow box and embedded in it.
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 0.00)
index 499bb24..b343c9e 100644 (file)
@@ -10,7 +10,6 @@
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position -12.00 0.00)
index d1f4239..028f967 100644 (file)
@@ -12,7 +12,6 @@ When the parent document becomes composited, the layer trees should get connecte
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 0.00)
index b691f0e..1090c9b 100644 (file)
@@ -10,7 +10,6 @@
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 0.00)
index b691f0e..1090c9b 100644 (file)
@@ -10,7 +10,6 @@
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 0.00)
index 8487469..42acf41 100644 (file)
@@ -10,7 +10,6 @@
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 0.00)
index b691f0e..1090c9b 100644 (file)
@@ -10,7 +10,6 @@
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 0.00)
index b691f0e..1090c9b 100644 (file)
@@ -10,7 +10,6 @@
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 0.00)
index b691f0e..1090c9b 100644 (file)
@@ -10,7 +10,6 @@
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 0.00)
index 8328400..d40ad69 100644 (file)
@@ -9,7 +9,6 @@
   (backfaceVisibility visible)
   (backgroundColor none)
   (transform identity)
-  (childrenTransform identity)
   (children 1
     (GraphicsLayer
       (position 0.00 -87.00)
diff --git a/LayoutTests/platform/mac-leopard/compositing/iframes/composited-parent-iframe-expected.txt b/LayoutTests/platform/mac-leopard/compositing/iframes/composited-parent-iframe-expected.txt
deleted file mode 100644 (file)
index a67fb3f..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-
-(GraphicsLayer
-  (position 0.00 0.00)
-  (anchor 0.50 0.50)
-  (bounds 800.00 600.00)
-  (opacity 1.00)
-  (usingTiledLayer 0)
-  (preserves3D 0)
-  (drawsContent 0)
-  (backfaceVisibility visible)
-  (backgroundColor none)
-  (transform identity)
-  (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])
-  (children 1
-    (GraphicsLayer
-      (position -12.00 0.00)
-      (anchor 0.50 0.50)
-      (bounds 812.00 600.00)
-      (opacity 1.00)
-      (usingTiledLayer 0)
-      (preserves3D 0)
-      (drawsContent 0)
-      (backfaceVisibility visible)
-      (backgroundColor none)
-      (transform identity)
-      (childrenTransform identity)
-      (children 1
-        (GraphicsLayer
-          (position 0.00 -12.00)
-          (anchor 0.50 0.50)
-          (bounds 370.00 220.00)
-          (opacity 1.00)
-          (usingTiledLayer 0)
-          (preserves3D 0)
-          (drawsContent 1)
-          (backfaceVisibility visible)
-          (backgroundColor none)
-          (transform identity)
-          (childrenTransform identity)
-          (children 1
-            (GraphicsLayer
-              (position 35.00 35.00)
-              (anchor 0.50 0.50)
-              (bounds 300.00 150.00)
-              (opacity 1.00)
-              (usingTiledLayer 0)
-              (preserves3D 0)
-              (drawsContent 0)
-              (backfaceVisibility visible)
-              (backgroundColor none)
-              (transform identity)
-              (childrenTransform identity)
-              (children 1
-                (GraphicsLayer
-                  (position 0.00 0.00)
-                  (anchor 0.50 0.50)
-                  (bounds 285.00 230.00)
-                  (opacity 1.00)
-                  (usingTiledLayer 0)
-                  (preserves3D 0)
-                  (drawsContent 0)
-                  (backfaceVisibility visible)
-                  (backgroundColor none)
-                  (transform identity)
-                  (childrenTransform identity)
-                  (children 1
-                    (GraphicsLayer
-                      (position 0.00 0.00)
-                      (anchor 0.50 0.50)
-                      (bounds 285.00 230.00)
-                      (opacity 1.00)
-                      (usingTiledLayer 0)
-                      (preserves3D 0)
-                      (drawsContent 1)
-                      (backfaceVisibility visible)
-                      (backgroundColor none)
-                      (transform identity)
-                      (childrenTransform identity)
-                      (children 1
-                        (GraphicsLayer
-                          (position 18.00 10.00)
-                          (anchor 0.50 0.50)
-                          (bounds 210.00 210.00)
-                          (opacity 1.00)
-                          (usingTiledLayer 0)
-                          (preserves3D 0)
-                          (drawsContent 1)
-                          (backfaceVisibility visible)
-                          (backgroundColor none)
-                          (transform identity)
-                          (childrenTransform identity)
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe-expected.txt b/LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe-expected.txt
deleted file mode 100644 (file)
index bb0eb33..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-
-(GraphicsLayer
-  (position 0.00 0.00)
-  (anchor 0.50 0.50)
-  (bounds 800.00 600.00)
-  (opacity 1.00)
-  (usingTiledLayer 0)
-  (preserves3D 0)
-  (drawsContent 0)
-  (backfaceVisibility visible)
-  (backgroundColor none)
-  (transform identity)
-  (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])
-  (children 1
-    (GraphicsLayer
-      (position 0.00 0.00)
-      (anchor 0.50 0.50)
-      (bounds 800.00 600.00)
-      (opacity 1.00)
-      (usingTiledLayer 0)
-      (preserves3D 0)
-      (drawsContent 0)
-      (backfaceVisibility visible)
-      (backgroundColor none)
-      (transform identity)
-      (childrenTransform identity)
-      (children 2
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (anchor 0.50 0.50)
-          (bounds 370.00 220.00)
-          (opacity 1.00)
-          (usingTiledLayer 0)
-          (preserves3D 0)
-          (drawsContent 1)
-          (backfaceVisibility visible)
-          (backgroundColor none)
-          (transform identity)
-          (childrenTransform identity)
-          (children 1
-            (GraphicsLayer
-              (position 35.00 35.00)
-              (anchor 0.50 0.50)
-              (bounds 300.00 150.00)
-              (opacity 1.00)
-              (usingTiledLayer 0)
-              (preserves3D 0)
-              (drawsContent 0)
-              (backfaceVisibility visible)
-              (backgroundColor none)
-              (transform identity)
-              (childrenTransform identity)
-              (children 1
-                (GraphicsLayer
-                  (position 0.00 0.00)
-                  (anchor 0.50 0.50)
-                  (bounds 285.00 230.00)
-                  (opacity 1.00)
-                  (usingTiledLayer 0)
-                  (preserves3D 0)
-                  (drawsContent 0)
-                  (backfaceVisibility visible)
-                  (backgroundColor none)
-                  (transform identity)
-                  (childrenTransform identity)
-                  (children 1
-                    (GraphicsLayer
-                      (position 0.00 0.00)
-                      (anchor 0.50 0.50)
-                      (bounds 285.00 230.00)
-                      (opacity 1.00)
-                      (usingTiledLayer 0)
-                      (preserves3D 0)
-                      (drawsContent 1)
-                      (backfaceVisibility visible)
-                      (backgroundColor none)
-                      (transform identity)
-                      (childrenTransform identity)
-                      (children 1
-                        (GraphicsLayer
-                          (position 18.00 10.00)
-                          (anchor 0.50 0.50)
-                          (bounds 210.00 210.00)
-                          (opacity 1.00)
-                          (usingTiledLayer 0)
-                          (preserves3D 0)
-                          (drawsContent 1)
-                          (backfaceVisibility visible)
-                          (backgroundColor none)
-                          (transform identity)
-                          (childrenTransform identity)
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 5.00 5.00)
-          (anchor 0.50 0.50)
-          (bounds 50.00 50.00)
-          (opacity 1.00)
-          (usingTiledLayer 0)
-          (preserves3D 0)
-          (drawsContent 1)
-          (backfaceVisibility visible)
-          (backgroundColor none)
-          (transform identity)
-          (childrenTransform identity)
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe2-expected.txt b/LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe2-expected.txt
deleted file mode 100644 (file)
index bb0eb33..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-
-(GraphicsLayer
-  (position 0.00 0.00)
-  (anchor 0.50 0.50)
-  (bounds 800.00 600.00)
-  (opacity 1.00)
-  (usingTiledLayer 0)
-  (preserves3D 0)
-  (drawsContent 0)
-  (backfaceVisibility visible)
-  (backgroundColor none)
-  (transform identity)
-  (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])
-  (children 1
-    (GraphicsLayer
-      (position 0.00 0.00)
-      (anchor 0.50 0.50)
-      (bounds 800.00 600.00)
-      (opacity 1.00)
-      (usingTiledLayer 0)
-      (preserves3D 0)
-      (drawsContent 0)
-      (backfaceVisibility visible)
-      (backgroundColor none)
-      (transform identity)
-      (childrenTransform identity)
-      (children 2
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (anchor 0.50 0.50)
-          (bounds 370.00 220.00)
-          (opacity 1.00)
-          (usingTiledLayer 0)
-          (preserves3D 0)
-          (drawsContent 1)
-          (backfaceVisibility visible)
-          (backgroundColor none)
-          (transform identity)
-          (childrenTransform identity)
-          (children 1
-            (GraphicsLayer
-              (position 35.00 35.00)
-              (anchor 0.50 0.50)
-              (bounds 300.00 150.00)
-              (opacity 1.00)
-              (usingTiledLayer 0)
-              (preserves3D 0)
-              (drawsContent 0)
-              (backfaceVisibility visible)
-              (backgroundColor none)
-              (transform identity)
-              (childrenTransform identity)
-              (children 1
-                (GraphicsLayer
-                  (position 0.00 0.00)
-                  (anchor 0.50 0.50)
-                  (bounds 285.00 230.00)
-                  (opacity 1.00)
-                  (usingTiledLayer 0)
-                  (preserves3D 0)
-                  (drawsContent 0)
-                  (backfaceVisibility visible)
-                  (backgroundColor none)
-                  (transform identity)
-                  (childrenTransform identity)
-                  (children 1
-                    (GraphicsLayer
-                      (position 0.00 0.00)
-                      (anchor 0.50 0.50)
-                      (bounds 285.00 230.00)
-                      (opacity 1.00)
-                      (usingTiledLayer 0)
-                      (preserves3D 0)
-                      (drawsContent 1)
-                      (backfaceVisibility visible)
-                      (backgroundColor none)
-                      (transform identity)
-                      (childrenTransform identity)
-                      (children 1
-                        (GraphicsLayer
-                          (position 18.00 10.00)
-                          (anchor 0.50 0.50)
-                          (bounds 210.00 210.00)
-                          (opacity 1.00)
-                          (usingTiledLayer 0)
-                          (preserves3D 0)
-                          (drawsContent 1)
-                          (backfaceVisibility visible)
-                          (backgroundColor none)
-                          (transform identity)
-                          (childrenTransform identity)
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 5.00 5.00)
-          (anchor 0.50 0.50)
-          (bounds 50.00 50.00)
-          (opacity 1.00)
-          (usingTiledLayer 0)
-          (preserves3D 0)
-          (drawsContent 1)
-          (backfaceVisibility visible)
-          (backgroundColor none)
-          (transform identity)
-          (childrenTransform identity)
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe3-expected.txt b/LayoutTests/platform/mac-leopard/compositing/iframes/connect-compositing-iframe3-expected.txt
deleted file mode 100644 (file)
index 9cf06ce..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-
-(GraphicsLayer
-  (position 0.00 0.00)
-  (anchor 0.50 0.50)
-  (bounds 800.00 600.00)
-  (opacity 1.00)
-  (usingTiledLayer 0)
-  (preserves3D 0)
-  (drawsContent 0)
-  (backfaceVisibility visible)
-  (backgroundColor none)
-  (transform identity)
-  (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])
-  (children 1
-    (GraphicsLayer
-      (position 0.00 0.00)
-      (anchor 0.50 0.50)
-      (bounds 800.00 600.00)
-      (opacity 1.00)
-      (usingTiledLayer 0)
-      (preserves3D 0)
-      (drawsContent 0)
-      (backfaceVisibility visible)
-      (backgroundColor none)
-      (transform identity)
-      (childrenTransform identity)
-      (children 1
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (anchor 0.50 0.50)
-          (bounds 370.00 220.00)
-          (opacity 1.00)
-          (usingTiledLayer 0)
-          (preserves3D 0)
-          (drawsContent 1)
-          (backfaceVisibility visible)
-          (backgroundColor none)
-          (transform identity)
-          (childrenTransform identity)
-          (children 1
-            (GraphicsLayer
-              (position 35.00 35.00)
-              (anchor 0.50 0.50)
-              (bounds 300.00 150.00)
-              (opacity 1.00)
-              (usingTiledLayer 0)
-              (preserves3D 0)
-              (drawsContent 0)
-              (backfaceVisibility visible)
-              (backgroundColor none)
-              (transform identity)
-              (childrenTransform identity)
-              (children 1
-                (GraphicsLayer
-                  (position 0.00 0.00)
-                  (anchor 0.50 0.50)
-                  (bounds 285.00 230.00)
-                  (opacity 1.00)
-                  (usingTiledLayer 0)
-                  (preserves3D 0)
-                  (drawsContent 0)
-                  (backfaceVisibility visible)
-                  (backgroundColor none)
-                  (transform identity)
-                  (childrenTransform identity)
-                  (children 1
-                    (GraphicsLayer
-                      (position 0.00 0.00)
-                      (anchor 0.50 0.50)
-                      (bounds 285.00 230.00)
-                      (opacity 1.00)
-                      (usingTiledLayer 0)
-                      (preserves3D 0)
-                      (drawsContent 1)
-                      (backfaceVisibility visible)
-                      (backgroundColor none)
-                      (transform identity)
-                      (childrenTransform identity)
-                      (children 1
-                        (GraphicsLayer
-                          (position 18.00 10.00)
-                          (anchor 0.50 0.50)
-                          (bounds 210.00 210.00)
-                          (opacity 1.00)
-                          (usingTiledLayer 0)
-                          (preserves3D 0)
-                          (drawsContent 1)
-                          (backfaceVisibility visible)
-                          (backgroundColor none)
-                          (transform identity)
-                          (childrenTransform identity)
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-leopard/compositing/iframes/enter-compositing-iframe-expected.txt b/LayoutTests/platform/mac-leopard/compositing/iframes/enter-compositing-iframe-expected.txt
deleted file mode 100644 (file)
index bb0eb33..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-
-(GraphicsLayer
-  (position 0.00 0.00)
-  (anchor 0.50 0.50)
-  (bounds 800.00 600.00)
-  (opacity 1.00)
-  (usingTiledLayer 0)
-  (preserves3D 0)
-  (drawsContent 0)
-  (backfaceVisibility visible)
-  (backgroundColor none)
-  (transform identity)
-  (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])
-  (children 1
-    (GraphicsLayer
-      (position 0.00 0.00)
-      (anchor 0.50 0.50)
-      (bounds 800.00 600.00)
-      (opacity 1.00)
-      (usingTiledLayer 0)
-      (preserves3D 0)
-      (drawsContent 0)
-      (backfaceVisibility visible)
-      (backgroundColor none)
-      (transform identity)
-      (childrenTransform identity)
-      (children 2
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (anchor 0.50 0.50)
-          (bounds 370.00 220.00)
-          (opacity 1.00)
-          (usingTiledLayer 0)
-          (preserves3D 0)
-          (drawsContent 1)
-          (backfaceVisibility visible)
-          (backgroundColor none)
-          (transform identity)
-          (childrenTransform identity)
-          (children 1
-            (GraphicsLayer
-              (position 35.00 35.00)
-              (anchor 0.50 0.50)
-              (bounds 300.00 150.00)
-              (opacity 1.00)
-              (usingTiledLayer 0)
-              (preserves3D 0)
-              (drawsContent 0)
-              (backfaceVisibility visible)
-              (backgroundColor none)
-              (transform identity)
-              (childrenTransform identity)
-              (children 1
-                (GraphicsLayer
-                  (position 0.00 0.00)
-                  (anchor 0.50 0.50)
-                  (bounds 285.00 230.00)
-                  (opacity 1.00)
-                  (usingTiledLayer 0)
-                  (preserves3D 0)
-                  (drawsContent 0)
-                  (backfaceVisibility visible)
-                  (backgroundColor none)
-                  (transform identity)
-                  (childrenTransform identity)
-                  (children 1
-                    (GraphicsLayer
-                      (position 0.00 0.00)
-                      (anchor 0.50 0.50)
-                      (bounds 285.00 230.00)
-                      (opacity 1.00)
-                      (usingTiledLayer 0)
-                      (preserves3D 0)
-                      (drawsContent 1)
-                      (backfaceVisibility visible)
-                      (backgroundColor none)
-                      (transform identity)
-                      (childrenTransform identity)
-                      (children 1
-                        (GraphicsLayer
-                          (position 18.00 10.00)
-                          (anchor 0.50 0.50)
-                          (bounds 210.00 210.00)
-                          (opacity 1.00)
-                          (usingTiledLayer 0)
-                          (preserves3D 0)
-                          (drawsContent 1)
-                          (backfaceVisibility visible)
-                          (backgroundColor none)
-                          (transform identity)
-                          (childrenTransform identity)
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-        (GraphicsLayer
-          (position 5.00 5.00)
-          (anchor 0.50 0.50)
-          (bounds 50.00 50.00)
-          (opacity 1.00)
-          (usingTiledLayer 0)
-          (preserves3D 0)
-          (drawsContent 1)
-          (backfaceVisibility visible)
-          (backgroundColor none)
-          (transform identity)
-          (childrenTransform identity)
-        )
-      )
-    )
-  )
-)
-
index b0534fa..b4d262d 100644 (file)
@@ -1,3 +1,17 @@
+2010-05-12  Simon Fraser  <simon.fraser@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        Fix layer dump to avoid spurious platform differences
+        https://bugs.webkit.org/show_bug.cgi?id=39045
+        
+        Only dump the children transform on layers that are not the root layer.
+        The children transform on the root layer is used on Leopard to implement
+        geometry flipping, so avoid this supurious difference in test output.
+
+        * platform/graphics/GraphicsLayer.cpp:
+        (WebCore::GraphicsLayer::dumpProperties):
+
 2010-05-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r59270.
index b7567bf..c1e2ed6 100644 (file)
@@ -465,17 +465,21 @@ void GraphicsLayer::dumpProperties(TextStream& ts, int indent, LayerTreeAsTextBe
     }
     ts << ")\n";
 
-    writeIndent(ts, indent + 1);
-    ts << "(childrenTransform ";
-    if (m_childrenTransform.isIdentity())
-        ts << "identity";
-    else {
-        ts << "[" << m_childrenTransform.m11() << " " << m_childrenTransform.m12() << " " << m_childrenTransform.m13() << " " << m_childrenTransform.m14() << "] ";
-        ts << "[" << m_childrenTransform.m21() << " " << m_childrenTransform.m22() << " " << m_childrenTransform.m23() << " " << m_childrenTransform.m24() << "] ";
-        ts << "[" << m_childrenTransform.m31() << " " << m_childrenTransform.m32() << " " << m_childrenTransform.m33() << " " << m_childrenTransform.m34() << "] ";
-        ts << "[" << m_childrenTransform.m41() << " " << m_childrenTransform.m42() << " " << m_childrenTransform.m43() << " " << m_childrenTransform.m44() << "]";
+    // Avoid dumping the sublayer transform on the root layer, because it's used for geometry flipping, whose behavior
+    // differs between platforms.
+    if (parent()) {
+        writeIndent(ts, indent + 1);
+        ts << "(childrenTransform ";
+        if (m_childrenTransform.isIdentity())
+            ts << "identity";
+        else {
+            ts << "[" << m_childrenTransform.m11() << " " << m_childrenTransform.m12() << " " << m_childrenTransform.m13() << " " << m_childrenTransform.m14() << "] ";
+            ts << "[" << m_childrenTransform.m21() << " " << m_childrenTransform.m22() << " " << m_childrenTransform.m23() << " " << m_childrenTransform.m24() << "] ";
+            ts << "[" << m_childrenTransform.m31() << " " << m_childrenTransform.m32() << " " << m_childrenTransform.m33() << " " << m_childrenTransform.m34() << "] ";
+            ts << "[" << m_childrenTransform.m41() << " " << m_childrenTransform.m42() << " " << m_childrenTransform.m43() << " " << m_childrenTransform.m44() << "]";
+        }
+        ts << ")\n";
     }
-    ts << ")\n";
 
     if (m_replicaLayer) {
         writeIndent(ts, indent + 1);