Webkit merge from 43587:43637.

Tests failing due to upstream r43604, but abarth with investigate.

Otherwise, just some new baselines.

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


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

9 files changed, 19 insertions, 2 deletions

diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.checksum
new file mode 100644
index 0000000..3a2167d
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.checksum
@@ -0,0 +1 @@
+22039ae9b05bd252e51732a43555e27c
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.png
new file mode 100644
index 0000000..c160660
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.checksum
new file mode 100755
index 0000000..c9f512e
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.checksum
@@ -0,0 +1 @@
+dc99f174114f734d657f699b4fc6b271
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.png
new file mode 100755
index 0000000..cf6bfbb
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.txt
new file mode 100755
index 0000000..11909e3
--- /dev/null
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/no-inherited-dashed-stroke-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600

+  RenderView at (0,0) size 800x600

+layer at (0,0) size 800x169

+  RenderBlock {html} at (0,0) size 800x169

+    RenderBody {body} at (8,8) size 784x153

+      RenderBlock {div} at (0,0) size 784x48 [border: (4px dotted #000000)]

+        RenderText {#text} at (4,4) size 410x19

+          text run at (4,4) width 410: "The SVG rect below this should have a solid red stroke and blue fill."

+        RenderBR {br} at (414,4) size 0x19

+        RenderText {#text} at (4,24) size 291x19

+          text run at (4,24) width 291: "https://bugs.webkit.org/show_bug.cgi?id=25738"

+      RenderBlock (anonymous) at (0,48) size 784x105

+        RenderSVGRoot {svg} at (5.50,53.50) size 105x105

+          RenderPath {rect} at (5.50,53.50) size 105x105 [stroke={[type=SOLID] [color=#FF0000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,0.00 L100.00,0.00 L100.00,100.00 L0.00,100.00 Z"]

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

diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/animated-path-inside-transformed-html-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/animated-path-inside-transformed-html-expected.checksum
index a6257df..96b4f6e 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/animated-path-inside-transformed-html-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/animated-path-inside-transformed-html-expected.checksum
@@ -1 +1 @@
-5933707f2ccfadb2c44e900e903ebc61
\ No newline at end of file
+75d5eba5f1dcf9031cd8c2f35060cc7d
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/animated-path-inside-transformed-html-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/animated-path-inside-transformed-html-expected.png
index a2747e5..3054988 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/animated-path-inside-transformed-html-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/animated-path-inside-transformed-html-expected.png
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html-expected.checksum
index 02cddf4..44552d7 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html-expected.checksum
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html-expected.checksum
@@ -1 +1 @@
-6e6f9852ec74d5c4e57e129411f45cef
\ No newline at end of file
+c2f589aa9e12e6b57a915bdd67ab07eb
\ No newline at end of file
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
index 858c71b..bfca2a6 100644..100755
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html-expected.png
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/transforms/text-with-pattern-inside-transformed-html-expected.png