Changeset 109309 in webkit

Timestamp:

Feb 29, 2012 9:57:05 PM (12 years ago)

Author:

shinyak@chromium.org

Message:

createContentWithSelect in shadow-test-driver.js is not intuitive.
​https://bugs.webkit.org/show_bug.cgi?id=80002

Reviewed by Hajime Morita.

createContentWithSelect takes an agument 'fallback', but it used to create a text node
if the argument is missing. This is not intuitive at all.

This patch changes the createContentWithSelect behavior to make it intuitive.

• fast/dom/resources/shadow-test-driver.js:

(createContentWithSelect):

• fast/dom/shadow/content-element-move.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/dom/resources/shadow-test-driver.js (modified) (1 diff)
• fast/dom/shadow/content-element-move.html (modified) (12 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-29  Shinya Kawanaka  <shinyak@chromium.org>
+
+        createContentWithSelect in shadow-test-driver.js is not intuitive.
+        https://bugs.webkit.org/show_bug.cgi?id=80002
+
+        Reviewed by Hajime Morita.
+
+        createContentWithSelect takes an agument 'fallback', but it used to create a text node
+        if the argument is missing. This is not intuitive at all.
+
+        This patch changes the createContentWithSelect behavior to make it intuitive.
+
+        * fast/dom/resources/shadow-test-driver.js:
+        (createContentWithSelect):
+        * fast/dom/shadow/content-element-move.html:
+
 2012-02-29  Erik Arvidsson  <arv@chromium.org>
 

trunk/LayoutTests/fast/dom/resources/shadow-test-driver.js

@@ -62 +62 @@
 }
 
-function createContentWithSelect(select, fallback) {
+function createContentWithSelect(select, fallbackText) {
     var content = internals.createContentElement(document);
     content.setAttribute('select', select);
-    if (!fallback)
-        content.appendChild(createSpanWithText("FALLBACK"));
+    if (fallbackText)
+        content.appendChild(createSpanWithText(fallbackText));
 
     return content;

trunk/LayoutTests/fast/dom/shadow/content-element-move.html

@@ -23 +23 @@
 
     // Create shadow tree.
-    var content = createContentWithSelect('span');
+    var content = createContentWithSelect('span', 'FALLBACK');
     var sr = internals.ensureShadowRoot(root);
     sr.appendChild(createSpanWithText("BEFORE"));
@@ -49 +49 @@
 
     // Create shadow tree.
-    var content1 = createContentWithSelect('.c1');
-    var content2 = createContentWithSelect('span');
+    var content1 = createContentWithSelect('.c1', 'FALLBACK');
+    var content2 = createContentWithSelect('span', 'FALLBACK');
     var sr = internals.ensureShadowRoot(root);
     sr.appendChild(createSpanWithText("BEFORE"));
@@ -78 +78 @@
 
     // Create shadow tree.
-    var content1 = createContentWithSelect('.c1');
-    var content2 = createContentWithSelect('span');
+    var content1 = createContentWithSelect('.c1', 'FALLBACK');
+    var content2 = createContentWithSelect('span', 'FALLBACK');
     var sr = internals.ensureShadowRoot(root);
     sr.appendChild(createSpanWithText("BEFORE"));
@@ -134 +134 @@
 
     // Create shadow tree.
-    var content = createContentWithSelect('span');
+    var content = createContentWithSelect('span', 'FALLBACK');
     var sr = internals.ensureShadowRoot(root);
     sr.appendChild(createSpanWithText("BEFORE"));
@@ -160 +160 @@
 
     // Create shadow tree.
-    var content = createContentWithSelect('span');
+    var content = createContentWithSelect('span', 'FALLBACK');
     var sr = internals.ensureShadowRoot(root);
     sr.appendChild(createSpanWithText("BEFORE"));
@@ -187 +187 @@
 
     // Create shadow tree.
-    var content = createContentWithSelect('.c1');
+    var content = createContentWithSelect('.c1', 'FALLBACK');
     var sr = internals.ensureShadowRoot(root);
     sr.appendChild(createSpanWithText("BEFORE"));
@@ -222 +222 @@
     var f = (function(root, callIfDone) {
         return function() {
-            var content = createContentWithSelect('span');
+            var content = createContentWithSelect('span', 'FALLBACK');
             var sr = internals.ensureShadowRoot(root);
             sr.insertBefore(content, sr.lastChild);
@@ -248 +248 @@
     var f = (function(root, callIfDone) {
         return function() {
-            var content1 = createContentWithSelect('.c2');
-            var content2 = createContentWithSelect('span');
+            var content1 = createContentWithSelect('.c2', 'FALLBACK');
+            var content2 = createContentWithSelect('span', 'FALLBACK');
             var sr = internals.ensureShadowRoot(root);
             sr.insertBefore(content1, sr.lastChild);
@@ -272 +272 @@
     sr.appendChild(createSpanWithText("BEFORE"));
     sr.appendChild(mid);
-    sr.appendChild(createContentWithSelect('.c2'));
+    sr.appendChild(createContentWithSelect('.c2', 'FALLBACK'));
     sr.appendChild(createSpanWithText("AFTER"));
 
@@ -279 +279 @@
     var f = (function(root, mid, callIfDone) {
         return function() {
-            var content = createContentWithSelect('span');
+            var content = createContentWithSelect('span', 'FALLBACK');
             var sr = internals.ensureShadowRoot(root);
             sr.insertBefore(content, mid);
@@ -299 +299 @@
     // Create shadow tree.
     var sr = internals.ensureShadowRoot(root);
-    var content1 = createContentWithSelect('.c1');
-    var content2 = createContentWithSelect('span');
+    var content1 = createContentWithSelect('.c1', 'FALLBACK');
+    var content2 = createContentWithSelect('span', 'FALLBACK');
     sr.appendChild(createSpanWithText("BEFORE"));
     sr.appendChild(content1);
@@ -337 +337 @@
     // Create shadow tree in 'n1'
     var sr = internals.ensureShadowRoot(n1);
-    var content = createContentWithSelect('span');
+    var content = createContentWithSelect('span', 'FALLBACK');
     sr.appendChild(createSpanWithText("BEFORE"));
     sr.appendChild(content);