Source/core/inspector/InspectorPageAgent.h - Issue 345723003: [DevTools] Separate text autosizing from device metrics override.

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

Issue 345723003: [DevTools] Separate text autosizing from device metrics override. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Removed dead code Created 6 years, 6 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 | « LayoutTests/inspector/text-autosizing-override.html ('k') | Source/core/inspector/InspectorPageAgent.cpp » ('j') | Source/core/inspector/InspectorPageAgent.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/inspector/InspectorPageAgent.h

diff --git a/Source/core/inspector/InspectorPageAgent.h b/Source/core/inspector/InspectorPageAgent.h

index ed67e0aa4d4ec4707744f73a1445e4586621b746..2e098d6bceb3815ee955e3068f5507edbf2a7668 100644

--- a/Source/core/inspector/InspectorPageAgent.h

+++ b/Source/core/inspector/InspectorPageAgent.h

@@ -108,7 +108,7 @@ public:

virtual void hasTouchInputs(ErrorString*, bool* result) OVERRIDE;

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> >&) OVERRIDE;

virtual void setDocumentContent(ErrorString*, const String& frameId, const String& html) OVERRIDE;

- virtual void setDeviceMetricsOverride(ErrorString*, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, const double* optionalScale, const double* optionalOffsetX, const double* optionalOffsetY, const bool* optionalTextAutosizing, const double* optionalFontScaleFactor) OVERRIDE;

+ virtual void setDeviceMetricsOverride(ErrorString*, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, const double* optionalScale, const double* optionalOffsetX, const double* optionalOffsetY) OVERRIDE;

virtual void clearDeviceMetricsOverride(ErrorString*) OVERRIDE;

virtual void setShowPaintRects(ErrorString*, bool show) OVERRIDE;

virtual void setShowDebugBorders(ErrorString*, bool show) OVERRIDE;

@@ -172,9 +172,9 @@ private:

static void resourceContent(ErrorString*, LocalFrame*, const KURL&, String* result, bool* base64Encoded);

InspectorPageAgent(Page*, InjectedScriptManager*, InspectorClient*, InspectorOverlay*);

- bool deviceMetricsChanged(bool enabled, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, double scale, double offsetX, double offsetY, double fontScaleFactor, bool textAutosizing);

+ bool deviceMetricsChanged(bool enabled, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, double scale, double offsetX, double offsetY);

void updateViewMetricsFromState();

- void updateViewMetrics(bool enabled, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, double scale, double offsetX, double offsetY, double fontScaleFactor, bool textAutosizingEnabled);

+ void updateViewMetrics(bool enabled, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, double scale, double offsetX, double offsetY);

void updateTouchEventEmulationInPage(bool);

bool compositingEnabled(ErrorString*);