Use removeFontFace to avoid resetting fontSelector.

Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.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
@@ skipping 244 matching lines @@
         for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree().traverseNext())
             frame->document()->setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 void Page::setNeedsRecalcStyleInAllFrames()
 {
     for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
         frame->document()->styleResolverChanged(RecalcStyleDeferred);
 }
 
+void Page::setNeedsLayoutInAllFrames()
+{
+    for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
+        if (FrameView* view = frame->view()) {
+            view->setNeedsLayout();
+            view->scheduleRelayout();
+        }
+    }
+}
+
 void Page::refreshPlugins(bool reload)
 {
     if (allPages().isEmpty())
         return;
 
     PluginData::refresh();
 
     Vector<RefPtr<Frame> > framesNeedingReload;
 
     HashSet<Page*>::iterator end = allPages().end();
@@ skipping 209 matching lines @@
             (*it)->multisamplingChanged(m_settings->openGLMultisamplingEnabled());
         break;
     }
     case SettingsDelegate::ImageLoadingChange:
         for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
             frame->document()->fetcher()->setImagesEnabled(settings().imagesEnabled());
             frame->document()->fetcher()->setAutoLoadImages(settings().loadsImagesAutomatically());
         }
         break;
     case SettingsDelegate::TextAutosizingChange:
+        // FastTextAutosizer works with RenderBlock::styleWillChange.

[skobes, 2014/02/14 18:11:04]

This comment is misleading.  FTA gathers some information during style recalc,
but the actual boosting occurs during layout (RenderBlockFlow::layoutBlockFlow).

[tasak, 2014/02/17 02:39:25]

I modified to use setNeedsRecalc and setNeedsLayout here.

+        // TextAutosizer depends on FrameView::layout.
+        // If fastTextAutosizing is enabled, we should use setNeedsRecalcStyleInAllFrames.
+        if (RuntimeEnabledFeatures::fastTextAutosizingEnabled()) {
+            setNeedsRecalcStyleInAllFrames();
+            break;
+        }
+
         // FIXME: I wonder if this needs to traverse frames like in WebViewImpl::resize, or whether there is only one document per Settings instance?
         for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
             TextAutosizer* textAutosizer = frame->document()->textAutosizer();
             if (textAutosizer)
                 textAutosizer->recalculateMultipliers();
         }
-        setNeedsRecalcStyleInAllFrames();
+        // TextAutosizing updates RenderStyle during layout phase (via TextAutosizer::processSubtree).
+        // We should invoke setNeedsLayout here.
+        setNeedsLayoutInAllFrames();
         break;
     case SettingsDelegate::ScriptEnableChange:
         m_inspectorController->scriptsEnabled(settings().scriptEnabled());
         break;
+    case SettingsDelegate::FontFamilyChange:
+        for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
+            frame->document()->styleEngine()->updateGenericFontFamilySettings();
+        setNeedsRecalcStyleInAllFrames();
+        break;
     }
 }
 
 void Page::didCommitLoad(Frame* frame)
 {
     lifecycleNotifier().notifyDidCommitLoad(frame);
     if (m_mainFrame == frame) {
         useCounter().didCommitLoad();
         m_inspectorController->didCommitLoadForMainFrame();
     }
@@ skipping 19 matching lines @@
     , spellCheckerClient(0)
     , storageClient(0)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace WebCore