Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(134)

Unified Diff: Source/WebCore/page/FrameView.cpp

Issue 13723004: Remove the ENABLE_TEXT_AUTOSIZING compile-time flag. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | Source/WebCore/page/Settings.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/FrameView.cpp
diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 3fe41c9ffec46ee4cabe8e6434496e3fc28d83cb..38b5f7ae272cc44cc00ba9729d1d78778b021d6f 100644
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -68,6 +68,7 @@
#include "ScrollingCoordinator.h"
#include "Settings.h"
#include "StyleResolver.h"
+#include "TextAutosizer.h"
#include "TextResourceDecoder.h"
#include "TextStream.h"
@@ -90,10 +91,6 @@
#include "TiledBackingStore.h"
#endif
-#if ENABLE(TEXT_AUTOSIZING)
-#include "TextAutosizer.h"
-#endif
-
#if PLATFORM(CHROMIUM)
#include "TraceEvent.h"
#endif
@@ -451,7 +448,6 @@ void FrameView::setFrameRect(const IntRect& newRect)
if (newRect == oldRect)
return;
-#if ENABLE(TEXT_AUTOSIZING)
// Autosized font sizes depend on the width of the viewing area.
if (newRect.width() != oldRect.width()) {
Page* page = m_frame ? m_frame->page() : 0;
@@ -460,7 +456,6 @@ void FrameView::setFrameRect(const IntRect& newRect)
m_frame->document()->textAutosizer()->recalculateMultipliers();
}
}
-#endif
ScrollView::setFrameRect(newRect);
@@ -1233,11 +1228,11 @@ void FrameView::layout(bool allowSubtree)
beginDeferredRepaints();
forceLayoutParentViewIfNeeded();
root->layout();
-#if ENABLE(TEXT_AUTOSIZING)
+
bool autosized = document->textAutosizer()->processSubtree(root);
if (autosized && root->needsLayout())
root->layout();
-#endif
+
endDeferredRepaints();
m_inLayout = false;
« no previous file with comments | « Source/WebCore/dom/Document.cpp ('k') | Source/WebCore/page/Settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698