WebKit roll to 54810

fast/multicol/client-rects.html fails because of scrollbar difference on Windows and Linux. On Mac there is also some subtle difference.

TBR=jparent

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

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

8 files changed, 186 insertions, 0 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.checksum
new file mode 100644
index 0000000..700caeb
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.checksum
@@ -0,0 +1 @@
+fbf70917263fe5e0d3cbc16b9d5fbdef
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.png
new file mode 100644
index 0000000..9e54d45
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.txt
new file mode 100644
index 0000000..c42d6ce
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/multicol/client-rects-expected.txt
@@ -0,0 +1,95 @@
+layer at (0,0) size 785x698
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x698
+  RenderBlock {HTML} at (0,0) size 785x698
+    RenderBody {BODY} at (8,8) size 769x680
+      RenderBlock {P} at (0,0) size 769x30
+        RenderText {#text} at (0,10) size 396x19
+          text run at (0,10) width 396: "The blue borders should coincide with light blue squares, like this: "
+        RenderBlock {SPAN} at (396,0) size 25x25 [bgcolor=#ADD8E6] [border: (3px solid #0000FF7F)]
+        RenderText {#text} at (421,10) size 185x19
+          text run at (421,10) width 8: ". "
+          text run at (429,10) width 177: "There should be none of this: "
+        RenderBlock {SPAN} at (606,0) size 25x25 [bgcolor=#ADD8E6]
+        RenderText {#text} at (631,10) size 48x19
+          text run at (631,10) width 4: " "
+          text run at (635,10) width 44: "or this: "
+        RenderBlock {SPAN} at (679,0) size 25x25 [border: (3px solid #0000FF7F)]
+        RenderText {#text} at (704,10) size 4x19
+          text run at (704,10) width 4: "."
+      RenderBlock {DIV} at (0,46) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBR {BR} at (13,13) size 0x25
+        RenderText {#text} at (13,38) size 25x75
+          text run at (13,38) width 25: "x"
+          text run at (13,63) width 25: "y"
+          text run at (13,88) width 25: "z"
+      RenderBlock {DIV} at (0,132) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBR {BR} at (13,13) size 0x25
+        RenderInline {SPAN} at (0,0) size 25x75
+          RenderText {#text} at (13,38) size 25x75
+            text run at (13,38) width 25: "x"
+            text run at (13,63) width 25: "y"
+            text run at (13,88) width 25: "z"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,218) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x25
+        RenderBlock {DIV} at (13,38) size 50x75
+          RenderText {#text} at (0,0) size 25x75
+            text run at (0,0) width 25: "x"
+            text run at (0,25) width 25: "y"
+            text run at (0,50) width 25: "z"
+      RenderBlock {DIV} at (0,304) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x25
+        RenderBlock {DIV} at (13,38) size 50x75
+          RenderBR {BR} at (0,0) size 0x25
+          RenderText {#text} at (0,25) size 25x50
+            text run at (0,25) width 25: "y"
+            text run at (0,50) width 25: "z"
+      RenderBlock {DIV} at (0,390) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x25
+        RenderBlock {DIV} at (13,38) size 50x54
+          RenderBR {BR} at (0,0) size 0x25
+          RenderSlider {INPUT} at (2,27) size 25x25 [color=#000000] [bgcolor=#ADD8E6]
+            RenderBlock {DIV} at (12,12) size 0x0
+      RenderBlock {DIV} at (0,476) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x25
+        RenderBlock {DIV} at (13,38) size 50x50
+          RenderBR {BR} at (0,0) size 0x25
+          RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
+      RenderBlock {P} at (0,568) size 769x20
+        RenderText {#text} at (0,0) size 604x19
+          text run at (0,0) width 604: "Except here, where the blue border should be around the bigger slice of the blue square, on the right."
+      RenderBlock {DIV} at (0,604) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock {DIV} at (13,53) size 25x25 [bgcolor=#ADD8E6]
+layer at (21,92) size 25x25
+  RenderBlock (positioned) {DIV} at (21,92) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,67) size 25x25
+  RenderBlock (positioned) {DIV} at (81,67) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,92) size 25x25
+  RenderBlock (positioned) {DIV} at (81,92) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (21,178) size 25x25
+  RenderBlock (positioned) {DIV} at (21,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,153) size 25x25
+  RenderBlock (positioned) {DIV} at (81,153) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,178) size 25x25
+  RenderBlock (positioned) {DIV} at (81,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (21,264) size 25x25
+  RenderBlock (positioned) {DIV} at (21,264) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,239) size 25x25
+  RenderBlock (positioned) {DIV} at (81,239) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,264) size 25x25
+  RenderBlock (positioned) {DIV} at (81,264) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,325) size 25x25
+  RenderBlock (positioned) {DIV} at (81,325) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,350) size 25x25
+  RenderBlock (positioned) {DIV} at (81,350) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (83,413) size 25x25
+  RenderBlock (positioned) {DIV} at (83,413) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,522) size 25x25
+  RenderBlock (positioned) {DIV} at (81,522) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,615) size 25x25
+  RenderBlock (positioned) {DIV} at (81,615) size 25x25 [border: (3px solid #0000FF7F)]
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/multicol/client-rects-expected.checksum b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/multicol/client-rects-expected.checksum
new file mode 100644
index 0000000..59273f3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/multicol/client-rects-expected.checksum
@@ -0,0 +1 @@
+9d0ee63b089cfe883ebf1b4bfd95014b
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/multicol/client-rects-expected.png b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/multicol/client-rects-expected.png
new file mode 100644
index 0000000..79a65e8
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/multicol/client-rects-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.checksum
new file mode 100644
index 0000000..92b3634
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.checksum
@@ -0,0 +1 @@
+061256fa2831ad23ef942b4f43de1ba8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.png
new file mode 100644
index 0000000..793932c
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.txt
new file mode 100644
index 0000000..b0a4b96
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/multicol/client-rects-expected.txt
@@ -0,0 +1,88 @@
+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 784x582
+      RenderBlock {P} at (0,0) size 784x30
+        RenderText {#text} at (0,10) size 396x19
+          text run at (0,10) width 396: "The blue borders should coincide with light blue squares, like this: "
+        RenderBlock {SPAN} at (396,0) size 25x25 [bgcolor=#ADD8E6] [border: (3px solid #0000FF7F)]
+        RenderText {#text} at (421,10) size 185x19
+          text run at (421,10) width 8: ". "
+          text run at (429,10) width 177: "There should be none of this: "
+        RenderBlock {SPAN} at (606,0) size 25x25 [bgcolor=#ADD8E6]
+        RenderText {#text} at (631,10) size 48x19
+          text run at (631,10) width 4: " "
+          text run at (635,10) width 44: "or this: "
+        RenderBlock {SPAN} at (679,0) size 25x25 [border: (3px solid #0000FF7F)]
+        RenderText {#text} at (704,10) size 4x19
+          text run at (704,10) width 4: "."
+      RenderBlock {DIV} at (0,46) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBR {BR} at (13,13) size 0x25
+        RenderText {#text} at (13,38) size 25x75
+          text run at (13,38) width 25: "x"
+          text run at (13,63) width 25: "y"
+          text run at (13,88) width 25: "z"
+      RenderBlock {DIV} at (0,132) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBR {BR} at (13,13) size 0x25
+        RenderInline {SPAN} at (0,0) size 25x75
+          RenderText {#text} at (13,38) size 25x75
+            text run at (13,38) width 25: "x"
+            text run at (13,63) width 25: "y"
+            text run at (13,88) width 25: "z"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,218) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x25
+        RenderBlock {DIV} at (13,38) size 50x75
+          RenderText {#text} at (0,0) size 25x75
+            text run at (0,0) width 25: "x"
+            text run at (0,25) width 25: "y"
+            text run at (0,50) width 25: "z"
+      RenderBlock {DIV} at (0,304) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x25
+        RenderBlock {DIV} at (13,38) size 50x75
+          RenderBR {BR} at (0,0) size 0x25
+          RenderText {#text} at (0,25) size 25x50
+            text run at (0,25) width 25: "y"
+            text run at (0,50) width 25: "z"
+      RenderBlock {DIV} at (0,390) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x25
+        RenderBlock {DIV} at (13,38) size 50x54
+          RenderBR {BR} at (0,0) size 0x25
+          RenderSlider {INPUT} at (2,27) size 25x25 [color=#000000] [bgcolor=#ADD8E6]
+            RenderBlock {DIV} at (12,12) size 0x0
+      RenderBlock {DIV} at (0,476) size 136x76 [color=#ADD8E6] [border: (3px solid #000000)]
+        RenderBlock (anonymous) at (13,13) size 50x25
+          RenderBR {BR} at (0,0) size 0x25
+        RenderBlock {DIV} at (13,38) size 50x50
+          RenderBR {BR} at (0,0) size 0x25
+          RenderImage {IMG} at (0,25) size 25x25 [bgcolor=#ADD8E6]
+layer at (21,92) size 25x25
+  RenderBlock (positioned) {DIV} at (21,92) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,67) size 25x25
+  RenderBlock (positioned) {DIV} at (81,67) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,92) size 25x25
+  RenderBlock (positioned) {DIV} at (81,92) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (21,178) size 25x25
+  RenderBlock (positioned) {DIV} at (21,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,153) size 25x25
+  RenderBlock (positioned) {DIV} at (81,153) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,178) size 25x25
+  RenderBlock (positioned) {DIV} at (81,178) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (21,264) size 25x25
+  RenderBlock (positioned) {DIV} at (21,264) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,239) size 25x25
+  RenderBlock (positioned) {DIV} at (81,239) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,264) size 25x25
+  RenderBlock (positioned) {DIV} at (81,264) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,325) size 25x25
+  RenderBlock (positioned) {DIV} at (81,325) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,350) size 25x25
+  RenderBlock (positioned) {DIV} at (81,350) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (83,413) size 25x25
+  RenderBlock (positioned) {DIV} at (83,413) size 25x25 [border: (3px solid #0000FF7F)]
+layer at (81,522) size 25x25
+  RenderBlock (positioned) {DIV} at (81,522) size 25x25 [border: (3px solid #0000FF7F)]