Changeset 149560 in webkit

Timestamp:

May 4, 2013 9:29:05 AM (11 years ago)

Author:

akling@apple.com

Message:

Remove ShadowRoot's previous/next ShadowRoot pointers.
<​http://webkit.org/b/115588>

Reviewed by Anders Carlsson.

ShadowRoot no longer inherits from DoublyLinkedListNode<ShadowRoot> because that code wasn't
doing anything anymore. Shrinks ShadowRoot by two pointers.

• dom/ElementShadow.h:
• dom/ShadowRoot.cpp:

(SameSizeAsShadowRoot):
(WebCore::ShadowRoot::ShadowRoot):
(WebCore::ShadowRoot::~ShadowRoot):

• dom/ShadowRoot.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ElementShadow.h (modified) (1 diff)
• dom/ShadowRoot.cpp (modified) (3 diffs)
• dom/ShadowRoot.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-04  Andreas Kling  <akling@apple.com>
+
+        Remove ShadowRoot's previous/next ShadowRoot pointers.
+        <http://webkit.org/b/115588>
+
+        Reviewed by Anders Carlsson.
+
+        ShadowRoot no longer inherits from DoublyLinkedListNode<ShadowRoot> because that code wasn't
+        doing anything anymore. Shrinks ShadowRoot by two pointers.
+
+        * dom/ElementShadow.h:
+        * dom/ShadowRoot.cpp:
+        (SameSizeAsShadowRoot):
+        (WebCore::ShadowRoot::ShadowRoot):
+        (WebCore::ShadowRoot::~ShadowRoot):
+        * dom/ShadowRoot.h:
+
 2013-05-04  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/ElementShadow.h

@@ -31 +31 @@
 #include "ExceptionCode.h"
 #include "ShadowRoot.h"
-#include <wtf/DoublyLinkedList.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -39 +39 @@
 namespace WebCore {
 
-struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope, public DoublyLinkedListNode<ShadowRoot> {
-    void* pointers[3];
+struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope {
+    void* pointers[1];
     unsigned countersAndFlags[1];
 };
@@ -55 +55 @@
     : DocumentFragment(0, CreateShadowRoot)
     , TreeScope(this, document)
-    , m_prev(0)
-    , m_next(0)
     , m_numberOfStyles(0)
     , m_applyAuthorStyles(false)
@@ -68 +66 @@
 ShadowRoot::~ShadowRoot()
 {
-    ASSERT(!m_prev);
-    ASSERT(!m_next);
-
     // We cannot let ContainerNode destructor call willBeDeletedFrom()
     // for this ShadowRoot instance because TreeScope destructor

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -34 +34 @@
 #include "ExceptionCode.h"
 #include "TreeScope.h"
-#include <wtf/DoublyLinkedList.h>
 
 namespace WebCore {
@@ -103 +102 @@
     bool isOrphan() const { return !host(); }
 
-    ShadowRoot* m_prev;
-    ShadowRoot* m_next;
     OwnPtr<ScopeContentDistribution> m_scopeDistribution;
     unsigned m_numberOfStyles : 28;