Title: [149560] trunk/Source/WebCore
Revision
149560
Author
[email protected]
Date
2013-05-04 09:29:05 -0700 (Sat, 04 May 2013)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (149559 => 149560)


--- trunk/Source/WebCore/ChangeLog	2013-05-04 15:27:45 UTC (rev 149559)
+++ trunk/Source/WebCore/ChangeLog	2013-05-04 16:29:05 UTC (rev 149560)
@@ -1,5 +1,22 @@
 2013-05-04  Andreas Kling  <[email protected]>
 
+        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  <[email protected]>
+
         RenderObject: don't change GraphicsContext state when not drawing dashed/dotted lines.
 
         From Blink r149546 by <[email protected]>

Modified: trunk/Source/WebCore/dom/ElementShadow.h (149559 => 149560)


--- trunk/Source/WebCore/dom/ElementShadow.h	2013-05-04 15:27:45 UTC (rev 149559)
+++ trunk/Source/WebCore/dom/ElementShadow.h	2013-05-04 16:29:05 UTC (rev 149560)
@@ -30,7 +30,6 @@
 #include "ContentDistributor.h"
 #include "ExceptionCode.h"
 #include "ShadowRoot.h"
-#include <wtf/DoublyLinkedList.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>

Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (149559 => 149560)


--- trunk/Source/WebCore/dom/ShadowRoot.cpp	2013-05-04 15:27:45 UTC (rev 149559)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp	2013-05-04 16:29:05 UTC (rev 149560)
@@ -38,8 +38,8 @@
 
 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];
 };
 
@@ -54,8 +54,6 @@
 ShadowRoot::ShadowRoot(Document* document, ShadowRootType type)
     : DocumentFragment(0, CreateShadowRoot)
     , TreeScope(this, document)
-    , m_prev(0)
-    , m_next(0)
     , m_numberOfStyles(0)
     , m_applyAuthorStyles(false)
     , m_resetStyleInheritance(false)
@@ -67,9 +65,6 @@
 
 ShadowRoot::~ShadowRoot()
 {
-    ASSERT(!m_prev);
-    ASSERT(!m_next);
-
     // We cannot let ContainerNode destructor call willBeDeletedFrom()
     // for this ShadowRoot instance because TreeScope destructor
     // clears Node::m_treeScope thus ContainerNode is no longer able

Modified: trunk/Source/WebCore/dom/ShadowRoot.h (149559 => 149560)


--- trunk/Source/WebCore/dom/ShadowRoot.h	2013-05-04 15:27:45 UTC (rev 149559)
+++ trunk/Source/WebCore/dom/ShadowRoot.h	2013-05-04 16:29:05 UTC (rev 149560)
@@ -33,7 +33,6 @@
 #include "Element.h"
 #include "ExceptionCode.h"
 #include "TreeScope.h"
-#include <wtf/DoublyLinkedList.h>
 
 namespace WebCore {
 
@@ -102,8 +101,6 @@
     // FIXME: This shouldn't happen. https://bugs.webkit.org/show_bug.cgi?id=88834
     bool isOrphan() const { return !host(); }
 
-    ShadowRoot* m_prev;
-    ShadowRoot* m_next;
     OwnPtr<ScopeContentDistribution> m_scopeDistribution;
     unsigned m_numberOfStyles : 28;
     unsigned m_applyAuthorStyles : 1;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to