| Index: Source/core/inspector/InspectorPageAgent.h
|
| diff --git a/Source/core/inspector/InspectorPageAgent.h b/Source/core/inspector/InspectorPageAgent.h
|
| index d919c822d05c12ddf118aefc274f66f391c95641..7bce277a346cca405e4bef5b765f44fc0fea9563 100644
|
| --- a/Source/core/inspector/InspectorPageAgent.h
|
| +++ b/Source/core/inspector/InspectorPageAgent.h
|
| @@ -99,7 +99,7 @@ public:
|
| virtual void getResourceContent(ErrorString*, const String& frameId, const String& url, String* content, bool* base64Encoded);
|
| virtual void searchInResource(ErrorString*, const String& frameId, const String& url, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> >&);
|
| virtual void setDocumentContent(ErrorString*, const String& frameId, const String& html);
|
| - virtual void setDeviceMetricsOverride(ErrorString*, int width, int height, double deviceScaleFactor, bool fitWindow, const bool* optionalTextAutosizing, const double* optionalFontScaleFactor);
|
| + virtual void setDeviceMetricsOverride(ErrorString*, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, const bool* optionalTextAutosizing, const double* optionalFontScaleFactor);
|
| virtual void setShowPaintRects(ErrorString*, bool show);
|
| virtual void setShowDebugBorders(ErrorString*, bool show);
|
| virtual void setShowFPSCounter(ErrorString*, bool show);
|
| @@ -182,8 +182,8 @@ private:
|
| static void resourceContent(ErrorString*, Frame*, const KURL&, String* result, bool* base64Encoded);
|
|
|
| InspectorPageAgent(InstrumentingAgents*, Page*, InspectorCompositeState*, InjectedScriptManager*, InspectorClient*, InspectorOverlay*);
|
| - bool deviceMetricsChanged(int width, int height, double deviceScaleFactor, bool fitWindow, double fontScaleFactor, bool textAutosizing);
|
| - void updateViewMetrics(int width, int height, double deviceScaleFactor, bool fitWindow);
|
| + 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 updateTouchEventEmulationInPage(bool);
|
|
|
| static bool dataContent(const char* data, unsigned size, const String& textEncodingName, bool withBase64Encode, String* result);
|
|
|