Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "web/DevToolsEmulator.h" | 5 #include "web/DevToolsEmulator.h" |
| 6 | 6 |
| 7 #include "core/frame/FrameView.h" | 7 #include "core/frame/FrameView.h" |
| 8 #include "core/frame/Settings.h" | 8 #include "core/frame/Settings.h" |
| 9 #include "core/frame/VisualViewport.h" | 9 #include "core/frame/VisualViewport.h" |
| 10 #include "core/input/EventHandler.h" | 10 #include "core/input/EventHandler.h" |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 219 return; | 219 return; |
| 220 } | 220 } |
| 221 if (emulation_params_.device_scale_factor != params.device_scale_factor || | 221 if (emulation_params_.device_scale_factor != params.device_scale_factor || |
| 222 !device_metrics_enabled_) | 222 !device_metrics_enabled_) |
| 223 GetMemoryCache()->EvictResources(); | 223 GetMemoryCache()->EvictResources(); |
| 224 | 224 |
| 225 emulation_params_ = params; | 225 emulation_params_ = params; |
| 226 | 226 |
| 227 if (!device_metrics_enabled_) { | 227 if (!device_metrics_enabled_) { |
| 228 device_metrics_enabled_ = true; | 228 device_metrics_enabled_ = true; |
| 229 if (params.view_size.width || params.view_size.height) | 229 if (params.override_gutter_color) |
| 230 web_view_impl_->SetBackgroundColorOverride(Color::kDarkGray); | 230 web_view_impl_->SetBackgroundColorOverride(Color::kDarkGray); |
|
dgozman
2017/04/11 17:29:54
Let's just not override at all. DevTools currently
Eric Seckler
2017/04/12 07:38:44
Perfect! Done.
| |
| 231 } | 231 } |
| 232 | 232 |
| 233 web_view_impl_->GetPage()->GetSettings().SetDeviceScaleAdjustment( | 233 web_view_impl_->GetPage()->GetSettings().SetDeviceScaleAdjustment( |
| 234 calculateDeviceScaleAdjustment(params.view_size.width, | 234 calculateDeviceScaleAdjustment(params.view_size.width, |
| 235 params.view_size.height, | 235 params.view_size.height, |
| 236 params.device_scale_factor)); | 236 params.device_scale_factor)); |
| 237 | 237 |
| 238 if (params.screen_position == WebDeviceEmulationParams::kMobile) | 238 if (params.screen_position == WebDeviceEmulationParams::kMobile) |
| 239 EnableMobileEmulation(); | 239 EnableMobileEmulation(); |
| 240 else | 240 else |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 251 document->MediaQueryAffectingValueChanged(); | 251 document->MediaQueryAffectingValueChanged(); |
| 252 } | 252 } |
| 253 } | 253 } |
| 254 | 254 |
| 255 void DevToolsEmulator::DisableDeviceEmulation() { | 255 void DevToolsEmulator::DisableDeviceEmulation() { |
| 256 if (!device_metrics_enabled_) | 256 if (!device_metrics_enabled_) |
| 257 return; | 257 return; |
| 258 | 258 |
| 259 GetMemoryCache()->EvictResources(); | 259 GetMemoryCache()->EvictResources(); |
| 260 device_metrics_enabled_ = false; | 260 device_metrics_enabled_ = false; |
| 261 web_view_impl_->ClearBackgroundColorOverride(); | 261 if (emulation_params_.override_gutter_color) |
| 262 web_view_impl_->ClearBackgroundColorOverride(); | |
| 262 web_view_impl_->GetPage()->GetSettings().SetDeviceScaleAdjustment( | 263 web_view_impl_->GetPage()->GetSettings().SetDeviceScaleAdjustment( |
| 263 embedder_device_scale_adjustment_); | 264 embedder_device_scale_adjustment_); |
| 264 DisableMobileEmulation(); | 265 DisableMobileEmulation(); |
| 265 web_view_impl_->SetCompositorDeviceScaleFactorOverride(0.f); | 266 web_view_impl_->SetCompositorDeviceScaleFactorOverride(0.f); |
| 266 web_view_impl_->SetPageScaleFactor(1.f); | 267 web_view_impl_->SetPageScaleFactor(1.f); |
| 267 UpdateRootLayerTransform(); | 268 UpdateRootLayerTransform(); |
| 268 // mainFrameImpl() could be null during cleanup or remote <-> local swap. | 269 // mainFrameImpl() could be null during cleanup or remote <-> local swap. |
| 269 if (web_view_impl_->MainFrameImpl()) { | 270 if (web_view_impl_->MainFrameImpl()) { |
| 270 if (Document* document = | 271 if (Document* document = |
| 271 web_view_impl_->MainFrameImpl()->GetFrame()->GetDocument()) | 272 web_view_impl_->MainFrameImpl()->GetFrame()->GetDocument()) |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 556 last_pinch_anchor_css_.reset(); | 557 last_pinch_anchor_css_.reset(); |
| 557 last_pinch_anchor_dip_.reset(); | 558 last_pinch_anchor_dip_.reset(); |
| 558 } | 559 } |
| 559 return true; | 560 return true; |
| 560 } | 561 } |
| 561 | 562 |
| 562 return false; | 563 return false; |
| 563 } | 564 } |
| 564 | 565 |
| 565 } // namespace blink | 566 } // namespace blink |
| OLD | NEW |