Remove calls to styleForLayoutObject() in LayoutTreeBuilder::style()

third_party/WebKit/Source/core/dom/LayoutTreeBuilder.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, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
@@ skipping 82 matching lines @@
 
   LayoutObject* parentLayoutObject = this->parentLayoutObject();
   if (!parentLayoutObject)
     return false;
   if (!parentLayoutObject->canHaveChildren())
     return false;
   return m_node->layoutObjectIsNeeded(style());
 }
 
 ComputedStyle& LayoutTreeBuilderForElement::style() const {
-  if (!m_style)
-    m_style = m_node->styleForLayoutObject();
+  if (!m_style) {
+    if (m_node->hasCustomStyleCallbacks()) {
+      m_style = m_node->styleForLayoutObject();
+    }
+    else {
+      m_style = m_node->document().getStyleReattachData(*m_node).computedStyle.get();
+    }
+  }
+  DCHECK(m_style);
   return *m_style;
 }
 
 DISABLE_CFI_PERF
 void LayoutTreeBuilderForElement::createLayoutObject() {
   ComputedStyle& style = this->style();
 
   LayoutObject* newLayoutObject = m_node->createLayoutObject(style);
   if (!newLayoutObject)
     return;
@@ skipping 52 matching lines @@
       m_layoutObjectParent->isInsideFlowThread());
 
   LayoutObject* nextLayoutObject = this->nextLayoutObject();
   m_node->setLayoutObject(newLayoutObject);
   // Parent takes care of the animations, no need to call setAnimatableStyle.
   newLayoutObject->setStyle(&style);
   m_layoutObjectParent->addChild(newLayoutObject, nextLayoutObject);
 }
 
 }  // namespace blink