Rename AtomicString::string() to AtomicString::getString().

third_party/WebKit/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 "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/ExecutionContextTask.h"
@@ skipping 175 matching lines @@
         PagePopupClient::addString("baseStyle: {", m_buffer);
         addProperty("backgroundColor", m_backgroundColor.serialized(), m_buffer);
         addProperty("color", baseStyle().visitedDependentColor(CSSPropertyColor).serialized(), m_buffer);
         addProperty("textTransform", String(textTransformToString(baseStyle().textTransform())), m_buffer);
         addProperty("fontSize", baseFont().specifiedSize(), m_buffer);
         addProperty("fontStyle", String(fontStyleToString(baseFont().style())), m_buffer);
         addProperty("fontVariant", String(fontVariantToString(baseFont().variant())), m_buffer);
 
         PagePopupClient::addString("fontFamily: [", m_buffer);
         for (const FontFamily* f = &baseFont().family(); f; f = f->next()) {
-            addJavaScriptString(f->family().string(), m_buffer);
+            addJavaScriptString(f->family().getString(), m_buffer);
             if (f->next())
                 PagePopupClient::addString(",", m_buffer);
         }
         PagePopupClient::addString("]", m_buffer);
         PagePopupClient::addString("},\n", m_buffer);
     }
 
     Color backgroundColor() const { return m_isInGroup ? m_groupStyle->visitedDependentColor(CSSPropertyBackgroundColor) : m_backgroundColor; }
     // Do not use baseStyle() for background-color, use backgroundColor()
     // instead.
@@ skipping 123 matching lines @@
         // We don't use FontDescription::specifiedSize() because this element
         // might have its own zoom level.
         addProperty("fontSize", fontDescription.computedSize() / zoomFactor(), data);
     }
     // Our UA stylesheet has font-weight:normal for OPTION.
     if (FontWeightNormal != fontDescription.weight())
         addProperty("fontWeight", String(fontWeightToString(fontDescription.weight())), data);
     if (baseFont.family() != fontDescription.family()) {
         PagePopupClient::addString("fontFamily: [\n", data);
         for (const FontFamily* f = &fontDescription.family(); f; f = f->next()) {
-            addJavaScriptString(f->family().string(), data);
+            addJavaScriptString(f->family().getString(), data);
             if (f->next())
                 PagePopupClient::addString(",\n", data);
         }
         PagePopupClient::addString("],\n", data);
     }
     if (baseFont.style() != fontDescription.style())
         addProperty("fontStyle", String(fontStyleToString(fontDescription.style())), data);
     if (baseFont.variant() != fontDescription.variant())
         addProperty("fontVariant", String(fontVariantToString(fontDescription.variant())), data);
     if (baseStyle.textTransform() != style->textTransform())
@@ skipping 184 matching lines @@
 
 void PopupMenuImpl::disconnectClient()
 {
     m_ownerElement = nullptr;
     // Cannot be done during finalization, so instead done when the
     // layout object is destroyed and disconnected.
     dispose();
 }
 
 } // namespace blink