diff options
| author | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 11:18:12 +0000 |
|---|---|---|
| committer | dgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 11:18:12 +0000 |
| commit | 76919ad792a3b5c7f847534498d8c906e7c00108 (patch) | |
| tree | fb3d1887b1ec057258f9935fd28e2882ea2e5163 | |
| parent | 70e90ab7d873972c7242df481e7cfeda09be2071 (diff) | |
| download | chromium_src-76919ad792a3b5c7f847534498d8c906e7c00108.zip chromium_src-76919ad792a3b5c7f847534498d8c906e7c00108.tar.gz chromium_src-76919ad792a3b5c7f847534498d8c906e7c00108.tar.bz2 | |
Merge 260973 "[DevTools] Fix screen_info in popup opened from em..."
> [DevTools] Fix screen_info in popup opened from emulated view.
>
> BUG=358671
>
> Review URL: https://codereview.chromium.org/218403008
TBR=dgozman@chromium.org
Review URL: https://codereview.chromium.org/221653007
git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@261339 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/renderer/render_widget.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc index f930596..e3a40a5 100644 --- a/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc @@ -171,6 +171,7 @@ class RenderWidget::ScreenMetricsEmulator { gfx::Point offset() { return offset_; } gfx::Rect widget_rect() const { return widget_rect_; } gfx::Rect original_screen_rect() const { return original_view_screen_rect_; } + const WebScreenInfo& original_screen_info() { return original_screen_info_; } void ChangeEmulationParams( const gfx::Rect& device_rect, @@ -571,6 +572,8 @@ void RenderWidget::SetPopupOriginAdjustmentsForEmulation( 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()); + screen_info_ = emulator->original_screen_info(); + device_scale_factor_ = screen_info_.deviceScaleFactor; } void RenderWidget::SetScreenMetricsEmulationParameters( |