| Index: third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
|
| diff --git a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
|
| index 012b1ad1b52c626225327288fc6a0c68c3a5f523..1b204033c8bd1438d39c6d504460ad665338afa1 100644
|
| --- a/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
|
| +++ b/third_party/WebKit/Source/core/dom/shadow/ShadowRoot.cpp
|
| @@ -43,9 +43,7 @@
|
| namespace blink {
|
|
|
| struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope, public DoublyLinkedListNode<ShadowRoot> {
|
| -#if ENABLE(OILPAN)
|
| char emptyClassFieldsDueToGCMixinMarker[1];
|
| -#endif
|
| Member<void*> willbeMember[4];
|
| unsigned countersAndFlags[1];
|
| };
|
| @@ -69,39 +67,7 @@ ShadowRoot::ShadowRoot(Document& document, ShadowRootType type)
|
|
|
| ShadowRoot::~ShadowRoot()
|
| {
|
| -#if !ENABLE(OILPAN)
|
| - DCHECK(!m_prev);
|
| - DCHECK(!m_next);
|
| -
|
| - if (m_shadowRootRareData && m_shadowRootRareData->styleSheets())
|
| - m_shadowRootRareData->styleSheets()->detachFromDocument();
|
| -
|
| - document().styleEngine().didRemoveShadowRoot(this);
|
| -
|
| - // We cannot let ContainerNode destructor call willBeDeletedFromDocument()
|
| - // for this ShadowRoot instance because TreeScope destructor
|
| - // clears Node::m_treeScope thus ContainerNode is no longer able
|
| - // to access it Document reference after that.
|
| - willBeDeletedFromDocument();
|
| -
|
| - // 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();
|
| -#endif
|
| -}
|
| -
|
| -#if !ENABLE(OILPAN)
|
| -void ShadowRoot::dispose()
|
| -{
|
| - removeDetachedChildren();
|
| }
|
| -#endif
|
|
|
| ShadowRoot* ShadowRoot::olderShadowRootForBindings() const
|
| {
|
|
|