Modified: trunk/LayoutTests/ChangeLog (109314 => 109315)
--- trunk/LayoutTests/ChangeLog 2012-03-01 06:54:16 UTC (rev 109314)
+++ trunk/LayoutTests/ChangeLog 2012-03-01 07:10:42 UTC (rev 109315)
@@ -1,3 +1,15 @@
+2012-02-29 Shinya Kawanaka <[email protected]>
+
+ Unreviewed, rolling out r109309.
+ http://trac.webkit.org/changeset/109309
+ https://bugs.webkit.org/show_bug.cgi?id=80002
+
+ broke
+
+ * fast/dom/resources/shadow-test-driver.js:
+ (createContentWithSelect):
+ * fast/dom/shadow/content-element-move.html:
+
2012-02-29 Kentaro Hara <[email protected]>
Unreviewed, gardening.
Modified: trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js (109314 => 109315)
--- trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js 2012-03-01 06:54:16 UTC (rev 109314)
+++ trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js 2012-03-01 07:10:42 UTC (rev 109315)
@@ -61,11 +61,11 @@
return span;
}
-function createContentWithSelect(select, fallbackText) {
+function createContentWithSelect(select, fallback) {
var content = internals.createContentElement(document);
content.setAttribute('select', select);
- if (fallbackText)
- content.appendChild(createSpanWithText(fallbackText));
+ if (!fallback)
+ content.appendChild(createSpanWithText("FALLBACK"));
return content;
}
Modified: trunk/LayoutTests/fast/dom/shadow/content-element-move.html (109314 => 109315)
--- trunk/LayoutTests/fast/dom/shadow/content-element-move.html 2012-03-01 06:54:16 UTC (rev 109314)
+++ trunk/LayoutTests/fast/dom/shadow/content-element-move.html 2012-03-01 07:10:42 UTC (rev 109315)
@@ -22,7 +22,7 @@
root.innerHTML = "<span>LIGHT</span>";
// Create shadow tree.
- var content = createContentWithSelect('span', 'FALLBACK');
+ var content = createContentWithSelect('span');
var sr = internals.ensureShadowRoot(root);
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(content);
@@ -48,8 +48,8 @@
root.innerHTML = "<span class='c1'>LIGHT 1</span><span>LIGHT 2</span>";
// Create shadow tree.
- var content1 = createContentWithSelect('.c1', 'FALLBACK');
- var content2 = createContentWithSelect('span', 'FALLBACK');
+ var content1 = createContentWithSelect('.c1');
+ var content2 = createContentWithSelect('span');
var sr = internals.ensureShadowRoot(root);
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(content1);
@@ -77,8 +77,8 @@
root.innerHTML = "<span>LIGHT 1</span><span class='c1'>LIGHT 2</span>";
// Create shadow tree.
- var content1 = createContentWithSelect('.c1', 'FALLBACK');
- var content2 = createContentWithSelect('span', 'FALLBACK');
+ var content1 = createContentWithSelect('.c1');
+ var content2 = createContentWithSelect('span');
var sr = internals.ensureShadowRoot(root);
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(content1);
@@ -133,7 +133,7 @@
root.innerHTML = "<span>LIGHT</span>";
// Create shadow tree.
- var content = createContentWithSelect('span', 'FALLBACK');
+ var content = createContentWithSelect('span');
var sr = internals.ensureShadowRoot(root);
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(content);
@@ -159,7 +159,7 @@
root.innerHTML = "<span>LIGHT</span>";
// Create shadow tree.
- var content = createContentWithSelect('span', 'FALLBACK');
+ var content = createContentWithSelect('span');
var sr = internals.ensureShadowRoot(root);
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(content);
@@ -186,7 +186,7 @@
root.innerHTML = "<span>LIGHT 1</span><span class='c1'>LIGHT 2</span>";
// Create shadow tree.
- var content = createContentWithSelect('.c1', 'FALLBACK');
+ var content = createContentWithSelect('.c1');
var sr = internals.ensureShadowRoot(root);
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(content);
@@ -221,7 +221,7 @@
var f = (function(root, callIfDone) {
return function() {
- var content = createContentWithSelect('span', 'FALLBACK');
+ var content = createContentWithSelect('span');
var sr = internals.ensureShadowRoot(root);
sr.insertBefore(content, sr.lastChild);
document.getElementById('expect-container').innerHTML = "<div><span>BEFORE</span><SPAN>LIGHT</span><span>AFTER</span></div>";
@@ -247,8 +247,8 @@
var f = (function(root, callIfDone) {
return function() {
- var content1 = createContentWithSelect('.c2', 'FALLBACK');
- var content2 = createContentWithSelect('span', 'FALLBACK');
+ var content1 = createContentWithSelect('.c2');
+ var content2 = createContentWithSelect('span');
var sr = internals.ensureShadowRoot(root);
sr.insertBefore(content1, sr.lastChild);
sr.insertBefore(content2, sr.lastChild);
@@ -271,14 +271,14 @@
var mid = createSpanWithText("MID");
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(mid);
- sr.appendChild(createContentWithSelect('.c2', 'FALLBACK'));
+ sr.appendChild(createContentWithSelect('.c2'));
sr.appendChild(createSpanWithText("AFTER"));
document.getElementById('actual-container').appendChild(root);
var f = (function(root, mid, callIfDone) {
return function() {
- var content = createContentWithSelect('span', 'FALLBACK');
+ var content = createContentWithSelect('span');
var sr = internals.ensureShadowRoot(root);
sr.insertBefore(content, mid);
document.getElementById('expect-container').innerHTML =
@@ -298,8 +298,8 @@
// Create shadow tree.
var sr = internals.ensureShadowRoot(root);
- var content1 = createContentWithSelect('.c1', 'FALLBACK');
- var content2 = createContentWithSelect('span', 'FALLBACK');
+ var content1 = createContentWithSelect('.c1');
+ var content2 = createContentWithSelect('span');
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(content1);
sr.appendChild(content2);
@@ -336,7 +336,7 @@
// Create shadow tree in 'n1'
var sr = internals.ensureShadowRoot(n1);
- var content = createContentWithSelect('span', 'FALLBACK');
+ var content = createContentWithSelect('span');
sr.appendChild(createSpanWithText("BEFORE"));
sr.appendChild(content);
sr.appendChild(createSpanWithText("AFTER"));