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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments Created 6 years, 11 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/web/WebHelperPluginImpl.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 33d1b275db114cf8bf3d47d4e65ff63e4f42262d..26ffccc64fc22d90992acf1668e752406655bff1 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -97,6 +97,7 @@
#include "core/html/HTMLTextAreaElement.h"
#include "core/html/ime/InputMethodContext.h"
#include "core/inspector/InspectorController.h"
+#include "core/inspector/InspectorInstrumentation.h"
#include "core/loader/DocumentLoader.h"
#include "core/loader/FrameLoader.h"
#include "core/loader/UniqueIdentifier.h"
@@ -2902,7 +2903,8 @@ void WebViewImpl::updateMainFrameLayoutSize()
if (settings()->viewportEnabled()) {
layoutSize = flooredIntSize(m_pageScaleConstraintsSet.pageDefinedConstraints().layoutSize);
- if (page()->settings().textAutosizingEnabled() && layoutSize.width != view->layoutSize().width()) {
+ bool textAutosizingEnabled = InspectorInstrumentation::overrideTextAutosizing(page(), page()->settings().textAutosizingEnabled());
+ if (textAutosizingEnabled && layoutSize.width != view->layoutSize().width()) {
TextAutosizer* textAutosizer = page()->mainFrame()->document()->textAutosizer();
if (textAutosizer)
textAutosizer->recalculateMultipliers();
« no previous file with comments | « Source/web/WebHelperPluginImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698