Title: [88138] branches/chromium/782
- Revision
- 88138
- Author
- [email protected]
- Date
- 2011-06-05 21:07:10 -0700 (Sun, 05 Jun 2011)
Log Message
Merge 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-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):
[email protected]
BUG=84819
Review URL: http://codereview.chromium.org/6993052
Modified Paths
Removed Paths
Diff
Modified: branches/chromium/782/LayoutTests/ChangeLog (88137 => 88138)
--- branches/chromium/782/LayoutTests/ChangeLog 2011-06-06 02:01:31 UTC (rev 88137)
+++ branches/chromium/782/LayoutTests/ChangeLog 2011-06-06 04:07:10 UTC (rev 88138)
@@ -1,5 +1,16 @@
-2011-06-01 Shishir Agrawal <[email protected]>
+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-06-05 Robert Hogan <[email protected]>
+
Reviewed by Tony Gentilcore.
Renaming the Page Visibility attributes as per the modified spec draft.
Deleted: branches/chromium/782/LayoutTests/fast/dom/shadow/import-shadowroot-expected.txt (88137 => 88138)
--- branches/chromium/782/LayoutTests/fast/dom/shadow/import-shadowroot-expected.txt 2011-06-06 02:01:31 UTC (rev 88137)
+++ branches/chromium/782/LayoutTests/fast/dom/shadow/import-shadowroot-expected.txt 2011-06-06 04:07:10 UTC (rev 88138)
@@ -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/chromium/782/LayoutTests/fast/dom/shadow/import-shadowroot.html (88137 => 88138)
--- branches/chromium/782/LayoutTests/fast/dom/shadow/import-shadowroot.html 2011-06-06 02:01:31 UTC (rev 88137)
+++ branches/chromium/782/LayoutTests/fast/dom/shadow/import-shadowroot.html 2011-06-06 04:07:10 UTC (rev 88138)
@@ -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/chromium/782/Source/WebCore/ChangeLog (88137 => 88138)
--- branches/chromium/782/Source/WebCore/ChangeLog 2011-06-06 02:01:31 UTC (rev 88137)
+++ branches/chromium/782/Source/WebCore/ChangeLog 2011-06-06 04:07:10 UTC (rev 88138)
@@ -1,5 +1,18 @@
-2011-06-01 Shishir Agrawal <[email protected]>
+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-06-05 Igor Oliveira <[email protected]>
+
Reviewed by Tony Gentilcore.
Renaming the Page Visibility attributes as per the modified spec draft.
Modified: branches/chromium/782/Source/WebCore/dom/Element.cpp (88137 => 88138)
--- branches/chromium/782/Source/WebCore/dom/Element.cpp 2011-06-06 02:01:31 UTC (rev 88137)
+++ branches/chromium/782/Source/WebCore/dom/Element.cpp 2011-06-06 04:07:10 UTC (rev 88138)
@@ -207,14 +207,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