summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authordglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 18:18:23 +0000
committerdglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 18:18:23 +0000
commitf637b4be2949fd79e038c581f51b9be51c0b30ef (patch)
treea4442c4ea1698d33352ba754de9a5ccb943a8051 /webkit
parentbc6b07f245717b49c89000f0e3eb755e0e9fa58e (diff)
downloadchromium_src-f637b4be2949fd79e038c581f51b9be51c0b30ef.zip
chromium_src-f637b4be2949fd79e038c581f51b9be51c0b30ef.tar.gz
chromium_src-f637b4be2949fd79e038c581f51b9be51c0b30ef.tar.bz2
Rebaseline svg/custom/foreignObject-crash-on-hover.xml.
TBR=senorblanco TEST=none BUG=10285 Review URL: http://codereview.chromium.org/536079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.pngbin5837 -> 10407 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum2
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.pngbin5845 -> 5846 bytes
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.txt6
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt6
6 files changed, 6 insertions, 10 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum
index b6f5d4b..ddbf70f 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum
@@ -1 +1 @@
-40c9df68d99ef2c06a37a404d4fadc62 \ No newline at end of file
+505090cd54fc741efaecf818198a6241 \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.png
index f6c2426..20e46ac 100644
--- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum
index d963430..992c783 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.checksum
@@ -1 +1 @@
-e8bad083a07c2695e0681659da5ff5f5 \ No newline at end of file
+190fcde4dde4f522fb8ab4a686ac97cf \ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.png
index 4e11a13..dc0855f 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.png
Binary files differ
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.txt
index 6da3cce..ef2616d 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/foreignObject-crash-on-hover-expected.txt
@@ -9,6 +9,8 @@ layer at (0,0) size 800x800
RenderText {#text} at (0,0) size 106x19
text run at (0,0) width 106: "Absolute Lineto"
RenderBR {html:br} at (106,0) size 0x19
- RenderSVGInlineText {#text} at (0,20) size 239x39
+ RenderText {#text} at (0,20) size 239x39
+ text run at (0,20) width 239: "<path d=\"M50,80 L250,80 150,280 z\""
+ text run at (0,40) width 173: "style=\"fill:red; stroke:blue;\"/>"
RenderPath {path} at (99.19,129.50) size 201.62x201.62 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M50.00,80.00 L250.00,80.00 L150.00,280.00 Z"]
-caret: position 7 of child 3 {#text} of child 5 {foreignObject} of child 1 {g} of child 1 {svg} of document
+caret: position 67 of child 3 {#text} of child 5 {foreignObject} of child 1 {g} of child 1 {svg} of document
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 6eb416b..88b32b5 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -899,12 +899,6 @@ BUG23463 WIN LINUX : svg/W3C-SVG-1.1/struct-image-02-b.svg = IMAGE+TEXT
// Merge 39744:39829 - regression
BUG10284 MAC : svg/custom/path-bad-data.svg = FAIL
-// Upstream dumprendertree changes caused the expected to change.
-// Now our baseline is out of date, and we differ from Mac expected on the
-// caret position in the last line of the text output.
-BUG10285 WIN LINUX RELEASE : svg/custom/foreignObject-crash-on-hover.xml = FAIL
-BUG10285 LINUX WIN DEBUG : svg/custom/foreignObject-crash-on-hover.xml = FAIL
-
// Merge 39744:39913? - regressions
BUG10286 LINUX : svg/W3C-SVG-1.1/animate-elem-02-t.svg = FAIL