Update renderer in core/css.

Source/core/css/CSSComputedStyleDeclaration.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 425 matching lines @@
 
 static void logUnimplementedPropertyID(CSSPropertyID propertyID)
 {
     DEFINE_STATIC_LOCAL(HashSet<CSSPropertyID>, propertyIDSet, ());
     if (!propertyIDSet.add(propertyID).isNewEntry)
         return;
 
     WTF_LOG_ERROR("WebKit does not yet implement getComputedStyle for '%s'.", getPropertyName(propertyID));
 }
 
-static bool isLayoutDependent(CSSPropertyID propertyID, const ComputedStyle* style, LayoutObject* renderer)
+static bool isLayoutDependent(CSSPropertyID propertyID, const ComputedStyle* style, LayoutObject* layoutObject)
 {
     // Some properties only depend on layout in certain conditions which
     // are specified in the main switch statement below. So we can avoid
     // forcing layout in those conditions. The conditions in this switch
     // statement must remain in sync with the conditions in the main switch.
     // FIXME: Some of these cases could be narrowed down or optimized better.
     switch (propertyID) {
     case CSSPropertyBottom:
     case CSSPropertyGridTemplateColumns:
     case CSSPropertyGridTemplateRows:
     case CSSPropertyHeight:
     case CSSPropertyLeft:
     case CSSPropertyRight:
     case CSSPropertyTop:
     case CSSPropertyPerspectiveOrigin:
     case CSSPropertyTransform:
     case CSSPropertyTransformOrigin:
     case CSSPropertyMotionPath:
     case CSSPropertyMotionOffset:
     case CSSPropertyMotionRotation:
     case CSSPropertyWidth:
     case CSSPropertyWebkitFilter:
     case CSSPropertyX:
     case CSSPropertyY:
     case CSSPropertyRx:
     case CSSPropertyRy:
         return true;
     case CSSPropertyMargin:
-        return renderer && renderer->isBox() && (!style || !style->marginBottom().isFixed() || !style->marginTop().isFixed() || !style->marginLeft().isFixed() || !style->marginRight().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->marginBottom().isFixed() || !style->marginTop().isFixed() || !style->marginLeft().isFixed() || !style->marginRight().isFixed());

[leviw_travelin_and_unemployed, 2015/04/27 18:27:09]

Nit: this may actually be wrap-worthy :p

[dsinclair, 2015/04/27 19:10:45]

Done.

     case CSSPropertyMarginLeft:
-        return renderer && renderer->isBox() && (!style || !style->marginLeft().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->marginLeft().isFixed());
     case CSSPropertyMarginRight:
-        return renderer && renderer->isBox() && (!style || !style->marginRight().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->marginRight().isFixed());
     case CSSPropertyMarginTop:
-        return renderer && renderer->isBox() && (!style || !style->marginTop().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->marginTop().isFixed());
     case CSSPropertyMarginBottom:
-        return renderer && renderer->isBox() && (!style || !style->marginBottom().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->marginBottom().isFixed());
     case CSSPropertyPadding:
-        return renderer && renderer->isBox() && (!style || !style->paddingBottom().isFixed() || !style->paddingTop().isFixed() || !style->paddingLeft().isFixed() || !style->paddingRight().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->paddingBottom().isFixed() || !style->paddingTop().isFixed() || !style->paddingLeft().isFixed() || !style->paddingRight().isFixed());

[leviw_travelin_and_unemployed, 2015/04/27 18:27:09]

Ditto.

[dsinclair, 2015/04/27 19:10:45]

Done.

     case CSSPropertyPaddingBottom:
-        return renderer && renderer->isBox() && (!style || !style->paddingBottom().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->paddingBottom().isFixed());
     case CSSPropertyPaddingLeft:
-        return renderer && renderer->isBox() && (!style || !style->paddingLeft().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->paddingLeft().isFixed());
     case CSSPropertyPaddingRight:
-        return renderer && renderer->isBox() && (!style || !style->paddingRight().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->paddingRight().isFixed());
     case CSSPropertyPaddingTop:
-        return renderer && renderer->isBox() && (!style || !style->paddingTop().isFixed());
+        return layoutObject && layoutObject->isBox() && (!style || !style->paddingTop().isFixed());
     default:
         return false;
     }
 }
 
 const ComputedStyle* CSSComputedStyleDeclaration::computeComputedStyle() const
 {
     Node* styledNode = this->styledNode();
     ASSERT(styledNode);
     return styledNode->ensureComputedStyle(styledNode->isPseudoElement() ? NOPSEUDO : m_pseudoElementSpecifier);
 }
 
 Node* CSSComputedStyleDeclaration::styledNode() const
 {
     if (!m_node)
         return 0;
     if (m_node->isElementNode()) {
         if (PseudoElement* element = toElement(m_node)->pseudoElement(m_pseudoElementSpecifier))
             return element;
     }
     return m_node.get();
 }
 
 PassRefPtrWillBeRawPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropertyID propertyID) const
 {
     Node* styledNode = this->styledNode();
     if (!styledNode)
         return nullptr;
-    LayoutObject* renderer = styledNode->layoutObject();
+    LayoutObject* layoutObject = styledNode->layoutObject();
     const ComputedStyle* style;
 
     Document& document = styledNode->document();
 
     // A timing update may be required if a compositor animation is running.
     DocumentAnimations::updateAnimationTimingForGetComputedStyle(*styledNode, propertyID);
 
     document.updateRenderTreeForNodeIfNeeded(styledNode);
 
     // The style recalc could have caused the styled node to be discarded or replaced
     // if it was a PseudoElement so we need to update it.
     styledNode = this->styledNode();
-    renderer = styledNode->layoutObject();
+    layoutObject = styledNode->layoutObject();
 
     style = computeComputedStyle();
 
-    bool forceFullLayout = isLayoutDependent(propertyID, style, renderer)
+    bool forceFullLayout = isLayoutDependent(propertyID, style, layoutObject)
         || styledNode->isInShadowTree()
         || (document.ownerElement() && document.ensureStyleResolver().hasViewportDependentMediaQueries());
 
     if (forceFullLayout) {
         document.updateLayoutIgnorePendingStylesheets();
         styledNode = this->styledNode();
         style = computeComputedStyle();
-        renderer = styledNode->layoutObject();
+        layoutObject = styledNode->layoutObject();
     }
 
     if (!style)
         return nullptr;
 
-    RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(propertyID, *style, renderer, styledNode, m_allowVisitedStyle);
+    RefPtrWillBeRawPtr<CSSValue> value = ComputedStyleCSSValueMapping::get(propertyID, *style, layoutObject, styledNode, m_allowVisitedStyle);
     if (value)
         return value;
 
     logUnimplementedPropertyID(propertyID);
     return nullptr;
 }
 
 String CSSComputedStyleDeclaration::getPropertyValue(CSSPropertyID propertyID) const
 {
     RefPtrWillBeRawPtr<CSSValue> value = getPropertyCSSValue(propertyID);
@@ skipping 107 matching lines @@
     exceptionState.throwDOMException(NoModificationAllowedError, "These styles are computed, and therefore the '" + getPropertyNameString(id) + "' property is read-only.");
 }
 
 DEFINE_TRACE(CSSComputedStyleDeclaration)
 {
     visitor->trace(m_node);
     CSSStyleDeclaration::trace(visitor);
 }
 
 } // namespace blink