Changeset 101983 in webkit

Timestamp:

Dec 5, 2011, 3:15:19 AM (15 years ago)

Author:

morrita@google.com

Message:

[Refactoring] Accessing Node::m_document should be minimized.
​https://bugs.webkit.org/show_bug.cgi?id=73800

Reviewed by Kent Tamura.

No new tests. No behavioral change.

Replaced m_document reference with the document() accessor
or temporaril variables. This is a preparation for using
m_document space to point a shadow root pointer.

• dom/Document.h:

(WebCore::Node::Node):

• dom/Node.cpp:

(WebCore::Node::~Node):

• dom/Node.h:

(WebCore::Node::inDocument):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• dom/Node.cpp (modified) (2 diffs)
• dom/Node.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-05  Hajime Morrita  <morrita@chromium.org>
+
+        [Refactoring] Accessing Node::m_document should be minimized.
+        https://bugs.webkit.org/show_bug.cgi?id=73800
+
+        Reviewed by Kent Tamura.
+
+        No new tests. No behavioral change.
+
+        Replaced m_document reference with the document() accessor
+        or temporaril variables. This is a preparation for using
+        m_document space to point a shadow root pointer.
+
+        * dom/Document.h:
+        (WebCore::Node::Node):
+        * dom/Node.cpp:
+        (WebCore::Node::~Node):
+        * dom/Node.h:
+        (WebCore::Node::inDocument):
+
 2011-12-05  Shinya Kawanaka  <shinyak@google.com>
 

trunk/Source/WebCore/dom/Document.h

@@ -1450 +1450 @@
     , m_renderer(0)
 {
-    if (m_document)
-        m_document->guardRef();
+    if (document)
+        document->guardRef();
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
     trackForDebugging();

trunk/Source/WebCore/dom/Node.cpp

@@ -405 +405 @@
         detach();
 
-    if (AXObjectCache::accessibilityEnabled() && m_document && m_document->axObjectCacheExists())
-        m_document->axObjectCache()->removeNodeForUse(this);
+    Document* doc = document();
+    if (AXObjectCache::accessibilityEnabled() && doc && doc->axObjectCacheExists())
+        doc->axObjectCache()->removeNodeForUse(this);
     
     if (m_previous)
@@ -413 +414 @@
         m_next->setPreviousSibling(0);
 
-    if (m_document)
-        m_document->guardDeref();
+    if (doc)
+        doc->guardDeref();
 }
 

trunk/Source/WebCore/dom/Node.h

@@ -389 +389 @@
     bool inDocument() const 
     { 
-        ASSERT(m_document || !getFlag(InDocumentFlag));
+        ASSERT(document() || !getFlag(InDocumentFlag));
         return getFlag(InDocumentFlag);
     }