Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Unified Diff: Source/WebCore/dom/ShadowRoot.cpp

Issue 12518022: Merge 143840 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/dom/ShadowRoot.h ('k') | Source/WebCore/dom/TreeScope.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/dom/ShadowRoot.cpp
===================================================================
--- Source/WebCore/dom/ShadowRoot.cpp (revision 145445)
+++ Source/WebCore/dom/ShadowRoot.cpp (working copy)
@@ -52,7 +52,7 @@
};
ShadowRoot::ShadowRoot(Document* document, ShadowRootType type)
- : DocumentFragment(document, CreateShadowRoot)
+ : DocumentFragment(0, CreateShadowRoot)
, TreeScope(this, document)
, m_prev(0)
, m_next(0)
@@ -63,7 +63,6 @@
, m_registeredWithParentShadowRoot(false)
{
ASSERT(document);
- setTreeScope(this);
#if PLATFORM(CHROMIUM)
if (type == ShadowRoot::AuthorShadowRoot) {
@@ -89,6 +88,11 @@
clearRareData();
}
+void ShadowRoot::dispose()
+{
+ removeDetachedChildren();
+}
+
PassRefPtr<Node> ShadowRoot::cloneNode(bool, ExceptionCode& ec)
{
ec = DATA_CLONE_ERR;
« no previous file with comments | « Source/WebCore/dom/ShadowRoot.h ('k') | Source/WebCore/dom/TreeScope.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698