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

Unified Diff: Source/core/inspector/InspectorPageAgent.h

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
Index: Source/core/inspector/InspectorPageAgent.h
diff --git a/Source/core/inspector/InspectorPageAgent.h b/Source/core/inspector/InspectorPageAgent.h
old mode 100644
new mode 100755
index 958404fe8ccf5f72986704c458baa05ce4c9cc44..4e31d63dc8b4193755c010e66bdec3d51cec2134
--- a/Source/core/inspector/InspectorPageAgent.h
+++ b/Source/core/inspector/InspectorPageAgent.h
@@ -126,11 +126,6 @@ public:
// Geolocation override helper.
GeolocationPosition* overrideGeolocationPosition(GeolocationPosition*);
- // Text autosizing override helpers.
- bool overrideTextAutosizing(bool);
- // Note: This is used by Settings::deviceScaleAdjustment to calculate the overridden device scale adjustment.
- float overrideFontScaleFactor(float);
-
// InspectorInstrumentation API
void didClearWindowObjectInWorld(Frame*, DOMWrapperWorld*);
void domContentLoadedEventFired(Frame*);
@@ -152,7 +147,7 @@ public:
void didScroll();
void didResizeMainFrame();
void didRecalculateStyle();
- void scriptsEnabled(bool isEnabled);
+ void settingsChanged();
// Inspector Controller API
virtual void setFrontend(InspectorFrontend*) OVERRIDE;
@@ -174,6 +169,12 @@ public:
String scriptPreprocessorSource() { return m_scriptPreprocessorSource; }
const AtomicString& resourceSourceMapURL(const String& url);
bool deviceMetricsOverrideEnabled();
+
+ // Text autosizing override helpers.
+ bool overrideTextAutosizing();
+ // Note: This is used by Settings::deviceScaleAdjustment to calculate the overridden device scale adjustment.
+ float overrideFontScaleFactor();
+
static DocumentLoader* assertDocumentLoader(ErrorString*, Frame*);
private:
@@ -207,6 +208,8 @@ private:
bool m_ignoreScriptsEnabledNotification;
bool m_deviceMetricsOverridden;
bool m_emulateViewportEnabled;
+ bool m_settingsCacheTextAutosizingEnabled;
+ float m_settingsCacheFontScaleFactor;
RefPtr<GeolocationPosition> m_geolocationPosition;
RefPtr<GeolocationPosition> m_platformGeolocationPosition;
};

Powered by Google App Engine
This is Rietveld 408576698