Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / inspector / InspectorPageAgent.h

diff --git a/src/third_party/WebKit/Source/core/inspector/InspectorPageAgent.h b/src/third_party/WebKit/Source/core/inspector/InspectorPageAgent.h
index 7eaec1e..239573c 100644 (file)
--- a/src/third_party/WebKit/Source/core/inspector/InspectorPageAgent.h
+++ b/src/third_party/WebKit/Source/core/inspector/InspectorPageAgent.h
@@ -76,6 +76,10 @@ public:
 
     static PassOwnPtr<InspectorPageAgent> create(Page*, InjectedScriptManager*, InspectorClient*, InspectorOverlay*);
 
+    // Settings overrides.
+    void setTextAutosizingEnabled(bool);
+    void setDeviceScaleAdjustment(float);
+
     static bool cachedResourceContent(Resource*, String* result, bool* base64Encoded);
     static bool sharedBufferContent(PassRefPtr<SharedBuffer>, const String& textEncodingName, bool withBase64Encode, String* result);
 
@@ -108,8 +112,6 @@ public:
     virtual void setShowScrollBottleneckRects(ErrorString*, bool show) OVERRIDE;
     virtual void getScriptExecutionStatus(ErrorString*, PageCommandHandler::Result::Enum*) OVERRIDE;
     virtual void setScriptExecutionDisabled(ErrorString*, bool) OVERRIDE;
-    virtual void setDeviceOrientationOverride(ErrorString*, double, double, double) OVERRIDE;
-    virtual void clearDeviceOrientationOverride(ErrorString*) OVERRIDE;
     virtual void setTouchEmulationEnabled(ErrorString*, bool) OVERRIDE;
     virtual void setEmulatedMedia(ErrorString*, const String&) OVERRIDE;
     virtual void captureScreenshot(ErrorString*, const String* format, const int* quality, const int* maxWidth, const int* maxHeight, String* data, RefPtr<TypeBuilder::Page::ScreencastFrameMetadata>& out_metadata) OVERRIDE;
@@ -120,11 +122,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*);
@@ -175,7 +172,7 @@ private:
 
     InspectorPageAgent(Page*, InjectedScriptManager*, InspectorClient*, InspectorOverlay*);
     bool deviceMetricsChanged(int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, double fontScaleFactor, bool textAutosizing);
-    void updateViewMetrics(int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow);
+    void updateViewMetrics(int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, double fontScaleFactor, bool textAutosizingEnabled);
     void updateTouchEventEmulationInPage(bool);
     bool forceCompositingMode(ErrorString*);
 
@@ -200,6 +197,8 @@ private:
     bool m_ignoreScriptsEnabledNotification;
     bool m_deviceMetricsOverridden;
     bool m_emulateViewportEnabled;
+    bool m_embedderTextAutosizingEnabled;
+    double m_embedderFontScaleFactor;
 };