More Skia r376 rebaselines.

BUG=none
TEST=none

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

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

5 files changed, 50 insertions, 6 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt
index 8b13789..c8e965d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/iframe-option-crash-expected.txt
@@ -1 +1,17 @@
-
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x195
+  RenderBlock {html} at (0,0) size 800x195
+    RenderBody {body} at (8,8) size 784x179
+      RenderBlock {div} at (0,0) size 784x20
+        RenderText {#text} at (0,0) size 407x19
+          text run at (0,0) width 407: "If no crash while painting, the test passed (requires pixel test mode)."
+      RenderBlock (anonymous) at (0,20) size 784x159
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderPartObject {iframe} at (0,0) size 304x154 [border: (2px inset #000000)]
+          layer at (0,0) size 300x150
+            RenderView at (0,0) size 300x150
+          layer at (0,0) size 300x150
+            RenderBlock {HTML} at (0,0) size 300x150
+              RenderBody {BODY} at (8,8) size 284x134
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-on-image-file-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-on-image-file-expected.txt
index 8b13789..e165660 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-on-image-file-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/viewsource-on-image-file-expected.txt
@@ -1 +1,32 @@
-
+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 423x19
+          text run at (0,0) width 423: "You should see 'hello world' in the frame below in 'view source' mode."
+      RenderBlock {HR} at (0,36) size 784x2 [border: (1px inset #000000)]
+      RenderBlock (anonymous) at (0,46) size 784x154
+        RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
+          layer at (0,0) size 300x150
+            RenderView at (0,0) size 300x150
+          layer at (0,0) size 300x150 layerType: background only
+          layer at (0,0) size 31x150
+            RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 31x150 [bgcolor=#F0F0F0] [border: (1px solid #BBBBBB) none]
+          layer at (0,0) size 300x150 layerType: foreground only
+            RenderBlock {HTML} at (0,0) size 300x150
+              RenderBody {BODY} at (0,0) size 300x150
+                RenderTable {TABLE} at (0,0) size 300x16
+                  RenderTableSection {TBODY} at (0,0) size 300x16
+                    RenderTableRow {TR} at (0,0) size 300x16
+                      RenderTableCell {TD} at (0,3) size 31x12 [color=#808080] [bgcolor=#F0F0F0] [border: none (1px solid #BBBBBB) none] [r=0 c=0 rs=1 cs=1]
+                        RenderInline (generated) at (0,0) size 5x12
+                          RenderCounter at (21,0) size 5x12
+                            text run at (21,0) width 5: "1"
+                      RenderTableCell {TD} at (31,0) size 269x16 [r=0 c=1 rs=1 cs=1]
+                        RenderText {#text} at (5,0) size 88x16
+                          text run at (5,0) width 88: "hello world"
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.checksum
index 877198b..18f7d54 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.checksum
@@ -1 +1 @@
-6ac696875ab521f79dd5cebe1b80fca6
\ No newline at end of file
+13b11f1ea731350c3ffece95ca0fa9d8
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.png
index 0ef28ce..74604be 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/text/basic/006-expected.png
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index c1c4213..367820b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3056,10 +3056,7 @@ BUG23901 WIN LINUX : LayoutTests/fast/box-shadow/inset.html = FAIL
 // Bad news:  1883 failures on Windows, 1854 failures on Linux.
 // Good news:  Minor pixel diffs; will rebaseline.
 
-BUG_SENORBLANCO WIN : LayoutTests/fast/frames/iframe-option-crash.xhtml = FAIL
-BUG_SENORBLANCO WIN : LayoutTests/fast/frames/viewsource-on-image-file.html = FAIL
 BUG_SENORBLANCO WIN : LayoutTests/fast/text/atsui-spacing-features.html = FAIL
-BUG_SENORBLANCO WIN-XP : LayoutTests/fast/text/basic/006.html = FAIL
 BUG_SENORBLANCO WIN : LayoutTests/fast/text/cg-vs-atsui.html = FAIL
 BUG_SENORBLANCO WIN : LayoutTests/svg/text/text-fonts-01-t.svg = FAIL
 BUG_SENORBLANCO WIN : LayoutTests/svg/text/text-intro-05-t.svg = FAIL