Merge 143840

Source/WebCore/dom/ShadowRoot.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Neither the name of Google Inc. nor the names of its
@@ skipping 34 matching lines @@
 
 COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
 
 enum ShadowRootUsageOriginType {
     ShadowRootUsageOriginWeb = 0,
     ShadowRootUsageOriginNotWeb,
     ShadowRootUsageOriginMax
 };
 
 ShadowRoot::ShadowRoot(Document* document, ShadowRootType type)
-    : DocumentFragment(document, CreateShadowRoot)
+    : DocumentFragment(0, CreateShadowRoot)
     , TreeScope(this, document)
     , m_prev(0)
     , m_next(0)
     , m_numberOfStyles(0)
     , m_applyAuthorStyles(false)
     , m_resetStyleInheritance(false)
     , m_type(type)
     , m_registeredWithParentShadowRoot(false)
 {
     ASSERT(document);
-    setTreeScope(this);
 
 #if PLATFORM(CHROMIUM)
     if (type == ShadowRoot::AuthorShadowRoot) {
         ShadowRootUsageOriginType usageType = document->url().protocolIsInHTTPFamily() ? ShadowRootUsageOriginWeb : ShadowRootUsageOriginNotWeb;
         HistogramSupport::histogramEnumeration("WebCore.ShadowRoot.constructor", usageType, ShadowRootUsageOriginMax);
     }
 #endif
 }
 
 ShadowRoot::~ShadowRoot()
 {
     ASSERT(!m_prev);
     ASSERT(!m_next);
 
     // We must remove all of our children first before the TreeScope destructor
     // runs so we don't go through TreeScopeAdopter for each child with a
     // destructed tree scope in each descendant.
     removeDetachedChildren();
 
     // We must call clearRareData() here since a ShadowRoot class inherits TreeScope
     // as well as Node. See a comment on TreeScope.h for the reason.
     if (hasRareData())
         clearRareData();
 }
 
+void ShadowRoot::dispose()
+{
+    removeDetachedChildren();
+}
+
 PassRefPtr<Node> ShadowRoot::cloneNode(bool, ExceptionCode& ec)
 {
     ec = DATA_CLONE_ERR;
     return 0;
 }
 
 String ShadowRoot::innerHTML() const
 {
     return createMarkup(this, ChildrenOnly);
 }
@@ skipping 146 matching lines @@
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
     DocumentFragment::reportMemoryUsage(memoryObjectInfo);
     TreeScope::reportMemoryUsage(memoryObjectInfo);
     info.addMember(m_prev, "prev");
     info.addMember(m_next, "next");
     info.addMember(m_scopeDistribution, "scopeDistribution");
 }
 
 }