summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/2d/transform-fixed-container-expected.pngbin0 -> 6414 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-mac/LayoutTests/transforms/2d/transform-fixed-container-expected.pngbin0 -> 18567 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum1
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.pngbin0 -> 4311 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.txt21
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
9 files changed, 31 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 04e6458..406be3f 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "53171",
+ "webkit_revision": "53194",
"ffmpeg_revision": "34297",
"skia_revision": "470",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum
new file mode 100644
index 0000000..2248e05
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum
@@ -0,0 +1 @@
+9e83f365fe1e8ab3923f36922f16e29a \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/2d/transform-fixed-container-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/2d/transform-fixed-container-expected.png
new file mode 100644
index 0000000..2d99fdf
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/transforms/2d/transform-fixed-container-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum
new file mode 100644
index 0000000..76092f7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum
@@ -0,0 +1 @@
+adca83fe9e0c7ab08b595eaf0050f7fe \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/transforms/2d/transform-fixed-container-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/transforms/2d/transform-fixed-container-expected.png
new file mode 100644
index 0000000..482e264
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/transforms/2d/transform-fixed-container-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum
new file mode 100644
index 0000000..eebcb4a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.checksum
@@ -0,0 +1 @@
+de1e722f61bf7bb808816942941d4e49 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.png
new file mode 100644
index 0000000..e608b6f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.txt
new file mode 100644
index 0000000..506145a
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/transforms/2d/transform-fixed-container-expected.txt
@@ -0,0 +1,21 @@
+layer at (0,0) size 785x1150
+ RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1150
+ RenderBlock {HTML} at (0,0) size 785x1150
+ RenderBody {BODY} at (0,150) size 785x1000
+ RenderBlock {P} at (0,250) size 785x20
+ RenderText {#text} at (0,0) size 520x19
+ text run at (0,0) width 520: "Tests fixed position elements combined with transforms. You should see no red above."
+layer at (50,200) size 100x100
+ RenderBlock (positioned) {DIV} at (50,200) size 100x100 [bgcolor=#FF0000]
+layer at (250,200) size 100x100
+ RenderBlock (positioned) {DIV} at (250,200) size 100x100 [bgcolor=#FF0000]
+layer at (50,150) size 100x100
+ RenderBlock {DIV} at (50,0) size 100x100
+layer at (50,200) size 100x100
+ RenderBlock (positioned) {DIV} at (0,50) size 100x100 [bgcolor=#008000]
+layer at (250,150) size 100x100
+ RenderBlock (positioned) {DIV} at (250,50) size 100x100
+layer at (250,200) size 100x100
+ RenderBlock {DIV} at (0,50) size 100x100 [bgcolor=#008000]
+scrolled to 0,100
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 99c1967..d032524 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3073,4 +3073,9 @@ BUG32145 WIN RELEASE : LayoutTests/animations/3d/transform-origin-vs-functions.h
BUG32149 WIN RELEASE : LayoutTests/fast/dom/Document/early-document-access.html = TIMEOUT PASS
BUG32195 : LayoutTests/fast/repaint/renderer-destruction-by-invalidateSelection-crash.html = IMAGE+TEXT PASS
-BUG32201 LINUX DEBUG : LayoutTests/fast/text/atsui-spacing-features.html = IMAGE+TEXT \ No newline at end of file
+
+BUG32201 LINUX DEBUG : LayoutTests/fast/text/atsui-spacing-features.html = IMAGE+TEXT
+
+// Expectations from roll to 53171:53194
+BUG32206 SLOW : LayoutTests/storage/database-lock-after-reload.html = PASS
+