Fix broken AttachContext from r152289

Source/core/dom/ContainerNode.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 109 matching lines @@
     virtual void setActive(bool active = true, bool pause = false) OVERRIDE;
     virtual void setHovered(bool = true) OVERRIDE;
 
     // -----------------------------------------------------------------------------
     // Notification of document structure changes (see core/dom/Node.h for more notification methods)
 
     // Notifies the node that it's list of children have changed (either by adding or removing child nodes), or a child
     // node that is of the type CDATA_SECTION_NODE, TEXT_NODE or COMMENT_NODE has changed its value.
     virtual void childrenChanged(bool createdByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
 
-    void attachChildren();
+    void attachChildren(const AttachContext& = AttachContext());
     void attachChildrenLazily();
-    void detachChildren();
-    void detachChildrenIfNeeded();
+    void detachChildren(const AttachContext& = AttachContext());
+    void detachChildrenIfNeeded(const AttachContext& = AttachContext());
 
     void disconnectDescendantFrames();
 
     virtual bool childShouldCreateRenderer(const NodeRenderingContext&) const { return true; }
 
     virtual void reportMemoryUsage(MemoryObjectInfo*) const OVERRIDE;
 
 protected:
     ContainerNode(TreeScope*, ConstructionType = CreateContainer);
 
@@ skipping 45 matching lines @@
 // This will catch anyone doing an unnecessary cast.
 void toContainerNode(const ContainerNode*);
 
 inline ContainerNode::ContainerNode(TreeScope* treeScope, ConstructionType type)
     : Node(treeScope, type)
     , m_firstChild(0)
     , m_lastChild(0)
 {
 }
 
-inline void ContainerNode::attachChildren()
+inline void ContainerNode::attachChildren(const AttachContext& context)
 {
+    // the resolved style need not be passed to the children, as it represents only the parent's style
+    AttachContext childrenContext(context);
+    childrenContext.resolvedStyle = 0;

[esprehn, 2013/06/13 18:20:42]

You should put this inside the constructor to just not copy the style and remove
all the comments.

[stavila, 2013/06/13 21:10:06]

You mean the copy constructor should set by default the resolvedStyle member to
0? Or are you saying you would like another parameter to the constructor,
telling it to not copy the style?

If you prefer changing the default behaviour, please keep in mind that the
normal copy constructor is used in the Node::reattach method, so in that case
the style would have to be manually copied after using the copy constructor,
which seems kinda wrong.

What do you think?

+
     for (Node* child = firstChild(); child; child = child->nextSibling()) {
         ASSERT(!child->attached() || childAttachedAllowedWhenAttachingChildren(this));
         if (!child->attached())
-            child->attach();
+            child->attach(childrenContext);
     }
 }
 
 inline void ContainerNode::attachChildrenLazily()
 {
     for (Node* child = firstChild(); child; child = child->nextSibling())
         if (!child->attached())
             child->lazyAttach();
 }
 
-inline void ContainerNode::detachChildrenIfNeeded()
+inline void ContainerNode::detachChildrenIfNeeded(const AttachContext& context)
 {
+    // the resolved style need not be passed to the children, as it represents only the parent's style
+    AttachContext childrenContext(context);
+    childrenContext.resolvedStyle = 0;
+
     for (Node* child = firstChild(); child; child = child->nextSibling()) {
         if (child->attached())
-            child->detach();
+            child->detach(childrenContext);
     }
 }
 
-inline void ContainerNode::detachChildren()
+inline void ContainerNode::detachChildren(const AttachContext& context)
 {
+    // the resolved style need not be passed to the children, as it represents only the parent's style
+    AttachContext childrenContext(context);

[esprehn, 2013/06/13 18:20:42]

Please remove all the comments here, this should be a one liner to initialize
the context.

+    childrenContext.resolvedStyle = 0;
+
     for (Node* child = firstChild(); child; child = child->nextSibling())
-        child->detach();
+        child->detach(childrenContext);
 }
 
 inline unsigned Node::childNodeCount() const
 {
     if (!isContainerNode())
         return 0;
     return toContainerNode(this)->childNodeCount();
 }
 
 inline Node* Node::childNode(unsigned index) const
@@ skipping 126 matching lines @@
         m_node->resumePostAttachCallbacks();
     }
 
 private:
     ContainerNode* m_node;
 };
 
 } // namespace WebCore
 
 #endif // ContainerNode_h