Rename LayoutStyle to papayawhip

Source/web/PopupMenuImpl.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
 #include "core/dom/StyleEngine.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLHRElement.h"
 #include "core/html/HTMLOptGroupElement.h"
 #include "core/html/HTMLOptionElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/page/PagePopup.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/text/PlatformLocale.h"
@@ skipping 74 matching lines @@
     for (HTMLElement& child : Traversal<HTMLElement>::childrenOf(ownerElement())) {
         if (isHTMLOptionElement(child))
             addOption(toHTMLOptionElement(child), data);
         if (isHTMLOptGroupElement(child))
             addOptGroup(toHTMLOptGroupElement(child), data);
         if (isHTMLHRElement(child))
             addSeparator(toHTMLHRElement(child), data);
     }
     PagePopupClient::addString("],\n", data);
     addProperty("anchorRectInScreen", anchorRectInScreen, data);
-    const LayoutStyle* ownerStyle = ownerElement().layoutStyle();
+    const ComputedStyle* ownerStyle = ownerElement().computedStyle();
     Color backgroundColor = ownerStyle->visitedDependentColor(CSSPropertyBackgroundColor);
 #if OS(LINUX)
     // On other platforms, the <option> background color is the same as the
     // <select> background color. On Linux, that makes the <option>
     // background color very dark, so by default, try to use a lighter
     // background color for <option>s.
     if (LayoutTheme::theme().systemColor(CSSValueButtonface) == backgroundColor)
         backgroundColor = LayoutTheme::theme().systemColor(CSSValueMenu);
 #endif
     addProperty("backgroundColor", backgroundColor.serialized(), data);
@@ skipping 30 matching lines @@
         return "900";
     default:
         ASSERT_NOT_REACHED();
         break;
     }
     return 0;
 }
 
 void PopupMenuImpl::addElementStyle(HTMLElement& element, SharedBuffer* data)
 {
-    const LayoutStyle* style = m_client->layoutStyleForItem(element);
+    const ComputedStyle* style = m_client->computedStyleForItem(element);
     ASSERT(style);
     PagePopupClient::addString("style: {\n", data);
     addProperty("color", style->visitedDependentColor(CSSPropertyColor).serialized(), data);
     addProperty("backgroundColor", style->visitedDependentColor(CSSPropertyBackgroundColor).serialized(), data);
     const FontDescription& fontDescription = style->font().fontDescription();
     addProperty("fontSize", fontDescription.computedPixelSize(), data);
     addProperty("fontWeight", String(fontWeightToString(fontDescription.weight())), data);
     PagePopupClient::addString("fontFamily: [\n", data);
     for (const FontFamily* f = &fontDescription.family(); f; f = f->next()) {
         addJavaScriptString(f->family().string(), data);
@@ skipping 155 matching lines @@
 
 void PopupMenuImpl::disconnectClient()
 {
     m_client = nullptr;
     // Cannot be done during finalization, so instead done when the
     // render object is destroyed and disconnected.
     dispose();
 }
 
 } // namespace blink