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

Side by Side Diff: content/renderer/devtools/render_widget_screen_metrics_emulator.cc

Issue 1737733002: [DevTools] Handle emulated device scale factor and original device scale factor properly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/devtools/render_widget_screen_metrics_emulator.h" 5 #include "content/renderer/devtools/render_widget_screen_metrics_emulator.h"
6 6
7 #include "content/common/resize_params.h" 7 #include "content/common/resize_params.h"
8 #include "content/public/common/context_menu_params.h" 8 #include "content/public/common/context_menu_params.h"
9 #include "content/renderer/devtools/render_widget_screen_metrics_emulator_delega te.h" 9 #include "content/renderer/devtools/render_widget_screen_metrics_emulator_delega te.h"
10 10
11 namespace content { 11 namespace content {
12 12
13 RenderWidgetScreenMetricsEmulator::RenderWidgetScreenMetricsEmulator( 13 RenderWidgetScreenMetricsEmulator::RenderWidgetScreenMetricsEmulator(
14 RenderWidgetScreenMetricsEmulatorDelegate* delegate, 14 RenderWidgetScreenMetricsEmulatorDelegate* delegate,
15 const blink::WebDeviceEmulationParams& params, 15 const blink::WebDeviceEmulationParams& params,
16 const ResizeParams& resize_params, 16 const ResizeParams& resize_params,
17 const gfx::Rect& view_screen_rect, 17 const gfx::Rect& view_screen_rect,
18 const gfx::Rect& window_screen_rect) 18 const gfx::Rect& window_screen_rect)
19 : delegate_(delegate), 19 : delegate_(delegate),
20 emulation_params_(params), 20 emulation_params_(params),
21 scale_(1.f), 21 scale_(1.f),
22 original_resize_params_(resize_params), 22 original_resize_params_(resize_params),
23 original_view_screen_rect_(view_screen_rect), 23 original_view_screen_rect_(view_screen_rect),
24 original_window_screen_rect_(window_screen_rect) { 24 original_window_screen_rect_(window_screen_rect) {
25 Apply();
26 } 25 }
27 26
28 RenderWidgetScreenMetricsEmulator::~RenderWidgetScreenMetricsEmulator() { 27 RenderWidgetScreenMetricsEmulator::~RenderWidgetScreenMetricsEmulator() {
29 delegate_->SetScreenMetricsEmulationParameters(false, emulation_params_); 28 delegate_->SetScreenMetricsEmulationParameters(false, emulation_params_);
30 delegate_->SetScreenRects(original_view_screen_rect_, 29 delegate_->SetScreenRects(original_view_screen_rect_,
31 original_window_screen_rect_); 30 original_window_screen_rect_);
32 delegate_->Resize(original_resize_params_); 31 delegate_->Resize(original_resize_params_);
33 } 32 }
34 33
35 void RenderWidgetScreenMetricsEmulator::ChangeEmulationParams( 34 void RenderWidgetScreenMetricsEmulator::ChangeEmulationParams(
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 160
162 gfx::Rect RenderWidgetScreenMetricsEmulator::AdjustValidationMessageAnchor( 161 gfx::Rect RenderWidgetScreenMetricsEmulator::AdjustValidationMessageAnchor(
163 const gfx::Rect& anchor) { 162 const gfx::Rect& anchor) {
164 gfx::Rect scaled = gfx::ScaleToEnclosedRect(anchor, scale_); 163 gfx::Rect scaled = gfx::ScaleToEnclosedRect(anchor, scale_);
165 scaled.set_x(scaled.x() + offset_.x()); 164 scaled.set_x(scaled.x() + offset_.x());
166 scaled.set_y(scaled.y() + offset_.y()); 165 scaled.set_y(scaled.y() + offset_.y());
167 return scaled; 166 return scaled;
168 } 167 }
169 168
170 } // namespace content 169 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/devtools/render_widget_screen_metrics_emulator.h ('k') | content/renderer/gpu/render_widget_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698