Move LayoutObject to satellite NodeLayoutData that hangs from a Node.

third_party/WebKit/Source/core/dom/Node.cpp

 /*
  * 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, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
@@ skipping 285 matching lines @@
 
 Node::~Node() {
   // With Oilpan, the rare data finalizer also asserts for
   // this condition (we cannot directly access it here.)
   CHECK(HasRareData() || !GetLayoutObject());
   InstanceCounters::DecrementNodeCounter();
 }
 
 NodeRareData* Node::RareData() const {
   SECURITY_DCHECK(HasRareData());
-  return static_cast<NodeRareData*>(data_.rare_data_);
+  return NodeRareData::Create();
 }
 
 NodeRareData& Node::EnsureRareData() {
   if (HasRareData())
     return *RareData();
 
-  if (IsElementNode())
-    data_.rare_data_ = ElementRareData::Create(data_.layout_object_);
-  else
-    data_.rare_data_ = NodeRareData::Create(data_.layout_object_);
+  if (IsElementNode()) {
+    data_.rare_data_ = ElementRareData::Create();
+  } else {
+    data_.rare_data_ = NodeRareData::Create();
+  }
 
   DCHECK(data_.rare_data_);
   SetFlag(kHasRareDataFlag);
   ScriptWrappableVisitor::WriteBarrier(this, RareData());
   return *RareData();
 }
 
 Node* Node::ToNode() {
   return this;
 }
@@ skipping 2204 matching lines @@
   if (node) {
     std::stringstream stream;
     node->PrintNodePathTo(stream);
     LOG(INFO) << stream.str();
   } else {
     LOG(INFO) << "Cannot showNodePath for <null>";
   }
 }
 
 #endif