Reset multipliers correctly when autosizing is turned off.

Source/core/rendering/TextAutosizer.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * 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,
@@ skipping 130 matching lines @@
         // consider for adding: writing mode, padding.
 
         podForHash.width = style->width().getFloatValue();
     }
 
     return hashMemory(&podForHash, sizeof(podForHash));
 }
 
 TextAutosizer::TextAutosizer(Document* document)
     : m_document(document)
+    , m_previouslyAutosized(false)
 {
 }
 
 unsigned TextAutosizer::getCachedHash(const RenderObject* renderer, bool putInCacheIfAbsent)
 {
     HashMap<const RenderObject*, unsigned>::const_iterator it = m_hashCache.find(renderer);
     if (it != m_hashCache.end())
         return it->value;
 
     RenderObject* rendererParent = renderer->parent();
@@ skipping 12 matching lines @@
 {
     return m_document->settings()
         && m_document->settings()->textAutosizingEnabled()
         && m_document->page()
         && m_document->page()->mainFrame()
         && m_document->page()->mainFrame()->loader().stateMachine()->committedFirstRealDocumentLoad();
 }
 
 void TextAutosizer::recalculateMultipliers()
 {
-    if (!isApplicable())
+    if (!isApplicable() && !m_previouslyAutosized)
         return;
 
     RenderObject* renderer = m_document->renderer();
     while (renderer) {
         if (renderer->style() && renderer->style()->textAutosizingMultiplier() != 1)
             setMultiplier(renderer, 1);
         renderer = renderer->nextInPreOrder();
     }
+    m_previouslyAutosized = false;
 }
 
 bool TextAutosizer::processSubtree(RenderObject* layoutRoot)
 {
     TRACE_EVENT0("webkit", "TextAutosizer: check if needed");
 
     if (!isApplicable() || layoutRoot->view()->document().printing())
         return false;
 
     LocalFrame* mainFrame = m_document->page()->mainFrame();
@@ skipping 35 matching lines @@
 
 #ifdef AUTOSIZING_CLUSTER_HASH
     // Second pass to autosize stale non-autosized clusters for consistency.
     secondPassProcessStaleNonAutosizedClusters();
     m_hashCache.clear();
     m_hashToMultiplier.clear();
     m_hashesToAutosizeSecondPass.clear();
     m_nonAutosizedClusters.clear();
 #endif
     InspectorInstrumentation::didAutosizeText(layoutRoot);
+    m_previouslyAutosized = true;
     return true;
 }
 
 float TextAutosizer::clusterMultiplier(WritingMode writingMode, const TextAutosizingWindowInfo& windowInfo, float textWidth) const
 {
     int logicalWindowWidth = isHorizontalWritingMode(writingMode) ? windowInfo.windowSize.width() : windowInfo.windowSize.height();
     int logicalLayoutWidth = isHorizontalWritingMode(writingMode) ? windowInfo.minLayoutSize.width() : windowInfo.minLayoutSize.height();
     // Ignore box width in excess of the layout width, to avoid extreme multipliers.
     float logicalClusterWidth = std::min<float>(textWidth, logicalLayoutWidth);
 
@@ skipping 587 matching lines @@
         if (i + 1 < clusterInfos.size()) {
             LayoutUnit currentWidth = clusterInfos[i].root->contentLogicalWidth();
             LayoutUnit nextWidth = clusterInfos[i + 1].root->contentLogicalWidth();
             if (currentWidth - nextWidth > maxWidthDifferenceWithinGroup)
                 groups.grow(groups.size() + 1);
         }
     }
 }
 
 } // namespace WebCore