Rebaseline layout tests from webkit merge 41860:41960 and 44252:44286

TEST=layout tests
BUG=10462,13105

Review URL: http://codereview.chromium.org/149645

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20753 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 95 insertions, 8 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum
new file mode 100644
index 0000000..c592b61
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum
@@ -0,0 +1 @@
+e590fc793615b326a07c02408d4d50ce
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png
new file mode 100644
index 0000000..a22c7b8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt
new file mode 100644
index 0000000..58f8d42
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt
@@ -0,0 +1,30 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 51x19
+          text run at (0,0) width 51: "Test for "
+        RenderInline {I} at (0,0) size 710x19
+          RenderInline {A} at (0,0) size 311x19 [color=#0000EE]
+            RenderText {#text} at (51,0) size 311x19
+              text run at (51,0) width 311: "https://bugs.webkit.org/show_bug.cgi?id=23739"
+          RenderText {#text} at (362,0) size 399x19
+            text run at (362,0) width 4: " "
+            text run at (366,0) width 395: "REGRESSION (r36513): iframe isn't sized properly upon load"
+        RenderText {#text} at (761,0) size 4x19
+          text run at (761,0) width 4: "."
+      RenderTable {TABLE} at (0,36) size 304x400
+        RenderTableSection {TBODY} at (0,0) size 304x400
+          RenderTableRow {TR} at (0,2) size 304x396
+            RenderTableCell {TD} at (2,2) size 300x396 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (0,0) size 300x0
+              RenderBlock (anonymous) at (0,0) size 300x396
+                RenderPartObject {IFRAME} at (0,0) size 300x396 [bgcolor=#008000]
+                  layer at (0,0) size 300x396
+                    RenderView at (0,0) size 300x396
+                  layer at (0,0) size 300x396
+                    RenderBlock {HTML} at (0,0) size 300x396
+                      RenderBody {BODY} at (8,8) size 284x380
+                RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.checksum
new file mode 100644
index 0000000..9ef2d64
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.checksum
@@ -0,0 +1 @@
+12784edb56f88c79ea29fefcfd5f3d16
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.png
new file mode 100644
index 0000000..4ab3618
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.txt
new file mode 100644
index 0000000..e7852aa
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/http/tests/misc/generated-content-inside-table-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderTable {TABLE} at (0,0) size 170x26
+        RenderTableSection {TBODY} at (0,0) size 170x26
+          RenderTableRow {TR} at (0,2) size 170x22
+            RenderTableCell {TD} at (2,2) size 166x22 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 164x20
+                RenderText {#text} at (0,0) size 160x19
+                  text run at (0,0) width 160: "This text should not break "
+                RenderInline (generated) at (0,0) size 4x19
+                  RenderText at (160,0) size 4x19
+                    text run at (160,0) width 4: "."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root-expected.checksum
index ca79a72..aa23a23 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root-expected.checksum
@@ -1 +1 @@
-cfe4678c52b538dacdbb631d5f4661dd
\ No newline at end of file
+51b4b027c03f2f837a3dd80d584f9acb
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root-expected.png
index 0b94bae..c4af859 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum
new file mode 100644
index 0000000..41e6210
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.checksum
@@ -0,0 +1 @@
+7ad10a10108533d6afe3d3a7751029f5
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png
new file mode 100644
index 0000000..4e47dc0
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt
new file mode 100644
index 0000000..58f8d42
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table-expected.txt
@@ -0,0 +1,30 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 51x19
+          text run at (0,0) width 51: "Test for "
+        RenderInline {I} at (0,0) size 710x19
+          RenderInline {A} at (0,0) size 311x19 [color=#0000EE]
+            RenderText {#text} at (51,0) size 311x19
+              text run at (51,0) width 311: "https://bugs.webkit.org/show_bug.cgi?id=23739"
+          RenderText {#text} at (362,0) size 399x19
+            text run at (362,0) width 4: " "
+            text run at (366,0) width 395: "REGRESSION (r36513): iframe isn't sized properly upon load"
+        RenderText {#text} at (761,0) size 4x19
+          text run at (761,0) width 4: "."
+      RenderTable {TABLE} at (0,36) size 304x400
+        RenderTableSection {TBODY} at (0,0) size 304x400
+          RenderTableRow {TR} at (0,2) size 304x396
+            RenderTableCell {TD} at (2,2) size 300x396 [bgcolor=#FF0000] [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (0,0) size 300x0
+              RenderBlock (anonymous) at (0,0) size 300x396
+                RenderPartObject {IFRAME} at (0,0) size 300x396 [bgcolor=#008000]
+                  layer at (0,0) size 300x396
+                    RenderView at (0,0) size 300x396
+                  layer at (0,0) size 300x396
+                    RenderBlock {HTML} at (0,0) size 300x396
+                      RenderBody {BODY} at (8,8) size 284x380
+                RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.checksum
new file mode 100644
index 0000000..cafe2a4
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.checksum
@@ -0,0 +1 @@
+1c473cb9debc46e00f05b9df2915d9a2
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.png
new file mode 100644
index 0000000..2e19975
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.txt
new file mode 100644
index 0000000..e7852aa
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/http/tests/misc/generated-content-inside-table-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderTable {TABLE} at (0,0) size 170x26
+        RenderTableSection {TBODY} at (0,0) size 170x26
+          RenderTableRow {TR} at (0,2) size 170x22
+            RenderTableCell {TD} at (2,2) size 166x22 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 164x20
+                RenderText {#text} at (0,0) size 160x19
+                  text run at (0,0) width 160: "This text should not break "
+                RenderInline (generated) at (0,0) size 4x19
+                  RenderText at (160,0) size 4x19
+                    text run at (160,0) width 4: "."
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index b60bdf8..5175d4e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1951,10 +1951,6 @@ BUG10461 MAC : LayoutTests/fast/images/animated-svg-as-image.html = TIMEOUT PASS
 // Missing expected results
 BUG10461 SKIP : LayoutTests/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment.html = PASS
 
-// Merge 41860:41906 New tests
-BUG10462 WIN LINUX : LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table.html = FAIL
-BUG10462 WIN LINUX : LayoutTests/http/tests/misc/generated-content-inside-table.html = FAIL
-
 // New failures from merge
 BUG10463 WIN LINUX : LayoutTests/editing/selection/hit-test-anonymous.html = FAIL
 BUG10463 WIN LINUX : LayoutTests/fast/forms/listbox-hit-test-zoomed.html = FAIL
@@ -2658,9 +2654,6 @@ BUG12882 WIN : LayoutTests/fast/dom/HTMLObjectElement/object-as-frame.html = FAI
 BUG12882 WIN : LayoutTests/fast/box-shadow/basic-shadows.html = FAIL
 BUG12882 : LayoutTests/fast/dom/Window/open-existing-pop-up-blocking.html = TIMEOUT
 
-// WebKit 44252:44286
-BUG13105 MAC WIN : LayoutTests/fast/backgrounds/body-generated-image-propagated-to-root.html = PASS FAIL
-
 // WebKit 44286:44342
 // This test crashes the next layout tests, so skip until resolved.
 BUG13176 SKIP : LayoutTests/fast/workers/worker-close.html = FAIL