[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

simon.fraser at apple.com simon.fraser at apple.com
Wed Dec 22 13:17:59 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 933e48fd409b4bd7f9d7c220ba925fbf71f4227d
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 17:15:20 2010 +0000

    2010-09-10  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Chris Marrin.
    
            Update Windows LayoutTest/compositing results
            https://bugs.webkit.org/show_bug.cgi?id=45323
    
            Fix up some windows compositing test results.
    
            * platform/win/compositing/iframes/composited-parent-iframe-expected.txt: Removed.
            * platform/win/compositing/iframes/iframe-resize-expected.txt: Removed.
            * platform/win/compositing/iframes/leave-compositing-iframe-expected.txt: Removed.
            * platform/win/compositing/iframes/overlapped-iframe-expected.txt: Removed.
            * platform/win/compositing/plugins/composited-plugin-expected.txt: Added.
            * platform/win/compositing/plugins/small-to-large-composited-plugin-expected.txt: Copied from LayoutTests/compositing/iframes/leave-compositing-iframe-expected.txt.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67212 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cda416d..826b845 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-10  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Chris Marrin.
+
+        Update Windows LayoutTest/compositing results
+        https://bugs.webkit.org/show_bug.cgi?id=45323
+
+        Fix up some windows compositing test results.
+
+        * platform/win/compositing/iframes/composited-parent-iframe-expected.txt: Removed.
+        * platform/win/compositing/iframes/iframe-resize-expected.txt: Removed.
+        * platform/win/compositing/iframes/leave-compositing-iframe-expected.txt: Removed.
+        * platform/win/compositing/iframes/overlapped-iframe-expected.txt: Removed.
+        * platform/win/compositing/plugins/composited-plugin-expected.txt: Added.
+        * platform/win/compositing/plugins/small-to-large-composited-plugin-expected.txt: Copied from LayoutTests/compositing/iframes/leave-compositing-iframe-expected.txt.
+
 2010-09-10  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/LayoutTests/platform/win/compositing/iframes/composited-parent-iframe-expected.txt b/LayoutTests/platform/win/compositing/iframes/composited-parent-iframe-expected.txt
deleted file mode 100644
index 499bb24..0000000
--- a/LayoutTests/platform/win/compositing/iframes/composited-parent-iframe-expected.txt
+++ /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 identity)
-  (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/win/compositing/iframes/iframe-resize-expected.txt b/LayoutTests/platform/win/compositing/iframes/iframe-resize-expected.txt
deleted file mode 100644
index b691f0e..0000000
--- a/LayoutTests/platform/win/compositing/iframes/iframe-resize-expected.txt
+++ /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 identity)
-  (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/win/compositing/iframes/leave-compositing-iframe-expected.txt b/LayoutTests/platform/win/compositing/iframes/leave-compositing-iframe-expected.txt
deleted file mode 100644
index b691f0e..0000000
--- a/LayoutTests/platform/win/compositing/iframes/leave-compositing-iframe-expected.txt
+++ /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 identity)
-  (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/win/compositing/iframes/overlapped-iframe-expected.txt b/LayoutTests/platform/win/compositing/iframes/overlapped-iframe-expected.txt
deleted file mode 100644
index b691f0e..0000000
--- a/LayoutTests/platform/win/compositing/iframes/overlapped-iframe-expected.txt
+++ /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 identity)
-  (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/win/compositing/plugins/composited-plugin-expected.txt b/LayoutTests/platform/win/compositing/plugins/composited-plugin-expected.txt
new file mode 100644
index 0000000..2d81990
--- /dev/null
+++ b/LayoutTests/platform/win/compositing/plugins/composited-plugin-expected.txt
@@ -0,0 +1,7 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x170
+  RenderBlock {HTML} at (0,0) size 800x170
+    RenderBody {BODY} at (8,8) size 784x154
+      RenderEmbeddedObject {EMBED} at (0,0) size 300x150
+      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/compositing/iframes/leave-compositing-iframe-expected.txt b/LayoutTests/platform/win/compositing/plugins/small-to-large-composited-plugin-expected.txt
similarity index 100%
copy from LayoutTests/compositing/iframes/leave-compositing-iframe-expected.txt
copy to LayoutTests/platform/win/compositing/plugins/small-to-large-composited-plugin-expected.txt

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list