Moving fontSelector from StyleResolver to StyleEngine.

Source/web/AutofillPopupMenuClient.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 208 matching lines @@
     return m_itemIDs[listIndex] == WebAutofillClient::MenuItemIDWarningMessage;
 }
 
 void AutofillPopupMenuClient::setTextFromItem(unsigned listIndex)
 {
     m_textField->setValue(getSuggestion(listIndex));
 }
 
 FontSelector* AutofillPopupMenuClient::fontSelector() const
 {
-    return m_textField->document().ensureStyleResolver().fontSelector();
+    return m_textField->document().styleEngine()->fontSelector();
 }
 
 HostWindow* AutofillPopupMenuClient::hostWindow() const
 {
     return m_textField->document().view()->hostWindow();
 }
 
 PassRefPtr<Scrollbar> AutofillPopupMenuClient::createScrollbar(
     ScrollableArea* scrollableArea,
     ScrollbarOrientation orientation,
@@ skipping 38 matching lines @@
         setSuggestions(namesWithSeparator, labelsWithSeparator, iconsWithSeparator, itemIDsWithSeparator);
     }
 
     FontDescription regularFontDescription;
     RenderTheme::theme().systemFont(CSSValueWebkitControl,
                                             regularFontDescription);
     RenderStyle* style = m_textField->computedStyle();
     regularFontDescription.setComputedSize(style->fontDescription().computedSize());
 
     Font regularFont(regularFontDescription, 0, 0);
-    regularFont.update(textField->document().ensureStyleResolver().fontSelector());
+    regularFont.update(textField->document().styleEngine()->fontSelector());
     // The direction of text in popup menu is set the same as the direction of
     // the input element: textField.
     m_regularStyle = adoptPtr(new PopupMenuStyle(Color::black, Color::white, regularFont, true, false,
         Length(WebCore::Fixed), textField->renderer()->style()->direction(),
         textField->renderer()->style()->unicodeBidi() == Override,
         PopupMenuStyle::CustomBackgroundColor, PopupMenuStyle::AutofillPopup));
 
     FontDescription warningFontDescription = regularFont.fontDescription();
     warningFontDescription.setItalic(true);
     Font warningFont(warningFontDescription, regularFont.letterSpacing(), regularFont.wordSpacing());
@@ skipping 42 matching lines @@
         // It seems we can only have a 0 style in a TextField if the
         // node is detached, in which case we the popup should not be
         // showing.  Please report this in http://crbug.com/7708 and
         // include the page you were visiting.
         ASSERT_NOT_REACHED();
     }
     return style;
 }
 
 } // namespace blink