Reland text autosizing changes.

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 33 matching lines @@
 #include "core/page/ChromeClient.h"
 #include "core/page/ContextMenuController.h"
 #include "core/page/DragController.h"
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/PageLifecycleNotifier.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/StorageClient.h"
 #include "core/page/ValidationMessageClient.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
+#include "core/rendering/FastTextAutosizer.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/TextAutosizer.h"
 #include "core/storage/StorageNamespace.h"
 #include "platform/plugins/PluginData.h"
 #include "wtf/HashMap.h"
 #include "wtf/RefCountedLeakCounter.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/Base64.h"
 
 namespace WebCore {
@@ skipping 417 matching lines @@
             (*it)->multisamplingChanged(m_settings->openGLMultisamplingEnabled());
         break;
     }
     case SettingsDelegate::ImageLoadingChange:
         for (LocalFrame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
             frame->document()->fetcher()->setImagesEnabled(settings().imagesEnabled());
             frame->document()->fetcher()->setAutoLoadImages(settings().loadsImagesAutomatically());
         }
         break;
     case SettingsDelegate::TextAutosizingChange:
-        // FTA needs both setNeedsRecalcStyle and setNeedsLayout after a setting change.
-        if (RuntimeEnabledFeatures::fastTextAutosizingEnabled()) {
-            setNeedsRecalcStyleInAllFrames();
+        if (!mainFrame())
+            break;
+        if (FastTextAutosizer* textAutosizer = mainFrame()->document()->fastTextAutosizer()) {
+            textAutosizer->updatePageInfoInAllFrames();
         } else {
-            // FIXME: I wonder if this needs to traverse frames like in WebViewImpl::resize, or whether there is only one document per Settings instance?
             for (LocalFrame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
-                TextAutosizer* textAutosizer = frame->document()->textAutosizer();
-                if (textAutosizer)
+                if (TextAutosizer* textAutosizer = frame->document()->textAutosizer())
                     textAutosizer->recalculateMultipliers();
             }
+            // TextAutosizing updates RenderStyle during layout phase (via TextAutosizer::processSubtree).
+            // We should invoke setNeedsLayout here.
+            setNeedsLayoutInAllFrames();
         }
-        // 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 (LocalFrame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
             frame->document()->styleEngine()->updateGenericFontFamilySettings();
         setNeedsRecalcStyleInAllFrames();
         break;
     }
@@ skipping 28 matching lines @@
     , spellCheckerClient(0)
     , storageClient(0)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace WebCore