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/Settings.cpp

Issue 12310107: Merge 143356 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 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/page/FrameView.cpp ('k') | Source/WebCore/rendering/TextAutosizer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/page/Settings.cpp
===================================================================
--- Source/WebCore/page/Settings.cpp (revision 143933)
+++ Source/WebCore/page/Settings.cpp (working copy)
@@ -41,6 +41,7 @@
#include "PageCache.h"
#include "ResourceHandle.h"
#include "StorageMap.h"
+#include "TextAutosizer.h"
#include <limits>
using namespace std;
@@ -363,6 +364,11 @@
void Settings::setTextAutosizingFontScaleFactor(float fontScaleFactor)
{
m_textAutosizingFontScaleFactor = fontScaleFactor;
+
+ // 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 = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext())
+ frame->document()->textAutosizer()->recalculateMultipliers();
+
m_page->setNeedsRecalcStyleInAllFrames();
}
« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/rendering/TextAutosizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698