Fixing two layout tests.

One new test (fast/runin/002.html) was added and 
needed a baseline since the only difference is in
font metrics.

Expectations for fast/inline/percentage-margins 
changed upstream. The change log just says it is 
rebaselined "due to recent changes", but when I 
compare the changes they are identical (left side 
moves 4 pixels to the left and the right moves 8 
pixels to the left).

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

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

7 files changed, 23 insertions, 7 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.checksum
index ae1ff09..b54b58e 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.checksum
@@ -1 +1 @@
-557abe5b2d2d3c3b58ff334043a371c5
\ No newline at end of file
+28c438fc7c9ebdd161a34e27b7f4e949
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.png
index 3114c0f..4d6a9f8 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.txt
index f86a661..60272bea 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/inline/percentage-margins-expected.txt
@@ -4,8 +4,8 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderInline {SPAN} at (0,0) size 252x19
-        RenderText {#text} at (200,0) size 252x19
-          text run at (200,0) width 252: "This span has 25% margins on either side."
-      RenderText {#text} at (652,0) size 30x19
-        text run at (652,0) width 30: "See?"
+        RenderText {#text} at (196,0) size 252x19
+          text run at (196,0) width 252: "This span has 25% margins on either side."
+      RenderText {#text} at (644,0) size 30x19
+        text run at (644,0) width 30: "See?"
       RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.checksum
new file mode 100644
index 0000000..8f6ebe1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.checksum
@@ -0,0 +1 @@
+ec583ddf4cb142745f95ac82c24907c8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.png
new file mode 100644
index 0000000..d7c087e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.txt
new file mode 100644
index 0000000..a3616cd
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/runin/002-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x52
+  RenderBlock {HTML} at (0,0) size 800x52
+    RenderBody {BODY} at (8,16) size 784x20
+      RenderBlock {DL} at (0,0) size 784x20
+        RenderBlock {DD} at (40,0) size 744x20
+          RenderInline (run-in) {DT} at (0,0) size 35x19
+            RenderText {#text} at (0,0) size 32x19
+              text run at (0,0) width 32: "Term"
+            RenderInline (generated) at (0,0) size 3x19
+              RenderText at (32,0) size 3x19
+                text run at (32,0) width 3: ":"
+          RenderText {#text} at (35,0) size 57x19
+            text run at (35,0) width 57: "Definition"
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index 12dd90c..c16b7e9 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -323,7 +323,9 @@ DEFER WIN LINUX : LayoutTests/fast/inline/dirtyLinesForInline.html = PASS FAIL
 LINUX : LayoutTests/fast/compact/001.html = FAIL
 LINUX : LayoutTests/fast/compact/002.html = FAIL
 DEFER LINUX : LayoutTests/fast/dom/clientWidthAfterDocumentIsRemoved.html = FAIL
+MAC LINUX : LayoutTests/fast/inline/percentage-margins.html = FAIL
 MAC : LayoutTests/fast/parser/open-comment-in-textarea.html = FAIL
+LINUX : LayoutTests/fast/runin/002.html = FAIL
 LINUX : LayoutTests/fast/table/form-with-table-style.html = FAIL
 // Font differences, requiring overriden metrics, not a real bug, not fixing for Beta
 DEFER LINUX : LayoutTests/fast/text/international/bidi-AN-after-L.html = FAIL
@@ -1779,8 +1781,6 @@ WIN : LayoutTests/svg/text/text-fonts-01-t.svg = FAIL
 WIN : LayoutTests/svg/text/text-fonts-02-t.svg = FAIL
 // Misc failures:
 WIN LINUX : LayoutTests/fast/forms/option-mouseevents.html = FAIL
-LayoutTests/fast/inline/percentage-margins.html = FAIL
-WIN LINUX : LayoutTests/fast/runin/002.html = FAIL
 MAC : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL
 LINUX : LayoutTests/svg/W3C-SVG-1.1/types-basicDOM-01-b.svg = FAIL
 LINUX : LayoutTests/svg/custom/getTransformToElement.svg = FAIL