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

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: rebase & 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
index 7eaec1e650abb9e4dc4d9673ebc852219fcf4f64..a56cf4656603c7cc647ae3ea467cefd531783d32 100644
--- a/Source/core/inspector/InspectorPageAgent.h
+++ b/Source/core/inspector/InspectorPageAgent.h
@@ -120,11 +120,6 @@ public:
virtual void queryUsageAndQuota(WebCore::ErrorString*, const WTF::String&, WTF::RefPtr<WebCore::TypeBuilder::Page::Quota>&, WTF::RefPtr<WebCore::TypeBuilder::Page::Usage>&) OVERRIDE;
virtual void setShowViewportSizeOnResize(ErrorString*, bool show, const bool* showGrid) OVERRIDE;
- // 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 didClearWindowObjectInMainWorld(Frame*);
void domContentLoadedEventFired(Frame*);
@@ -146,7 +141,7 @@ public:
void didScroll();
void didResizeMainFrame();
void didRecalculateStyle();
- void scriptsEnabled(bool isEnabled);
+ void settingsChanged();
// Inspector Controller API
virtual void setFrontend(InspectorFrontend*) OVERRIDE;
@@ -179,6 +174,11 @@ private:
void updateTouchEventEmulationInPage(bool);
bool forceCompositingMode(ErrorString*);
+ // Text autosizing override helpers.
+ bool overrideTextAutosizing();
+ // Note: This is used by Settings::deviceScaleAdjustment to calculate the overridden device scale adjustment.
+ float overrideFontScaleFactor();
+
static bool dataContent(const char* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result);
PassRefPtr<TypeBuilder::Page::Frame> buildObjectForFrame(Frame*);
@@ -200,6 +200,8 @@ private:
bool m_ignoreScriptsEnabledNotification;
bool m_deviceMetricsOverridden;
bool m_emulateViewportEnabled;
+ bool m_settingsCacheTextAutosizingEnabled;
+ float m_settingsCacheFontScaleFactor;
};

Powered by Google App Engine
This is Rietveld 408576698