Store nonAttachedStyle on NodeLayoutData instead of on HashMap in Document.

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
  * All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
@@ skipping 1998 matching lines @@
       ComputedStyle::StylePropagationDiff(old_style.Get(), new_style.Get());
   if (local_change == kNoChange) {
     INCREMENT_STYLE_STATS_COUNTER(GetDocument().GetStyleEngine(),
                                   styles_unchanged, 1);
   } else {
     INCREMENT_STYLE_STATS_COUNTER(GetDocument().GetStyleEngine(),
                                   styles_changed, 1);
   }
 
   if (local_change == kReattach) {
-    GetDocument().AddNonAttachedStyle(*this, std::move(new_style));
+    SetNonAttachedStyle(std::move(new_style));
     SetNeedsReattachLayoutTree();
     return kReattach;
   }
 
   DCHECK(old_style);
 
   if (local_change != kNoChange)
     UpdateCallbackSelectors(old_style.Get(), new_style.Get());
 
   if (LayoutObject* layout_object = this->GetLayoutObject()) {
@@ skipping 35 matching lines @@
 
   return local_change;
 }
 
 void Element::RebuildLayoutTree(Text* next_text_sibling) {
   DCHECK(InActiveDocument());
   DCHECK(parentNode());
 
   if (NeedsReattachLayoutTree()) {
     AttachContext reattach_context;
-    reattach_context.resolved_style = GetDocument().GetNonAttachedStyle(*this);
+    reattach_context.resolved_style = GetNonAttachedStyle();
     bool layout_object_will_change = NeedsAttach() || GetLayoutObject();
     ReattachLayoutTree(reattach_context);
     if (layout_object_will_change || GetLayoutObject())
       ReattachWhitespaceSiblingsIfNeeded(next_text_sibling);
+    SetNonAttachedStyle(nullptr);
   } else if (ChildNeedsReattachLayoutTree()) {
     DCHECK(!NeedsReattachLayoutTree());
     SelectorFilterParentScope filter_scope(*this);
     StyleSharingDepthScope sharing_scope(*this);
     Text* next_text_sibling = nullptr;
     RebuildPseudoElementLayoutTree(kPseudoIdAfter);
     RebuildShadowRootLayoutTree(next_text_sibling);
     RebuildChildrenLayoutTrees(next_text_sibling);
     RebuildPseudoElementLayoutTree(kPseudoIdBefore, next_text_sibling);
     RebuildPseudoElementLayoutTree(kPseudoIdBackdrop);
@@ skipping 2246 matching lines @@
 }
 
 DEFINE_TRACE_WRAPPERS(Element) {
   if (HasRareData()) {
     visitor->TraceWrappers(GetElementRareData());
   }
   ContainerNode::TraceWrappers(visitor);
 }
 
 }  // namespace blink