Diff
Modified: trunk/LayoutTests/ChangeLog (126287 => 126288)
--- trunk/LayoutTests/ChangeLog 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/ChangeLog 2012-08-22 10:59:39 UTC (rev 126288)
@@ -1,3 +1,24 @@
+2012-08-22 Shinya Kawanaka <[email protected]>
+
+ Test and test expectation of Shadow DOM for button should be fixed.
+ https://bugs.webkit.org/show_bug.cgi?id=94674
+
+ Reviewed by Hajime Morita.
+
+ Now that the HTMLButtonElement was AuthroShadowDOM-ready, it's time to update the previous
+ failing tests for AuthroShadowDOM for button elements.
+
+ I've updated the failing tests to follow the current implementation and updated the test expectations.
+
+ * fast/dom/shadow/shadowdom-for-button-complex-shadow-expected.html:
+ * fast/dom/shadow/shadowdom-for-button-complex-shadow.html:
+ * fast/dom/shadow/shadowdom-for-button-only-shadow-expected.html:
+ * fast/dom/shadow/shadowdom-for-button-only-shadow.html:
+ * fast/dom/shadow/shadowdom-for-button-without-shadow-expected.html:
+ * fast/dom/shadow/shadowdom-for-button-without-shadow.html:
+ * platform/chromium/TestExpectations:
+ * platform/efl/TestExpectations:
+
2012-08-22 Simon Hausmann <[email protected]>
[Qt] REGRESSION(r125428): fast/profiler/nested-start-and-stop-profiler.html fails
Modified: trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-complex-shadow-expected.html (126287 => 126288)
--- trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-complex-shadow-expected.html 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-complex-shadow-expected.html 2012-08-22 10:59:39 UTC (rev 126288)
@@ -1,10 +1,12 @@
<!DOCTYPE html>
+<html>
+<body>
<script src=""
<p>A mixed case of a shadow element and content element.</p>
<form>
- button<div style="margin: 20px">
- <button></button>
- </div>
- <input id="submit" type="submit" value="Submit">
+ <button><span>button 2</span>button 1</button>
</form>
+
+</body>
+</html>
Modified: trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-complex-shadow.html (126287 => 126288)
--- trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-complex-shadow.html 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-complex-shadow.html 2012-08-22 10:59:39 UTC (rev 126288)
@@ -1,14 +1,18 @@
<!DOCTYPE html>
+<html>
+<body>
<script src=""
<p>A mixed case of a shadow element and content element.</p>
<form>
- <button id="host">button</button>
- <input id="submit" type="submit" value="Submit">
+ <button id="host">button 1<span>button 2</span></button>
</form>
<script>
var host = document.getElementById('host');
var shadowRoot = new WebKitShadowRoot(host);
-shadowRoot.innerHTML = "<content></content><div style='margin: 20px'><shadow></shadow></div>"
+shadowRoot.innerHTML = '<div><content select="span"></content><shadow></shadow></div>'
</script>
+
+</body>
+</html>
Modified: trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-only-shadow-expected.html (126287 => 126288)
--- trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-only-shadow-expected.html 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-only-shadow-expected.html 2012-08-22 10:59:39 UTC (rev 126288)
@@ -1,8 +1,12 @@
<!DOCTYPE html>
+<html>
+<body>
<script src=""
<p>When the AuthorShadowDOM has only a shadow element, this should be rendered like no Shadow DOM is added.</p>
<form>
- <button id="host">button</button>
- <input id="submit" type="submit" value="Submit">
+ <button>button</button>
</form>
+
+</body>
+</html>
Modified: trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-only-shadow.html (126287 => 126288)
--- trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-only-shadow.html 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-only-shadow.html 2012-08-22 10:59:39 UTC (rev 126288)
@@ -1,10 +1,11 @@
<!DOCTYPE html>
+<html>
+<body>
<script src=""
<p>When the AuthorShadowDOM has only a shadow element, this should be rendered like no Shadow DOM is added.</p>
-<form id="form" action=""
+<form>
<button id="host">button</button>
- <input id="submit" type="submit" value="Submit">
</form>
<script>
@@ -12,3 +13,5 @@
var shadowRoot = new WebKitShadowRoot(host);
shadowRoot.innerHTML = "<shadow></shadow>"
</script>
+</body>
+</html>
Modified: trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-without-shadow-expected.html (126287 => 126288)
--- trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-without-shadow-expected.html 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-without-shadow-expected.html 2012-08-22 10:59:39 UTC (rev 126288)
@@ -1,8 +1,12 @@
<!DOCTYPE html>
+<html>
+<body>
<script src=""
-<p>When the AuthorShadowDOM does not have a shadow element, this should be rendered like div.</p>
+<p>When the AuthorShadowDOM does not have a shadow element, the content should not be rendered.</p>
<form>
- <div style="display: inline-block: width: 20px; height: 20px"></div>
- <input id="submit" type="submit" value="Submit">
+ <button></button>
</form>
+
+</body>
+</html>
Modified: trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-without-shadow.html (126287 => 126288)
--- trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-without-shadow.html 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/fast/dom/shadow/shadowdom-for-button-without-shadow.html 2012-08-22 10:59:39 UTC (rev 126288)
@@ -1,13 +1,17 @@
<!DOCTYPE html>
+<html>
+<body>
<script src=""
-<p>When the AuthorShadowDOM does not have a shadow element, this should be rendered like div.</p>
+<p>When the AuthorShadowDOM does not have a shadow element, the content should not be rendered.</p>
<form>
- <button id='host' style="display: inline-block; width: 20px; height: 20px; margin: 0; padding: 0; border: 0">foo bar</button>
- <input id="submit" type="submit" value="Submit">
+ <button id="host">something</button>
</form>
<script>
var host = document.getElementById('host');
var shadowRoot = new WebKitShadowRoot(host);
</script>
+
+</body>
+</html>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (126287 => 126288)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-22 10:59:39 UTC (rev 126288)
@@ -3243,9 +3243,6 @@
BUGWK90860 : fast/dom/shadow/shadowdom-for-object-without-shadow.html = IMAGE
BUGWK91485 : fast/dom/shadow/shadowdom-for-textarea-complex-shadow.html = IMAGE
BUGWK91485 : fast/dom/shadow/shadowdom-for-textarea-without-shadow.html = IMAGE
-BUGWK91486 : fast/dom/shadow/shadowdom-for-button-complex-shadow.html = IMAGE
-BUGWK91486 : fast/dom/shadow/shadowdom-for-button-only-shadow.html = IMAGE
-BUGWK91486 : fast/dom/shadow/shadowdom-for-button-without-shadow.html = IMAGE
BUGWK91487 : fast/dom/shadow/shadowdom-for-select-complex-shadow.html = IMAGE
BUGWK91487 : fast/dom/shadow/shadowdom-for-select-without-shadow.html = IMAGE
BUGWK91488 : fast/dom/shadow/shadowdom-for-output-only-shadow.html = IMAGE
Modified: trunk/LayoutTests/platform/efl/TestExpectations (126287 => 126288)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-08-22 10:42:10 UTC (rev 126287)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-08-22 10:59:39 UTC (rev 126288)
@@ -687,9 +687,6 @@
BUGWK91485 : fast/dom/shadow/shadowdom-for-textarea-complex-shadow.html = IMAGE
BUGWK91485 : fast/dom/shadow/shadowdom-for-textarea-only-shadow.html = IMAGE
BUGWK91485 : fast/dom/shadow/shadowdom-for-textarea-without-shadow.html = IMAGE
-BUGWK91486 : fast/dom/shadow/shadowdom-for-button-complex-shadow.html = IMAGE
-BUGWK91486 : fast/dom/shadow/shadowdom-for-button-only-shadow.html = IMAGE
-BUGWK91486 : fast/dom/shadow/shadowdom-for-button-without-shadow.html = IMAGE
BUGWK91487 : fast/dom/shadow/shadowdom-for-select-complex-shadow.html = IMAGE
BUGWK91487 : fast/dom/shadow/shadowdom-for-select-without-shadow.html = IMAGE
BUGWK91488 : fast/dom/shadow/shadowdom-for-output-only-shadow.html = IMAGE
