summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryosin <yosin@chromium.org>2016-01-20 18:24:46 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-21 02:26:05 +0000
commit67ca6c43748b063b166f05223a678d9d442762b3 (patch)
treeb941d6741c541f7d7c3ccb95a7776dbc317f7fd4
parentfeb62581459311e79f67a0534b4d0a71834a728f (diff)
downloadchromium_src-67ca6c43748b063b166f05223a678d9d442762b3.zip
chromium_src-67ca6c43748b063b166f05223a678d9d442762b3.tar.gz
chromium_src-67ca6c43748b063b166f05223a678d9d442762b3.tar.bz2
Make apply-inline-style-to-element-with-no-renderer-crash.html to use w3c test harness
Because of apply-inline-style-to-element-with-no-renderer-crash.html is crash testing, we don't need to check layout tree and pixels. This patch utilizes w3c test in apply-inline-style-to-element-with-no-renderer-crash.html to reduce resource usages. This patch also moves location of apply-inline-style-to-element-with-no-renderer-crash.html to "editing/execCommand/" to align with other tests. BUG=n/a TEST=n/a; no behavior changes Review URL: https://codereview.chromium.org/1604163002 Cr-Commit-Position: refs/heads/master@{#370578}
-rw-r--r--third_party/WebKit/LayoutTests/editing/execCommand/apply-inline-style-to-element-with-no-renderer-crash.html (renamed from third_party/WebKit/LayoutTests/editing/apply-inline-style-to-element-with-no-renderer-crash.html)24
-rw-r--r--third_party/WebKit/LayoutTests/platform/mac/editing/apply-inline-style-to-element-with-no-renderer-crash-expected.pngbin3289 -> 0 bytes
-rw-r--r--third_party/WebKit/LayoutTests/platform/win/editing/apply-inline-style-to-element-with-no-renderer-crash-expected.pngbin2840 -> 0 bytes
3 files changed, 14 insertions, 10 deletions
diff --git a/third_party/WebKit/LayoutTests/editing/apply-inline-style-to-element-with-no-renderer-crash.html b/third_party/WebKit/LayoutTests/editing/execCommand/apply-inline-style-to-element-with-no-renderer-crash.html
index 30cfc71..3cba805 100644
--- a/third_party/WebKit/LayoutTests/editing/apply-inline-style-to-element-with-no-renderer-crash.html
+++ b/third_party/WebKit/LayoutTests/editing/execCommand/apply-inline-style-to-element-with-no-renderer-crash.html
@@ -1,7 +1,19 @@
+<!DOCTYPE html>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<svg>
+ <text>
+ <tspan id="tspan">
+ <tspan id="tspan2">%uef5f%u9776%u638a</tspan>
+ <textPath id="textPath"></textPath>
+ </tspan>
+ </text>
+</svg>
+<div id="log"></div>
<script>
// crbug.com/339185: If we create an anchor element using execCommand('CreateLink') in an SVG namespace it won't get a renderer because the command will create
// an HTML rather than an SVG anchor. Our subsequent attempt to apply an inline style on the should fail rather than result in a crash.
-onload = function() {
+test(function() {
tspan = document.getElementById("tspan");
tspan2 = document.getElementById("tspan2");
textPath = document.getElementById("textPath");
@@ -26,13 +38,5 @@ onload = function() {
document.execCommand('Undo');
document.designMode='on';
document.execCommand('italic');
-}
+});
</script>
-<svg>
- <text>
- <tspan id="tspan">
- <tspan id="tspan2">%uef5f%u9776%u638a</tspan>
- <textPath id="textPath"></textPath>
- </tspan>
- </text>
-</svg>
diff --git a/third_party/WebKit/LayoutTests/platform/mac/editing/apply-inline-style-to-element-with-no-renderer-crash-expected.png b/third_party/WebKit/LayoutTests/platform/mac/editing/apply-inline-style-to-element-with-no-renderer-crash-expected.png
deleted file mode 100644
index f3d974c..0000000
--- a/third_party/WebKit/LayoutTests/platform/mac/editing/apply-inline-style-to-element-with-no-renderer-crash-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/editing/apply-inline-style-to-element-with-no-renderer-crash-expected.png b/third_party/WebKit/LayoutTests/platform/win/editing/apply-inline-style-to-element-with-no-renderer-crash-expected.png
deleted file mode 100644
index b5daa85..0000000
--- a/third_party/WebKit/LayoutTests/platform/win/editing/apply-inline-style-to-element-with-no-renderer-crash-expected.png
+++ /dev/null
Binary files differ