[FastTextAutosizing] Remove FastTextAutosizer::enabled

Source/core/rendering/FastTextAutosizer.cpp

 /*
  * Copyright (C) 2013 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 242 matching lines @@
     , m_superclusters()
     , m_clusterStack()
     , m_fingerprintMapper()
     , m_pageInfo()
     , m_updatePageInfoDeferred(false)
 {
 }
 
 void FastTextAutosizer::record(const RenderBlock* block)
 {
-    if (!enabled())
+    if (!m_pageInfo.m_settingEnabled)
         return;
 
     ASSERT(!m_blocksThatHaveBegunLayout.contains(block));
 
     if (!classifyBlock(block, INDEPENDENT | EXPLICIT_WIDTH))
         return;
 
     if (Fingerprint fingerprint = computeFingerprint(block))
         m_fingerprintMapper.addTentativeClusterRoot(block, fingerprint);
 }
 
 void FastTextAutosizer::destroy(const RenderBlock* block)
 {
-    if (!enabled())
+    if (!m_pageInfo.m_settingEnabled)
         return;
     ASSERT(!m_blocksThatHaveBegunLayout.contains(block));
 
     m_fingerprintMapper.remove(block);
 }
 
 FastTextAutosizer::BeginLayoutBehavior FastTextAutosizer::prepareForLayout(const RenderBlock* block)
 {
 #ifndef NDEBUG
     m_blocksThatHaveBegunLayout.add(block);
@@ skipping 165 matching lines @@
             applyMultiplier(descendant, multiplier);
             applyMultiplier(descendant->parent(), multiplier); // Parent handles line spacing.
             // FIXME: Investigate why MarkOnlyThis is sufficient.
             if (descendant->parent()->isRenderInline())
                 descendant->setPreferredLogicalWidthsDirty(MarkOnlyThis);
         }
         descendant = descendant->nextInPreOrder(block);
     }
 }
 
-// FIXME(crbug.com/367864): Unify this with m_pageInfo.m_settingEnabled.
-bool FastTextAutosizer::enabled() const
-{
-    return m_document->settings() && m_document->settings()->textAutosizingEnabled();
-}
-
 bool FastTextAutosizer::shouldHandleLayout() const
 {
-    return enabled() && m_pageInfo.m_pageNeedsAutosizing && !m_updatePageInfoDeferred;
+    return m_pageInfo.m_settingEnabled && m_pageInfo.m_pageNeedsAutosizing && !m_updatePageInfoDeferred;
 }
 
 void FastTextAutosizer::updatePageInfoInAllFrames()
 {
-    ASSERT(!enabled() || m_document->frame()->isMainFrame());
+    ASSERT(!m_document->frame() || m_document->frame()->isMainFrame());
 
     for (LocalFrame* frame = m_document->frame(); frame; frame = frame->tree().traverseNext()) {
         if (FastTextAutosizer* textAutosizer = frame->document()->fastTextAutosizer())
             textAutosizer->updatePageInfo();
     }
 }
 
 void FastTextAutosizer::updatePageInfo()
 {
-    if (m_updatePageInfoDeferred || !m_document->page())
+    if (m_updatePageInfoDeferred || !m_document->page() || !m_document->settings())
         return;
 
     PageInfo previousPageInfo(m_pageInfo);
-    m_pageInfo.m_settingEnabled = enabled();
+    m_pageInfo.m_settingEnabled = m_document->settings()->textAutosizingEnabled();
 
-    if (!enabled() || m_document->printing()) {
+    if (!m_pageInfo.m_settingEnabled || m_document->printing()) {
         m_pageInfo.m_pageNeedsAutosizing = false;
     } else {
         RenderView* renderView = toRenderView(m_document->renderer());
         bool horizontalWritingMode = isHorizontalWritingMode(renderView->style()->writingMode());
 
         LocalFrame* mainFrame = m_document->page()->mainFrame();
         IntSize frameSize = m_document->settings()->textAutosizingWindowSizeOverride();
         if (frameSize.isEmpty())
             frameSize = mainFrame->view()->unscaledVisibleContentSize(IncludeScrollbars);
         m_pageInfo.m_frameWidth = horizontalWritingMode ? frameSize.width() : frameSize.height();
@@ skipping 587 matching lines @@
 FastTextAutosizer::DeferUpdatePageInfo::~DeferUpdatePageInfo()
 {
     if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAutosizer()) {
         ASSERT(textAutosizer->m_updatePageInfoDeferred);
         textAutosizer->m_updatePageInfoDeferred = false;
         textAutosizer->updatePageInfoInAllFrames();
     }
 }
 
 } // namespace WebCore