Chromium side of webkit merge 42403:42440.

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

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

7 files changed, 62 insertions, 18 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.checksum
index 2b556ab..eb71527 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.checksum
@@ -1 +1 @@
-86bfe1dbbf671f7aadab287370f98ea8
\ No newline at end of file
+5742a7753c5881e811d052e2f35d89ab
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.png
index 4a4719a..81f4279 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.txt
index 8106c4b..04d925f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5418891-expected.txt
@@ -8,22 +8,16 @@ layer at (0,0) size 800x600
           text run at (0,0) width 516: "This tests for a crash when attempting to break a blockquote at the end of its content. "
           text run at (516,0) width 265: "The caret should be in the first of two empty"
           text run at (0,20) width 305: "paragraphs between two pieces of quoted content."
-      RenderBlock {DIV} at (0,56) size 784x100
-        RenderBlock {BLOCKQUOTE} at (0,0) size 784x30 [color=#0000FF] [border: (2px solid #0000FF)]
-          RenderTable {TABLE} at (7,0) size 30x30 [color=#000000] [border: (1px outset #808080)]
-            RenderTableSection {TBODY} at (1,1) size 28x28
-              RenderTableRow {TR} at (0,2) size 28x24
-                RenderTableCell {TD} at (2,2) size 24x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 20x19
-                    text run at (2,2) width 20: "foo"
-        RenderBlock (anonymous) at (0,30) size 784x40
+      RenderBlock {DIV} at (0,56) size 784x80
+        RenderBlock {BLOCKQUOTE} at (0,0) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
+          RenderBlock {DIV} at (7,0) size 777x20
+            RenderText {#text} at (0,0) size 20x19
+              text run at (0,0) width 20: "foo"
+        RenderBlock (anonymous) at (0,20) size 784x40
           RenderBR {BR} at (0,0) size 0x19
           RenderBR {BR} at (0,20) size 0x19
-        RenderBlock {BLOCKQUOTE} at (0,70) size 784x30 [color=#0000FF] [border: (2px solid #0000FF)]
-          RenderTable {TABLE} at (7,0) size 30x30 [color=#000000] [border: (1px outset #808080)]
-            RenderTableSection {TBODY} at (1,1) size 28x28
-              RenderTableRow {TR} at (0,2) size 28x24
-                RenderTableCell {TD} at (2,2) size 24x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
-                  RenderText {#text} at (2,2) size 20x19
-                    text run at (2,2) width 20: "bar"
+        RenderBlock {BLOCKQUOTE} at (0,60) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
+          RenderBlock {DIV} at (7,0) size 777x20
+            RenderText {#text} at (0,0) size 20x19
+              text run at (0,0) width 20: "bar"
 caret: position 0 of child 2 {BR} of child 2 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.checksum
new file mode 100644
index 0000000..ca4067f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.checksum
@@ -0,0 +1 @@
+d013d4371da74e0c4f3c9bc6f44f2952
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.png
new file mode 100644
index 0000000..b173f34
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.txt
new file mode 100644
index 0000000..2277ba7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/inserting/5510537-expected.txt
@@ -0,0 +1,35 @@
+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 784x579
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 769x39
+          text run at (0,0) width 606: "This tests that inserting a newline at the beginning of quoted content doesn't add an extra quoted line. "
+          text run at (606,0) width 163: "The test has passed if there"
+          text run at (0,20) width 350: "are no empty lines (quoted or unquoted) in the box below."
+      RenderBlock {DIV} at (0,56) size 784x100
+        RenderBlock (anonymous) at (0,0) size 784x20
+          RenderText {#text} at (0,0) size 56x19
+            text run at (0,0) width 56: "unquoted"
+          RenderBR {BR} at (56,15) size 0x0
+        RenderBlock {BLOCKQUOTE} at (0,20) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
+          RenderBlock {DIV} at (12,0) size 772x20
+            RenderText {#text} at (0,0) size 91x19
+              text run at (0,0) width 91: "quote level one"
+        RenderBlock {BLOCKQUOTE} at (0,40) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
+          RenderBlock {DIV} at (12,0) size 772x20
+            RenderText {#text} at (0,0) size 91x19
+              text run at (0,0) width 91: "quote level one"
+        RenderBlock (anonymous) at (0,60) size 784x20
+          RenderText {#text} at (0,0) size 56x19
+            text run at (0,0) width 56: "unquoted"
+          RenderBR {BR} at (56,15) size 0x0
+        RenderBlock {BLOCKQUOTE} at (0,80) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
+          RenderBlock {DIV} at (12,0) size 772x20
+            RenderBlock {BLOCKQUOTE} at (0,0) size 772x20 [border: (2px solid #0000FF)]
+              RenderBlock {DIV} at (12,0) size 760x20
+                RenderText {#text} at (0,0) size 92x19
+                  text run at (0,0) width 92: "quote level two"
+      RenderBlock {PRE} at (0,169) size 784x0
+caret: position 8 of child 6 {#text} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index cdd1117..4ea145e 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1,4 +1,4 @@
-// This file consist of lines with specifications of what
+// This file consists of lines with specifications of what
 // to expect from layout test cases. The test cases can be directories
 // in which case the expectations apply to all test cases in that
 // directory and any subdirectory. The format of the file is along the
@@ -2431,3 +2431,17 @@ BUG9992 WIN LINUX : LayoutTests/fast/text/shadow-no-blur.html = FAIL
 BUG10055 LINUX DEBUG : LayoutTests/editing/execCommand/paste-1.html = FAIL PASS
 BUG10055 MAC : LayoutTests/fast/events/updateLayoutForHitTest.html = FAIL
 BUG10055 LINUX DEBUG : LayoutTests/svg/text/text-tselect-02-f.svg = FAIL
+
+// These were already rebaselined for chromium-win, as they changed/added in
+// webkit merge 42403:42440.
+BUG10045 MAC LINUX : LayoutTests/editing/inserting/5418891.html = FAIL
+BUG10045 MAC LINUX : LayoutTests/editing/inserting/5510537.html = FAIL
+
+// New test from webkit merge 42403:42440.
+BUG10488 : LayoutTests/fast/css/zoom-body-scroll.html = FAIL
+
+// Regression from WebKit merge 42403:42440 -- MessageChannel binding no longer
+// gets generated, probably just a matter of enabling ENABLE_CHANNEL_MESSAGING
+// due to http://trac.webkit.org/changeset/42428.
+BUG10489 : chrome/fast/dom/messageport-gc.html = TIMEOUT
+