Changeset 116644 in webkit

Timestamp:

May 10, 2012 7:43:27 AM (12 years ago)

Author:

morrita@google.com

Message:

Node::InDetachFlag could be removed.
​https://bugs.webkit.org/show_bug.cgi?id=85963

Reviewed by Antti Koivisto.

Removed Node::inDetach() since it can never true
on the only call site setFocusedNode().

No new test. Covered by existing tests.

• dom/Document.cpp:

(WebCore::Document::setFocusedNode):

• dom/Node.cpp:

(WebCore::Node::detach):

• dom/Node.h:

(WebCore):
(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) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  MORITA Hajime <morrita@google.com>
+
+        Node::InDetachFlag could be removed.
+        https://bugs.webkit.org/show_bug.cgi?id=85963
+
+        Reviewed by Antti Koivisto.
+
+        Removed Node::inDetach() since it can never true
+        on the only call site setFocusedNode().
+
+        No new test. Covered by existing tests.
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedNode):
+        * dom/Node.cpp:
+        (WebCore::Node::detach):
+        * dom/Node.h:
+        (WebCore):
+        (Node):
+
 2012-05-10  Keishi Hattori  <keishi@webkit.org>
 

trunk/Source/WebCore/dom/Document.cpp

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

trunk/Source/WebCore/dom/Node.cpp

@@ -1345 +1345 @@
 void Node::detach()
 {
-    setFlag(InDetachFlag);
-
     if (renderer())
         renderer()->destroyAndCleanupAnonymousWrappers();
@@ -1361 +1359 @@
     clearFlag(InActiveChainFlag);
     clearFlag(IsAttachedFlag);
-
-    clearFlag(InDetachFlag);
 }
 

trunk/Source/WebCore/dom/Node.h

@@ -92 +92 @@
 typedef int ExceptionCode;
 
-const int nodeStyleChangeShift = 21;
+const int nodeStyleChangeShift = 20;
 
 // SyntheticStyleChange means that we need to go through the entire style change logic even though
@@ -299 +299 @@
     bool hasID() const;
     bool hasClass() const;
-    
+
     bool active() const { return getFlag(IsActiveFlag); }
     bool inActiveChain() const { return getFlag(InActiveChainFlag); }
-    bool inDetach() const { return getFlag(InDetachFlag); }
     bool hovered() const { return getFlag(IsHoveredFlag); }
     bool focused() const { return hasRareData() ? rareDataFocused() : false; }
@@ -665 +664 @@
         IsHoveredFlag = 1 << 11,
         InActiveChainFlag = 1 << 12,
-        InDetachFlag = 1 << 13,
-        HasRareDataFlag = 1 << 14,
-        IsShadowRootFlag = 1 << 15,
+        HasRareDataFlag = 1 << 13,
+        IsShadowRootFlag = 1 << 14,
 
         // These bits are used by derived classes, pulled up here so they can
         // be stored in the same memory word as the Node bits above.
-        IsParsingChildrenFinishedFlag = 1 << 16, // Element
-        IsStyleAttributeValidFlag = 1 << 17, // StyledElement
+        IsParsingChildrenFinishedFlag = 1 << 15, // Element
+        IsStyleAttributeValidFlag = 1 << 16, // StyledElement
 #if ENABLE(SVG)
-        AreSVGAttributesValidFlag = 1 << 18, // Element
-        IsSynchronizingSVGAttributesFlag = 1 << 19, // SVGElement
-        HasSVGRareDataFlag = 1 << 20, // SVGElement
+        AreSVGAttributesValidFlag = 1 << 17, // Element
+        IsSynchronizingSVGAttributesFlag = 1 << 18, // SVGElement
+        HasSVGRareDataFlag = 1 << 19, // SVGElement
 #endif
 
         StyleChangeMask = 1 << nodeStyleChangeShift | 1 << (nodeStyleChangeShift + 1),
 
-        SelfOrAncestorHasDirAutoFlag = 1 << 23,
-        HasCustomWillOrDidRecalcStyleFlag = 1 << 24,
-        HasCustomStyleForRendererFlag = 1 << 25,
-
-        HasNameFlag = 1 << 26,
-
-        AttributeStyleDirtyFlag = 1 << 27,
+        SelfOrAncestorHasDirAutoFlag = 1 << 22,
+        HasCustomWillOrDidRecalcStyleFlag = 1 << 23,
+        HasCustomStyleForRendererFlag = 1 << 24,
+
+        HasNameFlag = 1 << 25,
+
+        AttributeStyleDirtyFlag = 1 << 26,
 
 #if ENABLE(SVG)
@@ -694 +692 @@
         DefaultNodeFlags = IsParsingChildrenFinishedFlag | IsStyleAttributeValidFlag,
 #endif
-        InNamedFlowFlag = 1 << 29,
-        HasAttrListFlag = 1 << 30,
-        IsFrameOwnerElementFlag = 1 << 31
+        InNamedFlowFlag = 1 << 28,
+        HasAttrListFlag = 1 << 29,
+        IsFrameOwnerElementFlag = 1 << 30
     };
 
-    // 1 bits remaining
+    // 2 bits remaining
 
     bool getFlag(NodeFlags mask) const { return m_nodeFlags & mask; }