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

Unified Diff: content/renderer/devtools/devtools_agent.cc

Issue 220263003: [DevTools] Migrate device emulation to WebDeviceEmulationParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 9 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 | « content/renderer/devtools/devtools_agent.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/devtools/devtools_agent.cc
diff --git a/content/renderer/devtools/devtools_agent.cc b/content/renderer/devtools/devtools_agent.cc
index 0783dda77ccf34468357677c2066f34f49dcf3f3..eb33fbed7e554c7e8ba1b1d41d496555de5d9947 100644
--- a/content/renderer/devtools/devtools_agent.cc
+++ b/content/renderer/devtools/devtools_agent.cc
@@ -24,6 +24,7 @@
#include "third_party/WebKit/public/web/WebConsoleMessage.h"
#include "third_party/WebKit/public/web/WebConsoleMessage.h"
#include "third_party/WebKit/public/web/WebDevToolsAgent.h"
+#include "third_party/WebKit/public/web/WebDeviceEmulationParams.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebSettings.h"
#include "third_party/WebKit/public/web/WebView.h"
@@ -223,10 +224,22 @@ void DevToolsAgent::enableDeviceEmulation(
const blink::WebRect& view_rect,
float device_scale_factor,
bool fit_to_view) {
+ blink::WebDeviceEmulationParams params;
+ params.screenPosition = device_rect.isEmpty() ?
+ blink::WebDeviceEmulationParams::Desktop :
+ blink::WebDeviceEmulationParams::Mobile;
+ params.deviceScaleFactor = device_scale_factor;
+ params.viewSize = blink::WebSize(view_rect.width, view_rect.height);
+ params.fitToView = fit_to_view;
+ params.viewInsets = blink::WebSize(device_rect.x, device_rect.y);
+ enableDeviceEmulation(params);
+}
+
+void DevToolsAgent::enableDeviceEmulation(
+ const blink::WebDeviceEmulationParams& params) {
RenderViewImpl* impl = static_cast<RenderViewImpl*>(render_view());
impl->webview()->settings()->setForceCompositingMode(true);
- impl->EnableScreenMetricsEmulation(gfx::Rect(device_rect),
- gfx::Rect(view_rect), device_scale_factor, fit_to_view);
+ impl->EnableScreenMetricsEmulation(params);
}
void DevToolsAgent::disableDeviceEmulation() {
« no previous file with comments | « content/renderer/devtools/devtools_agent.h ('k') | content/renderer/render_widget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698