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

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

Issue 2808123004: [devtools] Remove device emulation background color override. (Closed)
Patch Set: fix android tests Created 3 years, 8 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
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 modified_emulation_params.device_scale_factor = 138 modified_emulation_params.device_scale_factor =
139 original_screen_info().device_scale_factor; 139 original_screen_info().device_scale_factor;
140 modified_emulation_params.offset = 140 modified_emulation_params.offset =
141 blink::WebFloatPoint(offset_.x(), offset_.y()); 141 blink::WebFloatPoint(offset_.x(), offset_.y());
142 modified_emulation_params.scale = scale_; 142 modified_emulation_params.scale = scale_;
143 delegate_->SetScreenMetricsEmulationParameters(true, 143 delegate_->SetScreenMetricsEmulationParameters(true,
144 modified_emulation_params); 144 modified_emulation_params);
145 145
146 delegate_->SetScreenRects(applied_widget_rect_, window_screen_rect); 146 delegate_->SetScreenRects(applied_widget_rect_, window_screen_rect);
147 147
148 modified_resize_params.physical_backing_size =
Eric Seckler 2017/04/12 16:18:46 @Dmirty: This was causing a test failure b/c of an
dgozman 2017/04/12 18:21:23 You are right. I guess this has evolved to be usel
149 gfx::ScaleToCeiledSize(original_resize_params_.new_size,
150 original_screen_info().device_scale_factor);
151 modified_resize_params.new_size = applied_widget_rect_.size(); 148 modified_resize_params.new_size = applied_widget_rect_.size();
152 modified_resize_params.visible_viewport_size = applied_widget_rect_.size(); 149 modified_resize_params.visible_viewport_size = applied_widget_rect_.size();
153 modified_resize_params.needs_resize_ack = false; 150 modified_resize_params.needs_resize_ack = false;
154 delegate_->Resize(modified_resize_params); 151 delegate_->Resize(modified_resize_params);
155 } 152 }
156 153
157 void RenderWidgetScreenMetricsEmulator::OnResize(const ResizeParams& params) { 154 void RenderWidgetScreenMetricsEmulator::OnResize(const ResizeParams& params) {
158 original_resize_params_ = params; 155 original_resize_params_ = params;
159 Apply(); 156 Apply();
160 157
(...skipping 30 matching lines...) Expand all
191 188
192 gfx::Rect RenderWidgetScreenMetricsEmulator::AdjustValidationMessageAnchor( 189 gfx::Rect RenderWidgetScreenMetricsEmulator::AdjustValidationMessageAnchor(
193 const gfx::Rect& anchor) { 190 const gfx::Rect& anchor) {
194 gfx::Rect scaled = gfx::ScaleToEnclosedRect(anchor, scale_); 191 gfx::Rect scaled = gfx::ScaleToEnclosedRect(anchor, scale_);
195 scaled.set_x(scaled.x() + offset_.x()); 192 scaled.set_x(scaled.x() + offset_.x());
196 scaled.set_y(scaled.y() + offset_.y()); 193 scaled.set_y(scaled.y() + offset_.y());
197 return scaled; 194 return scaled;
198 } 195 }
199 196
200 } // namespace content 197 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698