Store nonAttachedStyle on NodeLayoutData instead of on HashMap in Document.

third_party/WebKit/Source/core/dom/Node.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-2011, 2014 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 16 matching lines @@
 #define Node_h
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/TraceWrapperMember.h"
 #include "core/CoreExport.h"
 #include "core/dom/MutationObserver.h"
 #include "core/dom/SimulatedClickOptions.h"
 #include "core/dom/TreeScope.h"
 #include "core/editing/EditingBoundary.h"
 #include "core/events/EventTarget.h"
+#include "core/style/ComputedStyle.h"
 #include "core/style/ComputedStyleConstants.h"
 #include "platform/geometry/LayoutRect.h"
 #include "public/platform/WebFocusType.h"
 
 // This needs to be here because Element.cpp also depends on it.
 #define DUMP_NODE_STATISTICS 0
 
 namespace blink {
 
 class ContainerNode;
@@ skipping 47 matching lines @@
   kNotDefinedFlag = 2 << kNodeCustomElementShift,
 };
 
 enum class SlotChangeType {
   kInitial,
   kChained,
 };
 
 class NodeLayoutData {
  public:
-  explicit NodeLayoutData(LayoutObject* layout_object)
-      : layout_object_(layout_object) {}
+  explicit NodeLayoutData(LayoutObject* layout_object,
+                          RefPtr<ComputedStyle> non_attached_style)

[rune, 2017/04/19 20:34:52]

Shouldn't this be a WTF_MAKE_NONCOPYABLE like e.g. NodeRareData?

[nainar, 2017/04/19 23:43:41]

You are right. Done.

+      : layout_object_(layout_object),
+        non_attached_style_(non_attached_style) {}
   ~NodeLayoutData() { CHECK(!layout_object_); }
 
   LayoutObject* GetLayoutObject() const { return layout_object_; }
   void SetLayoutObject(LayoutObject* layout_object) {
     DCHECK_NE(&SharedEmptyData(), this);
     layout_object_ = layout_object;
   }
+
+  ComputedStyle* GetNonAttachedStyle() const {
+    return non_attached_style_.Get();
+  }
+  void SetNonAttachedStyle(RefPtr<ComputedStyle> non_attached_style) {
+    DCHECK_NE(&SharedEmptyData(), this);
+    non_attached_style_ = non_attached_style;
+  }
+
   static NodeLayoutData& SharedEmptyData() {
-    DEFINE_STATIC_LOCAL(NodeLayoutData, shared_empty_data, (nullptr));
+    DEFINE_STATIC_LOCAL(NodeLayoutData, shared_empty_data, (nullptr, nullptr));
     return shared_empty_data;
   }
   bool IsSharedEmptyData() { return this == &SharedEmptyData(); }
 
  private:
   LayoutObject* layout_object_;
+  RefPtr<ComputedStyle> non_attached_style_;
 };
 
 class NodeRareDataBase {
  public:
   NodeLayoutData* GetNodeLayoutData() const { return node_layout_data_; }
   void SetNodeLayoutData(NodeLayoutData* node_layout_data) {
     DCHECK(node_layout_data);
     node_layout_data_ = node_layout_data;
   }
 
@@ skipping 126 matching lines @@
   bool isSameNode(const Node* other) const { return this == other; }
   bool isDefaultNamespace(const AtomicString& namespace_uri) const;
   const AtomicString& lookupPrefix(const AtomicString& namespace_uri) const;
   const AtomicString& lookupNamespaceURI(const String& prefix) const;
 
   String textContent(bool convert_brs_to_newlines = false) const;
   void setTextContent(const String&);
 
   bool SupportsAltText();
 
+  void SetNonAttachedStyle(RefPtr<ComputedStyle> non_attached_style);
+
+  ComputedStyle* GetNonAttachedStyle() const {
+    return HasRareData()
+               ? data_.rare_data_->GetNodeLayoutData()->GetNonAttachedStyle()
+               : data_.node_layout_data_->GetNonAttachedStyle();
+  }
+
   // Other methods (not part of DOM)
 
   bool IsElementNode() const { return GetFlag(kIsElementFlag); }
   bool IsContainerNode() const { return GetFlag(kIsContainerFlag); }
   bool IsTextNode() const { return GetFlag(kIsTextFlag); }
   bool IsHTMLElement() const { return GetFlag(kIsHTMLFlag); }
   bool IsSVGElement() const { return GetFlag(kIsSVGFlag); }
 
   DISABLE_CFI_PERF bool IsPseudoElement() const {
     return GetPseudoId() != kPseudoIdNone;
@@ skipping 743 matching lines @@
 }  // namespace blink
 
 #ifndef NDEBUG
 // Outside the WebCore namespace for ease of invocation from gdb.
 void showNode(const blink::Node*);
 void showTree(const blink::Node*);
 void showNodePath(const blink::Node*);
 #endif
 
 #endif  // Node_h