diff options
13 files changed, 37 insertions, 12 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/overflow/overflow-positioning-actual.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/overflow/overflow-positioning-actual.png Binary files differnew file mode 100644 index 0000000..54b1977 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/overflow/overflow-positioning-actual.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/overflow/overflow-positioning-actual.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/overflow/overflow-positioning-actual.txt new file mode 100644 index 0000000..9de7593 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/compositing/overflow/overflow-positioning-actual.txt @@ -0,0 +1,14 @@ +layer at (0,0) size 800x600 + RenderView at (0,0) size 800x600 +layer at (0,0) size 800x438 + RenderBlock {HTML} at (0,0) size 800x438 + RenderBody {BODY} at (100,100) size 600x238 + RenderBlock {P} at (0,0) size 600x20 + RenderText {#text} at (0,0) size 444x19 + text run at (0,0) width 444: "Things should not jump around when the green square starts the transition." +layer at (100,136) size 202x202 clip at (101,137) size 200x200 + RenderBlock (relative positioned) {DIV} at (0,36) size 202x202 [border: (1px solid #000000)] +layer at (101,137) size 200x100 + RenderBlock (relative positioned) {DIV} at (1,1) size 200x100 [bgcolor=#80800033] +layer at (101,137) size 150x150 + RenderBlock (positioned) {DIV} at (1,1) size 150x150 [bgcolor=#008000] diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.checksum new file mode 100644 index 0000000..0ecf417 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.checksum @@ -0,0 +1 @@ +75246ab92f5c05f8568c1c12bfb4e98d
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.png Binary files differnew file mode 100644 index 0000000..4521fd4 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.txt new file mode 100644 index 0000000..75bfe01 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/compositing/overflow/overflow-positioning-expected.txt @@ -0,0 +1,14 @@ +layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x438
+ RenderBlock {HTML} at (0,0) size 800x438
+ RenderBody {BODY} at (100,100) size 600x238
+ RenderBlock {P} at (0,0) size 600x20
+ RenderText {#text} at (0,0) size 444x19
+ text run at (0,0) width 444: "Things should not jump around when the green square starts the transition."
+layer at (100,136) size 202x202 clip at (101,137) size 200x200
+ RenderBlock (relative positioned) {DIV} at (0,36) size 202x202 [border: (1px solid #000000)]
+layer at (101,137) size 200x100
+ RenderBlock (relative positioned) {DIV} at (1,1) size 200x100 [bgcolor=#80800033]
+layer at (101,137) size 150x150
+ RenderBlock (positioned) {DIV} at (1,1) size 150x150 [bgcolor=#008000]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.checksum index a866a36..e72625f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.checksum @@ -1 +1 @@ -5f2483156fccbb8e01c80f84fb56633b
\ No newline at end of file +6b2308381cff9a5beb5561da6ee2e760
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.png Binary files differindex 4ff4968..37d2a7b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.txt index b6cdc30..7293677 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/long-wrapped-line-expected.txt @@ -1,11 +1,10 @@ -layer at (0,0) size 1896x585 +layer at (0,0) size 1904x585 RenderView at (0,0) size 800x585 -layer at (0,0) size 1896x585 +layer at (0,0) size 1904x585 RenderBlock {HTML} at (0,0) size 800x585 RenderBody {BODY} at (8,8) size 784x569 - RenderInline {SPAN} at (0,0) size 784x19 - RenderText {#text} at (0,0) size 1888x19 - text run at (0,0) width 1888: "Side note. Both GR's have been cleaned by both myself and Miguet - Please keep our GR's clean or there will be Fire and Brimstone. The state of the GR2 today was Unacceptable with random parts that were suppose to be KGB that were not labeled, RTW, RFP and attached to a machine in awaiting parts. ." - text run at (1888,0) width -1104: " " + RenderInline {SPAN} at (0,0) size 1896x19 + RenderText {#text} at (0,0) size 1896x19 + text run at (0,0) width 1896: "Side note. Both GR's have been cleaned by both myself and Miguet - Please keep our GR's clean or there will be Fire and Brimstone. The state of the GR2 today was Unacceptable with random parts that were suppose to be KGB that were not labeled, RTW, RFP and attached to a machine in awaiting parts. . " RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-basic-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-basic-expected.checksum index c48d652..ee46671 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-basic-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-basic-expected.checksum @@ -1 +1 @@ -6a55b322636a4baa87dc1a6412da158a
\ No newline at end of file +4393b6713631b6f76f9c6a64a36475c5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-basic-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-basic-expected.png Binary files differindex 9d25354..7be7b9a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-basic-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-basic-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.checksum index 5b9092e..e245b54 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.checksum @@ -1 +1 @@ -c80e7a7dc9ac9140556b5c13b9fbc2bc
\ No newline at end of file +0468b07788b2aef57bf6331f1c10e7eb
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.png Binary files differindex e3e27ff..d83fcc0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/navigation/anchor-frames-expected.png diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index ab0b8d9..1abe24d 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2403,9 +2403,6 @@ BUG9797 WIN DEBUG : LayoutTests/svg/W3C-SVG-1.1/extend-namespace-01-f.svg = CRAS BUG9797 WIN DEBUG : LayoutTests/svg/css/css-box-min-width.html = CRASH PASS BUG9797 WIN DEBUG : LayoutTests/traversal/node-iterator-009.html = CRASH PASS -BUG9850 WIN LINUX : LayoutTests/compositing/overflow/overflow-positioning.html = FAIL -BUG9850 WIN : LayoutTests/fast/inline/long-wrapped-line.html = FAIL - // Failed in WebKit merge 42287:42324 BUG9916 WIN LINUX : LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c.html = FAIL BUG9916 WIN LINUX : LayoutTests/css2.1/t0803-c5505-mrgn-02-c.html = FAIL |
