Rename LayoutStyle to papayawhip

Source/core/html/HTMLOptGroupElement.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, 2010 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "core/html/HTMLOptGroupElement.h"
 
 #include "core/HTMLNames.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
 #include "core/dom/Text.h"
 #include "core/editing/htmlediting.h"
 #include "core/html/HTMLContentElement.h"
 #include "core/html/HTMLDivElement.h"
 #include "core/html/HTMLSelectElement.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/unicode/CharacterNames.h"
 
 namespace blink {
@@ skipping 59 matching lines @@
 }
 
 bool HTMLOptGroupElement::supportsFocus() const
 {
     RefPtrWillBeRawPtr<HTMLSelectElement> select = ownerSelectElement();
     if (select && select->usesMenuList())
         return false;
     return HTMLElement::supportsFocus();
 }
 
-void HTMLOptGroupElement::updateNonLayoutStyle()
+void HTMLOptGroupElement::updateNonComputedStyle()
 {
     m_style = originalStyleForLayoutObject();
     if (layoutObject()) {
         if (HTMLSelectElement* select = ownerSelectElement())
             select->updateListOnRenderer();
     }
 }
 
-LayoutStyle* HTMLOptGroupElement::nonRendererStyle() const
+ComputedStyle* HTMLOptGroupElement::nonLayoutObjectComputedStyle() const
 {
     return m_style.get();
 }
 
-PassRefPtr<LayoutStyle> HTMLOptGroupElement::customStyleForLayoutObject()
+PassRefPtr<ComputedStyle> HTMLOptGroupElement::customStyleForLayoutObject()
 {
-    updateNonLayoutStyle();
+    updateNonComputedStyle();
     return m_style;
 }
 
 String HTMLOptGroupElement::groupLabelText() const
 {
     String itemText = getAttribute(labelAttr);
 
     // In WinIE, leading and trailing whitespace is ignored in options and optgroups. We match this behavior.
     itemText = itemText.stripWhiteSpace();
     // We want to collapse our whitespace too.  This will match other browsers.
@@ skipping 39 matching lines @@
     label.setTextContent(labelText);
     label.setAttribute(aria_labelAttr, AtomicString(labelText));
 }
 
 HTMLDivElement& HTMLOptGroupElement::optGroupLabelElement() const
 {
     return *toHTMLDivElement(closedShadowRoot()->getElementById(ShadowElementNames::optGroupLabel()));
 }
 
 } // namespace