[webkit-changes] [91424] branches/safari-534.51-branch

Wed, 20 Jul 2011 16:41:33 -0700

Title: [91424] branches/safari-534.51-branch

Diff

Modified: branches/safari-534.51-branch/LayoutTests/ChangeLog (91423 => 91424)


--- branches/safari-534.51-branch/LayoutTests/ChangeLog	2011-07-20 23:34:30 UTC (rev 91423)
+++ branches/safari-534.51-branch/LayoutTests/ChangeLog	2011-07-20 23:41:27 UTC (rev 91424)
@@ -1,5 +1,20 @@
 2011-07-20  Lucas Forschler  <[email protected]>
 
+    Merged 88137.
+
+    2011-06-05  Kent Tamura  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        Rolling out r84528.
+        http://trac.webkit.org/changeset/84528
+        https://bugs.webkit.org/show_bug.cgi?id=62100
+
+        * fast/dom/shadow/import-shadowroot-expected.txt: Removed.
+        * fast/dom/shadow/import-shadowroot.html: Removed.
+
+2011-07-20  Lucas Forschler  <[email protected]>
+
     Merged 88071.
 
     2011-06-03  Adam Barth  <[email protected]>

Deleted: branches/safari-534.51-branch/LayoutTests/fast/dom/shadow/import-shadowroot-expected.txt (91423 => 91424)


--- branches/safari-534.51-branch/LayoutTests/fast/dom/shadow/import-shadowroot-expected.txt	2011-07-20 23:34:30 UTC (rev 91423)
+++ branches/safari-534.51-branch/LayoutTests/fast/dom/shadow/import-shadowroot-expected.txt	2011-07-20 23:41:27 UTC (rev 91424)
@@ -1,15 +0,0 @@
-
-This tests importNode() with bound elements.
-
-PASS dstDoc is non-null.
-PASS srcKeygen is non-null.
-PASS srcShadow is non-null.
-PASS srcShadow.firstChild is non-null.
-PASS importedKeygen is non-null.
-PASS srcKeygen !== importedKeygen is true
-PASS importedShadow is non-null.
-PASS importedShadow.firstChild is non-null.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: branches/safari-534.51-branch/LayoutTests/fast/dom/shadow/import-shadowroot.html (91423 => 91424)


--- branches/safari-534.51-branch/LayoutTests/fast/dom/shadow/import-shadowroot.html	2011-07-20 23:34:30 UTC (rev 91423)
+++ branches/safari-534.51-branch/LayoutTests/fast/dom/shadow/import-shadowroot.html	2011-07-20 23:41:27 UTC (rev 91424)
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<keygen id='K'/>
-<div id='X'></div>
-<pre id="console">
-This tests importNode() with bound elements.
-
-</pre>
-<script>
-    if (window.layoutTestController) {
-        layoutTestController.dumpAsText();
-
-        var dstDoc = new DOMParser().parseFromString('<div/>', 'text/xml');
-        shouldBeNonNull('dstDoc');
-
-        var srcKeygen = document.getElementById('K');
-        shouldBeNonNull('srcKeygen');
-        var srcShadow = layoutTestController.shadowRoot(srcKeygen);
-        shouldBeNonNull('srcShadow');
-        shouldBeNonNull('srcShadow.firstChild');
-
-        var importedKeygen = dstDoc.importNode(srcKeygen);
-        shouldBeNonNull('importedKeygen');
-        shouldBeTrue('srcKeygen !== importedKeygen');
-
-        var importedShadow = layoutTestController.shadowRoot(importedKeygen);
-        shouldBeNonNull('importedShadow');
-        shouldBeNonNull('importedShadow.firstChild');
-    }
-
-    var successfullyParsed = true;
-</script>
-<script src=""
-</body>
-</html>

Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (91423 => 91424)


--- branches/safari-534.51-branch/Source/WebCore/ChangeLog	2011-07-20 23:34:30 UTC (rev 91423)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog	2011-07-20 23:41:27 UTC (rev 91424)
@@ -1,5 +1,22 @@
 2011-07-20  Lucas Forschler  <[email protected]>
 
+    Merged 88137.
+
+    2011-06-05  Kent Tamura  <[email protected]>
+
+        Reviewed by Dimitri Glazkov.
+
+        Rolling out r84528.
+        http://trac.webkit.org/changeset/84528
+        https://bugs.webkit.org/show_bug.cgi?id=62100
+
+        It made several problems on elements with new shadow DOM.
+
+        * dom/Element.cpp:
+        (WebCore::Element::copyNonAttributeProperties):
+
+2011-07-20  Lucas Forschler  <[email protected]>
+
     Merged 88071.
 
     2011-06-03  Adam Barth  <[email protected]>

Modified: branches/safari-534.51-branch/Source/WebCore/dom/Element.cpp (91423 => 91424)


--- branches/safari-534.51-branch/Source/WebCore/dom/Element.cpp	2011-07-20 23:34:30 UTC (rev 91423)
+++ branches/safari-534.51-branch/Source/WebCore/dom/Element.cpp	2011-07-20 23:41:27 UTC (rev 91424)
@@ -213,14 +213,8 @@
     return document()->createElement(tagQName(), false);
 }
 
-void Element::copyNonAttributeProperties(const Element* source)
+void Element::copyNonAttributeProperties(const Element*)
 {
-    ShadowRoot* sourceShadow = source->shadowRoot();
-    removeShadowRoot();
-    if (sourceShadow) {
-        ShadowRoot* clonedShadow = ensureShadowRoot();
-        sourceShadow->cloneChildNodes(clonedShadow);
-    }
 }
 
 void Element::removeAttribute(const QualifiedName& name, ExceptionCode& ec)

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to