Reorganize Layout Tree Construction code to be its own function

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)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 1751 matching lines @@
     DCHECK(newStyle);
 
     StyleRecalcChange localChange = ComputedStyle::stylePropagationDiff(oldStyle.get(), newStyle.get());
     if (localChange == NoChange) {
         INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(), stylesUnchanged, 1);
     } else {
         INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(), stylesChanged, 1);
     }
 
     if (localChange == Reattach) {
-        AttachContext reattachContext;
-        reattachContext.resolvedStyle = newStyle.get();
-        bool layoutObjectWillChange = needsAttach() || layoutObject();
-        reattach(reattachContext);
-        if (layoutObjectWillChange || layoutObject())
-            return Reattach;
-        return ReattachNoLayoutObject;
+        // TODO(nainar): Remove the style parameter being passed into buildOwnLayout().
+        // ComputedStyle will now be stored on Node and accessed in buildOwnLayout()
+        // using mutableComputedStyle().
+        return buildOwnLayout(newStyle.get());
     }
 
     DCHECK(oldStyle);
 
     if (localChange != NoChange)
         updateCallbackSelectors(oldStyle.get(), newStyle.get());
 
     if (LayoutObject* layoutObject = this->layoutObject()) {
         if (localChange != NoChange || pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get()) || svgFilterNeedsLayerUpdate()) {
             layoutObject->setStyle(newStyle.get());
@@ skipping 18 matching lines @@
                 return Inherit;
             newStyle->copyChildDependentFlagsFrom(*oldStyle);
         }
         if (oldStyle->hasPseudoElementStyle() || newStyle->hasPseudoElementStyle())
             return UpdatePseudoElements;
     }
 
     return localChange;
 }
 
+StyleRecalcChange Element::buildOwnLayout(ComputedStyle* newStyle)
+{

[sashab, 2016/07/05 23:28:55]

DCHECK(newstyle) here

[sashab, 2016/07/05 23:28:55]

DCHECK(newstyle) here

[nainar, 2016/07/06 00:52:09]

Done.

+    AttachContext reattachContext;
+    reattachContext.resolvedStyle = newStyle;
+    bool layoutObjectWillChange = needsAttach() || layoutObject();
+    reattach(reattachContext);
+    if (layoutObjectWillChange || layoutObject())
+        return Reattach;
+    return ReattachNoLayoutObject;
+}
+
 void Element::updateCallbackSelectors(const ComputedStyle* oldStyle, const ComputedStyle* newStyle)
 {
     Vector<String> emptyVector;
     const Vector<String>& oldCallbackSelectors = oldStyle ? oldStyle->callbackSelectors() : emptyVector;
     const Vector<String>& newCallbackSelectors = newStyle ? newStyle->callbackSelectors() : emptyVector;
     if (oldCallbackSelectors.isEmpty() && newCallbackSelectors.isEmpty())
         return;
     if (oldCallbackSelectors != newCallbackSelectors)
         CSSSelectorWatch::from(document()).updateSelectorMatches(oldCallbackSelectors, newCallbackSelectors);
 }
@@ skipping 1901 matching lines @@
 
 DEFINE_TRACE_WRAPPERS(Element)
 {
     if (hasRareData()) {
         visitor->traceWrappers(elementRareData());
     }
     ContainerNode::traceWrappers(visitor);
 }
 
 } // namespace blink