Rebaseline 4 tests again.

TBR=levin
BUG=none
TEST=none


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

10 files changed, 171 insertions, 25 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/outline-auto-empty-rects-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/outline-auto-empty-rects-expected.txt
new file mode 100644
index 0000000..38a5cd7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/outline-auto-empty-rects-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 784x579
+      RenderBlock {DIV} at (0,0) size 784x16
+        RenderBlock (anonymous) at (0,0) size 784x0
+          RenderInline {SPAN} at (0,0) size 0x0
+        RenderBlock (anonymous) at (0,0) size 784x16
+          RenderBlock {PRE} at (0,0) size 784x16
+            RenderText {#text} at (0,0) size 792x16
+              text run at (0,0) width 792: "There should only be a focus ring around this contentEditable div, and not a tiny one below as well"
+        RenderBlock (anonymous) at (0,29) size 784x0
+          RenderInline {SPAN} at (0,0) size 0x0
+          RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/outline-auto-location-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/outline-auto-location-expected.txt
new file mode 100644
index 0000000..5c2f1d7
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/css/outline-auto-location-expected.txt
@@ -0,0 +1,19 @@
+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,20) size 784x560
+      RenderBlock {DIV} at (20,0) size 744x56 [bgcolor=#ADD8E6]
+        RenderBlock {P} at (0,0) size 744x20
+          RenderText {#text} at (0,0) size 296x19
+            text run at (0,0) width 296: "There should be one outline around the whole div"
+        RenderBlock {P} at (-20,36) size 764x20
+          RenderText {#text} at (0,0) size 152x19
+            text run at (0,0) width 152: "Not around each element"
+      RenderBlock {DIV} at (20,76) size 744x56 [bgcolor=#ADD8E6]
+        RenderBlock {P} at (0,0) size 744x20
+          RenderText {#text} at (0,0) size 296x19
+            text run at (0,0) width 296: "There should be one outline around the whole div"
+        RenderBlock {P} at (-20,36) size 764x20
+          RenderText {#text} at (0,0) size 152x19
+            text run at (0,0) width 152: "Not around each element"
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/continuation-outlines-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/continuation-outlines-expected.txt
new file mode 100644
index 0000000..b0df04f
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/continuation-outlines-expected.txt
@@ -0,0 +1,52 @@
+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,16) size 784x566
+      RenderBlock {DIV} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 148x19
+          text run at (0,0) width 148: "Outline ring painting test."
+      RenderBlock {DIV} at (0,36) size 784x99
+        RenderBlock (anonymous) at (0,0) size 784x20
+          RenderInline {SPAN} at (0,0) size 95x19
+            RenderText {#text} at (0,0) size 95x19
+              text run at (0,0) width 95: "Content before."
+        RenderBlock (anonymous) at (0,38) size 784x23
+          RenderBlock {H3} at (0,0) size 784x23
+            RenderText {#text} at (0,0) size 146x22
+              text run at (0,0) width 146: "Bold with margin."
+        RenderBlock (anonymous) at (0,79) size 784x20
+          RenderInline {SPAN} at (0,0) size 79x19
+            RenderText {#text} at (0,0) size 79x19
+              text run at (0,0) width 79: "Content after"
+      RenderBlock {DIV} at (0,153) size 784x61
+        RenderBlock (anonymous) at (0,0) size 784x0
+          RenderInline {SPAN} at (0,0) size 0x0
+        RenderBlock (anonymous) at (0,0) size 784x23
+          RenderBlock {H3} at (0,0) size 784x23
+            RenderText {#text} at (0,0) size 151x22
+              text run at (0,0) width 151: "No content before."
+        RenderBlock (anonymous) at (0,41) size 784x20
+          RenderInline {SPAN} at (0,0) size 83x19
+            RenderText {#text} at (0,0) size 83x19
+              text run at (0,0) width 83: "Content after."
+      RenderBlock {DIV} at (0,230) size 784x61
+        RenderBlock (anonymous) at (0,0) size 784x20
+          RenderInline {SPAN} at (0,0) size 91x19
+            RenderText {#text} at (0,0) size 91x19
+              text run at (0,0) width 91: "Content before"
+        RenderBlock (anonymous) at (0,38) size 784x23
+          RenderBlock {H3} at (0,0) size 784x23
+            RenderText {#text} at (0,0) size 175x22
+              text run at (0,0) width 175: "But No Content After"
+        RenderBlock (anonymous) at (0,79) size 784x0
+          RenderInline {SPAN} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,309) size 784x23
+        RenderBlock (anonymous) at (0,0) size 784x0
+          RenderInline {SPAN} at (0,0) size 0x0
+        RenderBlock (anonymous) at (0,0) size 784x23
+          RenderBlock {H3} at (0,0) size 784x23
+            RenderText {#text} at (0,0) size 218x22
+              text run at (0,0) width 218: "No content before or after."
+        RenderBlock (anonymous) at (0,41) size 784x0
+          RenderInline {SPAN} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/continuation-outlines-with-layers-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/continuation-outlines-with-layers-expected.txt
new file mode 100644
index 0000000..b4dbce1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/inline/continuation-outlines-with-layers-expected.txt
@@ -0,0 +1,52 @@
+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,16) size 784x566
+      RenderBlock {DIV} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 148x19
+          text run at (0,0) width 148: "Outline ring painting test."
+      RenderBlock {DIV} at (0,36) size 784x99
+        RenderBlock (anonymous) at (0,0) size 784x20
+        RenderBlock (anonymous) at (0,38) size 784x23
+          RenderBlock {H3} at (0,0) size 784x23
+            RenderText {#text} at (0,0) size 146x22
+              text run at (0,0) width 146: "Bold with margin."
+        RenderBlock (anonymous) at (0,79) size 784x20
+      RenderBlock {DIV} at (0,153) size 784x61
+        RenderBlock (anonymous) at (0,0) size 784x0
+        RenderBlock (anonymous) at (0,0) size 784x23
+          RenderBlock {H3} at (0,0) size 784x23
+            RenderText {#text} at (0,0) size 151x22
+              text run at (0,0) width 151: "No content before."
+        RenderBlock (anonymous) at (0,41) size 784x20
+      RenderBlock {DIV} at (0,230) size 784x61
+        RenderBlock (anonymous) at (0,0) size 784x20
+        RenderBlock (anonymous) at (0,38) size 784x23
+          RenderBlock {H3} at (0,0) size 784x23
+            RenderText {#text} at (0,0) size 175x22
+              text run at (0,0) width 175: "But No Content After"
+        RenderBlock (anonymous) at (0,79) size 784x0
+      RenderBlock {DIV} at (0,309) size 784x23
+        RenderBlock (anonymous) at (0,0) size 784x0
+        RenderBlock (anonymous) at (0,0) size 784x23
+          RenderBlock {H3} at (0,0) size 784x23
+            RenderText {#text} at (0,0) size 218x22
+              text run at (0,0) width 218: "No content before or after."
+        RenderBlock (anonymous) at (0,41) size 784x0
+layer at (8,52) size 95x19
+  RenderInline (relative positioned) {SPAN} at (0,0) size 95x19
+    RenderText {#text} at (0,0) size 95x19
+      text run at (0,0) width 95: "Content before."
+layer at (8,131) size 79x19
+  RenderInline (relative positioned) {SPAN} at (0,0) size 79x19
+    RenderText {#text} at (0,0) size 79x19
+      text run at (0,0) width 79: "Content after"
+layer at (8,210) size 83x19
+  RenderInline (relative positioned) {SPAN} at (0,0) size 83x19
+    RenderText {#text} at (0,0) size 83x19
+      text run at (0,0) width 83: "Content after."
+layer at (8,246) size 91x19
+  RenderInline (relative positioned) {SPAN} at (0,0) size 91x19
+    RenderText {#text} at (0,0) size 91x19
+      text run at (0,0) width 91: "Content before"
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/focus-ring-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/focus-ring-expected.txt
new file mode 100644
index 0000000..899f316
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/repaint/focus-ring-expected.txt
@@ -0,0 +1,8 @@
+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,20) size 784x560
+      RenderBlock {DIV} at (20,0) size 100x100 [bgcolor=#FFFFE0]
+layer at (28,148) size 100x100 backgroundClip at (28,148) size 50x50 clip at (18,138) size 60x60 outlineClip at (18,138) size 60x60
+  RenderBlock (positioned) {DIV} at (28,148) size 100x100 [bgcolor=#FFFFE0]
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/outline-auto-empty-rects-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/outline-auto-empty-rects-expected.txt
index 766dae0..38a5cd7 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/outline-auto-empty-rects-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/outline-auto-empty-rects-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x534
-  RenderView at (0,0) size 800x534
-layer at (0,0) size 800x534
-  RenderBlock {HTML} at (0,0) size 800x534
-    RenderBody {BODY} at (8,8) size 784x513
+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 {DIV} at (0,0) size 784x16
         RenderBlock (anonymous) at (0,0) size 784x0
           RenderInline {SPAN} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/outline-auto-location-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/outline-auto-location-expected.txt
index 3745a19..5c2f1d7 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/outline-auto-location-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/css/outline-auto-location-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x534
-  RenderView at (0,0) size 800x534
-layer at (0,0) size 800x534
-  RenderBlock {HTML} at (0,0) size 800x534
-    RenderBody {BODY} at (8,20) size 784x494
+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,20) size 784x560
       RenderBlock {DIV} at (20,0) size 744x56 [bgcolor=#ADD8E6]
         RenderBlock {P} at (0,0) size 744x20
           RenderText {#text} at (0,0) size 296x19
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/continuation-outlines-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/continuation-outlines-expected.txt
index 1de485a..b0df04f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/continuation-outlines-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/continuation-outlines-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x534
-  RenderView at (0,0) size 800x534
-layer at (0,0) size 800x534
-  RenderBlock {HTML} at (0,0) size 800x534
-    RenderBody {BODY} at (8,16) size 784x500
+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,16) size 784x566
       RenderBlock {DIV} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 148x19
           text run at (0,0) width 148: "Outline ring painting test."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/continuation-outlines-with-layers-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/continuation-outlines-with-layers-expected.txt
index 0f99a88..b4dbce1 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/continuation-outlines-with-layers-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/continuation-outlines-with-layers-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x534
-  RenderView at (0,0) size 800x534
-layer at (0,0) size 800x534
-  RenderBlock {HTML} at (0,0) size 800x534
-    RenderBody {BODY} at (8,16) size 784x500
+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,16) size 784x566
       RenderBlock {DIV} at (0,0) size 784x20
         RenderText {#text} at (0,0) size 148x19
           text run at (0,0) width 148: "Outline ring painting test."
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/focus-ring-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/focus-ring-expected.txt
index 70b05a4..899f316 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/focus-ring-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/repaint/focus-ring-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x534
-  RenderView at (0,0) size 800x534
-layer at (0,0) size 800x534
-  RenderBlock {HTML} at (0,0) size 800x534
-    RenderBody {BODY} at (8,20) size 784x494
+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,20) size 784x560
       RenderBlock {DIV} at (20,0) size 100x100 [bgcolor=#FFFFE0]
 layer at (28,148) size 100x100 backgroundClip at (28,148) size 50x50 clip at (18,138) size 60x60 outlineClip at (18,138) size 60x60
   RenderBlock (positioned) {DIV} at (28,148) size 100x100 [bgcolor=#FFFFE0]