standalone-image-drag-to-editable.html:

I modified this test upstream so we could do the file drag/drop into
an iframe.  There are still font size differences and the image that
gets dropped in the iframe has a size of 0x0 because it hasn't loaded
by the time the render tree is snapshotted.  It works fine in chrome
when run manually, so just rebaseline with the 0x0 image size (the
test still passes: it drops the image).

invalid-syntax-for-function.html:
The exception text changed from saying line 1 to line 2 (exception in a inline body onload handler).  Not sure why it changed, but seems harmless.

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

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

6 files changed, 35 insertions, 8 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/invalid-syntax-for-function-expected.txt b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/invalid-syntax-for-function-expected.txt
index 73c4816..4aa051a 100644
--- a/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/invalid-syntax-for-function-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-mac/LayoutTests/fast/js/invalid-syntax-for-function-expected.txt
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token ILLEGAL
+CONSOLE MESSAGE: line 2: Uncaught SyntaxError: Unexpected token ILLEGAL
 This test ensures we don't crash when we are given garbage for an attribute expecting a function.
 https://bugs.webkit.org/show_bug.cgi?id=19025
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.checksum
new file mode 100755
index 0000000..cb4172d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.checksum
@@ -0,0 +1 @@
+a1ce3dd6d59cb6ca1074e6732e3f7318
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.png
new file mode 100755
index 0000000..17a2dd1
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.txt
new file mode 100755
index 0000000..b75bb65
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/events/standalone-image-drag-to-editable-expected.txt
@@ -0,0 +1,29 @@
+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

+    RenderFrameSet {FRAMESET} at (0,0) size 800x600

+      RenderFrame {FRAME} at (0,0) size 800x100

+        layer at (0,0) size 785x102

+          RenderView at (0,0) size 785x100

+        layer at (0,0) size 785x102

+          RenderBlock {HTML} at (0,0) size 785x102

+            RenderBody {BODY} at (0,0) size 785x102

+              RenderBlock {DIV} at (0,0) size 785x102 [border: (1px solid #000000)]

+                RenderText {#text} at (1,1) size 657x19

+                  text run at (1,1) width 657: "This layout test is checks that we don't crash when a stand alone image is dragged into a content editable div. "

+                RenderBR {BR} at (658,16) size 0x0

+                RenderInline {A} at (0,0) size 146x19 [color=#0000EE]

+                  RenderText {#text} at (1,21) size 20x19

+                    text run at (1,21) width 20: "rda"

+                  RenderImage {IMG} at (21,36) size 0x0

+                  RenderText {#text} at (21,21) size 126x19

+                    text run at (21,21) width 126: "r://problem/5021127"

+                RenderText {#text} at (0,0) size 0x0

+      RenderFrame {FRAME} at (0,106) size 800x100

+        layer at (0,0) size 800x100

+          RenderView at (0,0) size 800x100

+        layer at (0,0) size 800x100

+          RenderBlock {HTML} at (0,0) size 800x100

+            RenderBody {BODY} at (0,0) size 800x100

+              RenderImage {IMG} at (0,0) size 25x25

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/invalid-syntax-for-function-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/invalid-syntax-for-function-expected.txt
index 73c4816..4aa051a 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/invalid-syntax-for-function-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/invalid-syntax-for-function-expected.txt
@@ -1,3 +1,3 @@
-CONSOLE MESSAGE: line 1: Uncaught SyntaxError: Unexpected token ILLEGAL
+CONSOLE MESSAGE: line 2: Uncaught SyntaxError: Unexpected token ILLEGAL
 This test ensures we don't crash when we are given garbage for an attribute expecting a function.
 https://bugs.webkit.org/show_bug.cgi?id=19025
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index f1b3798..9e44ed09 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1720,9 +1720,9 @@ DEFER : LayoutTests/http/tests/security/feed-urls-from-remote.html = PASS FAIL
 // support. Enable once we turn on DOM_STORAGE.
 DEFER SKIP : LayoutTests/http/tests/navigation/post-goback-repost-policy.html = TIMEOUT
 
-// Bug 992930: In our port, we prevent the loading of file:/// URLs from
-// data: URLs.  We should try to fix the test to not use a data: URL.
-DEFER : LayoutTests/fast/events/standalone-image-drag-to-editable.html = FAIL
+// Probably just needs to be rebaselined.  We generate the png before the
+// image in the iframe loads so its dimensions are 0x0.
+DEFER LINUX MAC : LayoutTests/fast/events/standalone-image-drag-to-editable.html = FAIL
 
 // Missing expected results.  Probably going to fail anyway, since
 // chromium does not support webarchive format.
@@ -2256,9 +2256,6 @@ SKIP : LayoutTests/platform/mac/fast/text/international/Geeza-Pro-vertical-metri
 // Started failing when test_fixable got merged with test_ignored.
 LINUX DEBUG : chrome/fast/dom/htmliframeelement-document.html = FAIL
 
-// Merge 41860:41906 Regressions
-WIN LINUX MAC : LayoutTests/fast/js/invalid-syntax-for-function.html = FAIL
-
 // Merge 41860:41906 New tests
 DEFER WIN LINUX : LayoutTests/fast/replaced/percent-height-in-anonymous-block-in-table.html = FAIL
 DEFER WIN LINUX : LayoutTests/http/tests/misc/generated-content-inside-table.html = FAIL