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

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

Issue 355393004: [DevTools] Rename "emulateViewport" to "mobile". (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: another rebase 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 | « Source/core/inspector/InspectorPageAgent.h ('k') | Source/devtools/front_end/Tests.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorPageAgent.cpp
diff --git a/Source/core/inspector/InspectorPageAgent.cpp b/Source/core/inspector/InspectorPageAgent.cpp
index 57483985c9b9a8f6112b28889f8934e7d6bfb976..bc712f4b13190c46b37e4b1016c93c8f84fc1264 100644
--- a/Source/core/inspector/InspectorPageAgent.cpp
+++ b/Source/core/inspector/InspectorPageAgent.cpp
@@ -91,7 +91,7 @@ static const char deviceMetricsOverrideEnabled[] = "deviceMetricsOverrideEnabled
static const char pageAgentScreenWidthOverride[] = "pageAgentScreenWidthOverride";
static const char pageAgentScreenHeightOverride[] = "pageAgentScreenHeightOverride";
static const char pageAgentDeviceScaleFactorOverride[] = "pageAgentDeviceScaleFactorOverride";
-static const char pageAgentEmulateViewport[] = "pageAgentEmulateViewport";
+static const char pageAgentEmulateMobile[] = "pageAgentEmulateMobile";
static const char pageAgentFitWindow[] = "pageAgentFitWindow";
static const char deviceScale[] = "deviceScale";
static const char deviceOffsetX[] = "deviceOffsetX";
@@ -401,7 +401,7 @@ InspectorPageAgent::InspectorPageAgent(Page* page, InjectedScriptManager* inject
, m_enabled(false)
, m_ignoreScriptsEnabledNotification(false)
, m_deviceMetricsOverridden(false)
- , m_emulateViewportEnabled(false)
+ , m_emulateMobileEnabled(false)
, m_touchEmulationEnabled(false)
, m_originalTouchEnabled(false)
, m_originalDeviceSupportsMouse(false)
@@ -414,16 +414,16 @@ InspectorPageAgent::InspectorPageAgent(Page* page, InjectedScriptManager* inject
void InspectorPageAgent::setTextAutosizingEnabled(bool enabled)
{
m_embedderTextAutosizingEnabled = enabled;
- bool emulateViewportEnabled = m_enabled && m_deviceMetricsOverridden && m_emulateViewportEnabled;
- if (!emulateViewportEnabled)
+ bool emulateMobileEnabled = m_enabled && m_deviceMetricsOverridden && m_emulateMobileEnabled;
+ if (!emulateMobileEnabled)
m_page->settings().setTextAutosizingEnabled(enabled);
}
void InspectorPageAgent::setDeviceScaleAdjustment(float deviceScaleAdjustment)
{
m_embedderFontScaleFactor = deviceScaleAdjustment;
- bool emulateViewportEnabled = m_enabled && m_deviceMetricsOverridden && m_emulateViewportEnabled;
- if (!emulateViewportEnabled)
+ bool emulateMobileEnabled = m_enabled && m_deviceMetricsOverridden && m_emulateMobileEnabled;
+ if (!emulateMobileEnabled)
m_page->settings().setDeviceScaleAdjustment(deviceScaleAdjustment);
}
@@ -504,7 +504,7 @@ void InspectorPageAgent::disable(ErrorString*)
m_state->setLong(PageAgentState::pageAgentScreenWidthOverride, 0);
m_state->setLong(PageAgentState::pageAgentScreenHeightOverride, 0);
m_state->setDouble(PageAgentState::pageAgentDeviceScaleFactorOverride, 0);
- m_state->setBoolean(PageAgentState::pageAgentEmulateViewport, false);
+ m_state->setBoolean(PageAgentState::pageAgentEmulateMobile, false);
m_state->setBoolean(PageAgentState::pageAgentFitWindow, false);
m_state->setDouble(PageAgentState::deviceScale, 1);
m_state->setDouble(PageAgentState::deviceOffsetX, 0);
@@ -771,7 +771,7 @@ void InspectorPageAgent::setDocumentContent(ErrorString* errorString, const Stri
DOMPatchSupport::patchDocument(*document, html);
}
-void InspectorPageAgent::setDeviceMetricsOverride(ErrorString* errorString, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, const double* optionalScale, const double* optionalOffsetX, const double* optionalOffsetY)
+void InspectorPageAgent::setDeviceMetricsOverride(ErrorString* errorString, int width, int height, double deviceScaleFactor, bool mobile, bool fitWindow, const double* optionalScale, const double* optionalOffsetX, const double* optionalOffsetY)
{
const static long maxDimension = 10000000;
const static double maxScale = 10;
@@ -802,14 +802,14 @@ void InspectorPageAgent::setDeviceMetricsOverride(ErrorString* errorString, int
return;
}
- if (!deviceMetricsChanged(true, width, height, deviceScaleFactor, emulateViewport, fitWindow, scale, offsetX, offsetY))
+ if (!deviceMetricsChanged(true, width, height, deviceScaleFactor, mobile, fitWindow, scale, offsetX, offsetY))
return;
m_state->setBoolean(PageAgentState::deviceMetricsOverrideEnabled, true);
m_state->setLong(PageAgentState::pageAgentScreenWidthOverride, width);
m_state->setLong(PageAgentState::pageAgentScreenHeightOverride, height);
m_state->setDouble(PageAgentState::pageAgentDeviceScaleFactorOverride, deviceScaleFactor);
- m_state->setBoolean(PageAgentState::pageAgentEmulateViewport, emulateViewport);
+ m_state->setBoolean(PageAgentState::pageAgentEmulateMobile, mobile);
m_state->setBoolean(PageAgentState::pageAgentFitWindow, fitWindow);
m_state->setDouble(PageAgentState::deviceScale, scale);
m_state->setDouble(PageAgentState::deviceOffsetX, offsetX);
@@ -830,14 +830,14 @@ void InspectorPageAgent::resetScrollAndPageScaleFactor(ErrorString*)
m_client->resetScrollAndPageScaleFactor();
}
-bool InspectorPageAgent::deviceMetricsChanged(bool enabled, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, double scale, double offsetX, double offsetY)
+bool InspectorPageAgent::deviceMetricsChanged(bool enabled, int width, int height, double deviceScaleFactor, bool mobile, bool fitWindow, double scale, double offsetX, double offsetY)
{
bool currentEnabled = m_state->getBoolean(PageAgentState::deviceMetricsOverrideEnabled);
// These two always fit an int.
int currentWidth = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenWidthOverride));
int currentHeight = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenHeightOverride));
double currentDeviceScaleFactor = m_state->getDouble(PageAgentState::pageAgentDeviceScaleFactorOverride, 0);
- bool currentEmulateViewport = m_state->getBoolean(PageAgentState::pageAgentEmulateViewport);
+ bool currentMobile = m_state->getBoolean(PageAgentState::pageAgentEmulateMobile);
bool currentFitWindow = m_state->getBoolean(PageAgentState::pageAgentFitWindow);
double currentScale = m_state->getDouble(PageAgentState::deviceScale, 1);
double currentOffsetX = m_state->getDouble(PageAgentState::deviceOffsetX, 0);
@@ -847,7 +847,7 @@ bool InspectorPageAgent::deviceMetricsChanged(bool enabled, int width, int heigh
|| width != currentWidth
|| height != currentHeight
|| deviceScaleFactor != currentDeviceScaleFactor
- || emulateViewport != currentEmulateViewport
+ || mobile != currentMobile
|| fitWindow != currentFitWindow
|| scale != currentScale
|| offsetX != currentOffsetX
@@ -1283,24 +1283,24 @@ void InspectorPageAgent::updateViewMetricsFromState()
bool enabled = m_state->getBoolean(PageAgentState::deviceMetricsOverrideEnabled);
int width = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenWidthOverride));
int height = static_cast<int>(m_state->getLong(PageAgentState::pageAgentScreenHeightOverride));
- bool emulateViewport = m_state->getBoolean(PageAgentState::pageAgentEmulateViewport);
+ bool mobile = m_state->getBoolean(PageAgentState::pageAgentEmulateMobile);
double deviceScaleFactor = m_state->getDouble(PageAgentState::pageAgentDeviceScaleFactorOverride);
bool fitWindow = m_state->getBoolean(PageAgentState::pageAgentFitWindow);
double scale = m_state->getDouble(PageAgentState::deviceScale, 1);
double offsetX = m_state->getDouble(PageAgentState::deviceOffsetX, 0);
double offsetY = m_state->getDouble(PageAgentState::deviceOffsetY, 0);
- updateViewMetrics(enabled, width, height, deviceScaleFactor, emulateViewport, fitWindow, scale, offsetX, offsetY);
+ updateViewMetrics(enabled, width, height, deviceScaleFactor, mobile, fitWindow, scale, offsetX, offsetY);
}
-void InspectorPageAgent::updateViewMetrics(bool enabled, int width, int height, double deviceScaleFactor, bool emulateViewport, bool fitWindow, double scale, double offsetX, double offsetY)
+void InspectorPageAgent::updateViewMetrics(bool enabled, int width, int height, double deviceScaleFactor, bool mobile, bool fitWindow, double scale, double offsetX, double offsetY)
{
if (enabled && !m_page->settings().acceleratedCompositingEnabled())
return;
m_deviceMetricsOverridden = enabled;
- m_emulateViewportEnabled = emulateViewport;
+ m_emulateMobileEnabled = mobile;
if (enabled)
- m_client->setDeviceMetricsOverride(width, height, static_cast<float>(deviceScaleFactor), emulateViewport, fitWindow, static_cast<float>(scale), static_cast<float>(offsetX), static_cast<float>(offsetY));
+ m_client->setDeviceMetricsOverride(width, height, static_cast<float>(deviceScaleFactor), mobile, fitWindow, static_cast<float>(scale), static_cast<float>(offsetX), static_cast<float>(offsetY));
else
m_client->clearDeviceMetricsOverride();
@@ -1312,7 +1312,7 @@ void InspectorPageAgent::updateViewMetrics(bool enabled, int width, int height,
InspectorInstrumentation::mediaQueryResultChanged(document);
if (m_deviceMetricsOverridden) {
- m_page->settings().setTextAutosizingEnabled(emulateViewport);
+ m_page->settings().setTextAutosizingEnabled(mobile);
m_page->settings().setDeviceScaleAdjustment(calculateFontScaleFactor(width, height, static_cast<float>(deviceScaleFactor)));
} else {
m_page->settings().setTextAutosizingEnabled(m_embedderTextAutosizingEnabled);
@@ -1380,7 +1380,7 @@ void InspectorPageAgent::setEmulatedMedia(ErrorString*, const String& media)
bool InspectorPageAgent::applyViewportStyleOverride(StyleResolver* resolver)
{
- if (!m_deviceMetricsOverridden || !m_emulateViewportEnabled)
+ if (!m_deviceMetricsOverridden || !m_emulateMobileEnabled)
return false;
RefPtrWillBeRawPtr<StyleSheetContents> styleSheet = StyleSheetContents::create(CSSParserContext(UASheetMode, 0));
« no previous file with comments | « Source/core/inspector/InspectorPageAgent.h ('k') | Source/devtools/front_end/Tests.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698