Rename LayoutStyle to papayawhip

Source/core/html/HTMLOptionElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2004, 2005, 2006, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2011 Motorola Mobility, Inc.  All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 12 matching lines @@
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "core/html/HTMLOptionElement.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
 #include "core/dom/Document.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/ScriptLoader.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/html/HTMLDataListElement.h"
 #include "core/html/HTMLOptGroupElement.h"
 #include "core/html/HTMLSelectElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/layout/LayoutTheme.h"
 #include "wtf/Vector.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 HTMLOptionElement::HTMLOptionElement(Document& document)
     : HTMLElement(optionTag, document)
     , m_disabled(false)
     , m_isSelected(false)
 {
     setHasCustomStyleCallbacks();
 }
 
 // An explicit empty destructor should be in HTMLOptionElement.cpp, because
 // if an implicit destructor is used or an empty destructor is defined in
 // HTMLOptionElement.h, when including HTMLOptionElement.h,
 // msvc tries to expand the destructor and causes
-// a compile error because of lack of LayoutStyle definition.
+// a compile error because of lack of ComputedStyle definition.
 HTMLOptionElement::~HTMLOptionElement()
 {
 }
 
 PassRefPtrWillBeRawPtr<HTMLOptionElement> HTMLOptionElement::create(Document& document)
 {
     RefPtrWillBeRawPtr<HTMLOptionElement> option = adoptRefWillBeNoop(new HTMLOptionElement(document));
     option->ensureClosedShadowRoot();
     return option.release();
 }
@@ skipping 16 matching lines @@
     return element.release();
 }
 
 void HTMLOptionElement::attach(const AttachContext& context)
 {
     AttachContext optionContext(context);
     if (context.resolvedStyle) {
         ASSERT(!m_style || m_style == context.resolvedStyle);
         m_style = context.resolvedStyle;
     } else {
-        updateNonLayoutStyle();
+        updateNonComputedStyle();
         optionContext.resolvedStyle = m_style.get();
     }
     HTMLElement::attach(optionContext);
 }
 
 void HTMLOptionElement::detach(const AttachContext& context)
 {
     m_style.clear();
     HTMLElement::detach(context);
 }
@@ skipping 184 matching lines @@
     if (!label.isNull())
         return label;
     return collectOptionInnerText().stripWhiteSpace(isHTMLSpace<UChar>).simplifyWhiteSpace(isHTMLSpace<UChar>);
 }
 
 void HTMLOptionElement::setLabel(const AtomicString& label)
 {
     setAttribute(labelAttr, label);
 }
 
-void HTMLOptionElement::updateNonLayoutStyle()
+void HTMLOptionElement::updateNonComputedStyle()
 {
     m_style = originalStyleForLayoutObject();
     if (HTMLSelectElement* select = ownerSelectElement())
         select->updateListOnRenderer();
 }
 
-LayoutStyle* HTMLOptionElement::nonRendererStyle() const
+ComputedStyle* HTMLOptionElement::nonLayoutObjectComputedStyle() const
 {
     return m_style.get();
 }
 
-PassRefPtr<LayoutStyle> HTMLOptionElement::customStyleForLayoutObject()
+PassRefPtr<ComputedStyle> HTMLOptionElement::customStyleForLayoutObject()
 {
-    updateNonLayoutStyle();
+    updateNonComputedStyle();
     return m_style;
 }
 
 void HTMLOptionElement::didRecalcStyle(StyleRecalcChange change)
 {
     if (change == NoChange)
         return;
 
     // FIXME: We ask our owner select to repaint regardless of which property changed.
     if (HTMLSelectElement* select = ownerSelectElement()) {
@@ skipping 88 matching lines @@
 {
     // If m_style is not set, then the node is still unattached.
     // We have to wait till it gets attached to read the display property.
     if (!m_style)
         return false;
 
     if (m_style->display() != NONE) {
         Element* parent = parentElement();
         ASSERT(parent);
         if (isHTMLOptGroupElement(*parent)) {
-            const LayoutStyle* parentStyle = parent->layoutStyle() ? parent->layoutStyle() : parent->computedStyle();
+            const ComputedStyle* parentStyle = parent->computedStyle() ? parent->computedStyle() : parent->ensureComputedStyle();
             return !parentStyle || parentStyle->display() == NONE;
         }
     }
     return m_style->display() == NONE;
 }
 
 } // namespace blink