Changeset 116927 in webkit

Timestamp:

May 14, 2012 12:49:59 AM (12 years ago)

Author:

morrita@google.com

Message:

Should have Node::inDetach() for assertion purposes.
​https://bugs.webkit.org/show_bug.cgi?id=86157

Reviewed by Darin Adler.

Implemented Node::inDetach() and added an assertio in Document::setFocusedNode().
This is a follow up of r116644 which removes inDetach() checking.

No new tests. Just adding an asssertion.

• dom/Document.cpp:

(WebCore::Document::setFocusedNode):

• dom/Node.cpp:

(WebCore):
(WebCore::Node::inDetach):
(WebCore::Node::detach):

• dom/Node.h:

(Node):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-14  MORITA Hajime  <morrita@google.com>
+
+        Should have Node::inDetach() for assertion purposes.
+        https://bugs.webkit.org/show_bug.cgi?id=86157
+
+        Reviewed by Darin Adler.
+
+        Implemented Node::inDetach() and added an assertio in Document::setFocusedNode().
+        This is a follow up of r116644 which removes inDetach() checking.
+
+        No new tests. Just adding an asssertion.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode):
+        * dom/Node.cpp:
+        (WebCore):
+        (WebCore::Node::inDetach):
+        (WebCore::Node::detach):
+        * dom/Node.h:
+        (Node):
+
 2012-05-13  Noel Gordon  <noel.gordon@gmail.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3656 +3656 @@
     // Remove focus from the existing focus node (if any)
     if (oldFocusedNode) {
+        ASSERT(!oldFocusedNode->inDetach());
+
         if (oldFocusedNode->active())
             oldFocusedNode->setActive(false);

trunk/Source/WebCore/dom/Node.cpp

@@ -1340 +1340 @@
 }
 
+#ifndef NDEBUG
+static Node* detachingNode;
+
+bool Node::inDetach() const
+{
+    return detachingNode == this;
+}
+#endif
+
 void Node::detach()
 {
+#ifndef NDEBUG
+    ASSERT(!detachingNode);
+    detachingNode = this;
+#endif
+
     if (renderer())
         renderer()->destroyAndCleanupAnonymousWrappers();
@@ -1356 +1370 @@
     clearFlag(InActiveChainFlag);
     clearFlag(IsAttachedFlag);
+
+#ifndef NDEBUG
+    detachingNode = 0;
+#endif
 }
 

trunk/Source/WebCore/dom/Node.h

@@ -497 +497 @@
     virtual void detach();
 
+#ifndef NDEBUG
+    bool inDetach() const;
+#endif
+
     void reattach();
     void reattachIfAttached();