DevTools: do not set visible size while emulating in case of device mode.
Bug: 742990
Change-Id: Ibe303f5e0f5a94015adad2b0d90de963b25d61fb
TBR: tsepez (removing params from ipc message)
Reviewed-on: https://chromium-review.googlesource.com/572222
Commit-Queue: Pavel Feldman <[email protected]>
Reviewed-by: Tom Sepez <[email protected]>
Reviewed-by: Dmitry Gozman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#488472}diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 8cc8e86..6349568d 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -565,9 +565,9 @@
RenderWidgetScreenMetricsEmulator* emulator) {
popup_origin_scale_for_emulation_ = emulator->scale();
popup_view_origin_for_emulation_ = emulator->applied_widget_rect().origin();
- popup_screen_origin_for_emulation_ = gfx::Point(
- emulator->original_screen_rect().origin().x() + emulator->offset().x(),
- emulator->original_screen_rect().origin().y() + emulator->offset().y());
+ popup_screen_origin_for_emulation_ =
+ gfx::Point(emulator->original_screen_rect().origin().x(),
+ emulator->original_screen_rect().origin().y());
screen_info_ = emulator->original_screen_info();
device_scale_factor_ = screen_info_.device_scale_factor;
}
@@ -582,8 +582,7 @@
void RenderWidget::SetExternalPopupOriginAdjustmentsForEmulation(
ExternalPopupMenu* popup,
RenderWidgetScreenMetricsEmulator* emulator) {
- popup->SetOriginScaleAndOffsetForEmulation(
- emulator->scale(), emulator->offset());
+ popup->SetOriginScaleForEmulation(emulator->scale());
}
#endif
