[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:08:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 837b2d0b43952c29f4ffc8e5d073b35ff080a8a5
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 18:46:21 2010 +0000
2010-09-07 Simon Fraser <simon.fraser at apple.com>
Reviewed by Chris Marrin.
Avoid use of CA plugin in compositing tests so that they work on Windows
https://bugs.webkit.org/show_bug.cgi?id=45312
Convert tests to use <video> rather than a plugin, so that they have similar
compositing behavior on Windows.
* compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt:
* compositing/geometry/limit-layer-bounds-clipping-ancestor.html:
* compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt:
* compositing/geometry/limit-layer-bounds-fixed-positioned.html:
* compositing/geometry/limit-layer-bounds-overflow-repaint.html:
* compositing/geometry/limit-layer-bounds-overflow-root-expected.txt:
* compositing/geometry/limit-layer-bounds-overflow-root.html:
* compositing/geometry/limit-layer-bounds-positioned-expected.txt:
* compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt:
* compositing/geometry/limit-layer-bounds-positioned-transition.html:
* compositing/geometry/limit-layer-bounds-positioned.html:
* compositing/geometry/limit-layer-bounds-transformed-expected.txt:
* compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt:
* compositing/geometry/limit-layer-bounds-transformed-overflow.html:
* compositing/geometry/limit-layer-bounds-transformed.html:
* platform/mac/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66896 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2d6c415..5c5f226 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,30 @@
+2010-09-07 Simon Fraser <simon.fraser at apple.com>
+
+ Reviewed by Chris Marrin.
+
+ Avoid use of CA plugin in compositing tests so that they work on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=45312
+
+ Convert tests to use <video> rather than a plugin, so that they have similar
+ compositing behavior on Windows.
+
+ * compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt:
+ * compositing/geometry/limit-layer-bounds-clipping-ancestor.html:
+ * compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt:
+ * compositing/geometry/limit-layer-bounds-fixed-positioned.html:
+ * compositing/geometry/limit-layer-bounds-overflow-repaint.html:
+ * compositing/geometry/limit-layer-bounds-overflow-root-expected.txt:
+ * compositing/geometry/limit-layer-bounds-overflow-root.html:
+ * compositing/geometry/limit-layer-bounds-positioned-expected.txt:
+ * compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt:
+ * compositing/geometry/limit-layer-bounds-positioned-transition.html:
+ * compositing/geometry/limit-layer-bounds-positioned.html:
+ * compositing/geometry/limit-layer-bounds-transformed-expected.txt:
+ * compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt:
+ * compositing/geometry/limit-layer-bounds-transformed-overflow.html:
+ * compositing/geometry/limit-layer-bounds-transformed.html:
+ * platform/mac/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt:
+
2010-09-07 Zhenyao Mo <zmo at google.com>
Unreviewed.
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt b/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt
index 76e4f34..f542b20 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor-expected.txt
@@ -1,4 +1,3 @@
-
top
middlebottom
@@ -37,7 +36,7 @@ middlebottom
(opacity 1.00)
(usingTiledLayer 0)
(preserves3D 0)
- (drawsContent 1)
+ (drawsContent 0)
(backfaceVisibility visible)
(backgroundColor none)
(transform identity)
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor.html b/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor.html
index 2619a5e..73e6c1f 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor.html
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-clipping-ancestor.html
@@ -23,7 +23,7 @@
background-color: green;
}
- embed {
+ video {
position: absolute;
top: 21px;
left: 21px;
@@ -66,7 +66,7 @@
<body>
<!-- Go into compositing without transforms. -->
- <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
+ <video src="../resources/video.mp4"></video>
<!-- "middle" text should be visible -->
<div class="container" style="position: relative; overflow: hidden;">
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt b/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
index a4716b8..e170d53 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned-expected.txt
@@ -1,4 +1,3 @@
-
Text here
(GraphicsLayer
(position 0.00 0.00)
@@ -32,7 +31,7 @@ Text here
(opacity 1.00)
(usingTiledLayer 0)
(preserves3D 0)
- (drawsContent 1)
+ (drawsContent 0)
(backfaceVisibility visible)
(backgroundColor none)
(transform identity)
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned.html b/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned.html
index e1741ec..5454160 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned.html
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-fixed-positioned.html
@@ -16,7 +16,7 @@
border: 1px solid black;
}
- embed {
+ video {
position: absolute;
top: 121px;
left: 21px;
@@ -64,7 +64,7 @@
<body>
<!-- Go into compositing without transforms. -->
- <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
+ <video src="../resources/video.mp4"></video>
<div class="indicator"></div>
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-repaint.html b/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-repaint.html
index 83a5c8f..9443f35 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-repaint.html
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-repaint.html
@@ -18,7 +18,7 @@
background-color: blue;
}
- embed {
+ video {
position: absolute;
top: 20px;
left: 20px;
@@ -62,7 +62,7 @@
<body>
<!-- Go into compositing without transforms. -->
- <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
+ <video src="../resources/video.mp4"></video>
<!-- Test repainting when the graphicsLayer offsetFromRenderer changes -->
<!-- You should see one green square, and no red -->
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
index c7df7a4..fba7c65 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt
@@ -1,4 +1,3 @@
-
(GraphicsLayer
(position 0.00 0.00)
(anchor 0.50 0.50)
@@ -31,7 +30,7 @@
(opacity 1.00)
(usingTiledLayer 0)
(preserves3D 0)
- (drawsContent 1)
+ (drawsContent 0)
(backfaceVisibility visible)
(backgroundColor none)
(transform identity)
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root.html b/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root.html
index eb89779..7f8a6b1 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root.html
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-overflow-root.html
@@ -17,7 +17,7 @@
border: 1px solid black;
}
- embed {
+ video {
position: absolute;
top: 21px;
left: 21px;
@@ -66,7 +66,7 @@
<body>
<!-- Go into compositing without transforms. -->
- <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
+ <video src="../resources/video.mp4"></video>
<div class="indicator"></div>
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt b/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
index 5bcf91f..a4126fd 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-expected.txt
@@ -1,4 +1,3 @@
-
Text here
(GraphicsLayer
(position 0.00 0.00)
@@ -32,7 +31,7 @@ Text here
(opacity 1.00)
(usingTiledLayer 0)
(preserves3D 0)
- (drawsContent 1)
+ (drawsContent 0)
(backfaceVisibility visible)
(backgroundColor none)
(transform identity)
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt b/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
index 80708e2..6776ef1 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt
@@ -1,4 +1,3 @@
-
Text here
(GraphicsLayer
(position 0.00 0.00)
@@ -32,7 +31,7 @@ Text here
(opacity 1.00)
(usingTiledLayer 0)
(preserves3D 0)
- (drawsContent 1)
+ (drawsContent 0)
(backfaceVisibility visible)
(backgroundColor none)
(transform identity)
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition.html b/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition.html
index 3356b8b..397fd7e 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition.html
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-positioned-transition.html
@@ -15,7 +15,7 @@
border: 1px solid black;
}
- embed {
+ video {
position: absolute;
top: 21px;
left: 21px;
@@ -66,7 +66,7 @@
<body>
<!-- Go into compositing without transforms. -->
- <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
+ <video src="../resources/video.mp4"></video>
<div class="indicator"></div>
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned.html b/LayoutTests/compositing/geometry/limit-layer-bounds-positioned.html
index f60f5a8..1d57435 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-positioned.html
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-positioned.html
@@ -15,7 +15,7 @@
border: 1px solid black;
}
- embed {
+ video {
position: absolute;
top: 21px;
left: 21px;
@@ -61,7 +61,7 @@
<body>
<!-- Go into compositing without transforms. -->
- <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
+ <video src="../resources/video.mp4"></video>
<div class="indicator"></div>
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
index a530746..38f6a3c 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-expected.txt
@@ -1,4 +1,3 @@
-
Text here
(GraphicsLayer
(position 0.00 0.00)
@@ -32,7 +31,7 @@ Text here
(opacity 1.00)
(usingTiledLayer 0)
(preserves3D 0)
- (drawsContent 1)
+ (drawsContent 0)
(backfaceVisibility visible)
(backgroundColor none)
(transform identity)
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
index a1c3c15..50697b2 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow-expected.txt
@@ -1,4 +1,3 @@
-
middle
(GraphicsLayer
(position 0.00 0.00)
@@ -32,7 +31,7 @@ middle
(opacity 1.00)
(usingTiledLayer 0)
(preserves3D 0)
- (drawsContent 1)
+ (drawsContent 0)
(backfaceVisibility visible)
(backgroundColor none)
(transform identity)
@@ -82,7 +81,7 @@ middle
(anchor 0.50 0.50)
(bounds 2050.00 100.00)
(opacity 1.00)
- (usingTiledLayer 0)
+ (usingTiledLayer 1)
(preserves3D 0)
(drawsContent 1)
(backfaceVisibility visible)
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow.html b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow.html
index 18df245..5e2edec 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow.html
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed-overflow.html
@@ -16,7 +16,7 @@
-webkit-transform: translate(100px, 0);
}
- embed {
+ video {
position: absolute;
top: 21px;
left: 121px;
@@ -67,7 +67,7 @@
<body>
<!-- Go into compositing without transforms. -->
- <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
+ <video src="../resources/video.mp4"></video>
<div class="indicator"></div>
diff --git a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed.html b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed.html
index cf3bf7f..2e02b04 100644
--- a/LayoutTests/compositing/geometry/limit-layer-bounds-transformed.html
+++ b/LayoutTests/compositing/geometry/limit-layer-bounds-transformed.html
@@ -16,7 +16,7 @@
-webkit-transform: translate(100px, 0);
}
- embed {
+ video {
position: absolute;
top: 21px;
left: 121px;
@@ -62,7 +62,7 @@
<body>
<!-- Go into compositing without transforms. -->
- <embed type="application/x-webkit-test-netscape" drawingmodel="coreanimation">
+ <video src="../resources/video.mp4"></video>
<div class="indicator"></div>
diff --git a/LayoutTests/platform/mac/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt b/LayoutTests/platform/mac/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt
index 5c7e340..e1dbce9 100644
--- a/LayoutTests/platform/mac/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt
+++ b/LayoutTests/platform/mac/compositing/geometry/limit-layer-bounds-overflow-repaint-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 800x242
RenderBody {BODY} at (8,8) size 784x226
RenderText {#text} at (0,0) size 0x0
layer at (20,20) size 100x100
- RenderEmbeddedObject {EMBED} at (20,20) size 100x100
+ RenderVideo {VIDEO} at (20,20) size 100x100
layer at (18,18) size 202x202 clip at (19,19) size 200x200 scrollY 500 scrollHeight 1000
RenderBlock (relative positioned) {DIV} at (10,10) size 202x202 [border: (1px solid #000000)]
layer at (19,-481) size 200x1000 backgroundClip at (19,19) size 200x200 clip at (19,19) size 200x200 outlineClip at (19,19) size 200x200
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list