OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/render_widget.h" | 5 #include "content/renderer/render_widget.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 // root layer. | 407 // root layer. |
408 blink::WebDeviceEmulationParams modified_params = params_; | 408 blink::WebDeviceEmulationParams modified_params = params_; |
409 modified_params.deviceScaleFactor = original_screen_info_.deviceScaleFactor; | 409 modified_params.deviceScaleFactor = original_screen_info_.deviceScaleFactor; |
410 modified_params.offset = blink::WebFloatPoint(offset_.x(), offset_.y()); | 410 modified_params.offset = blink::WebFloatPoint(offset_.x(), offset_.y()); |
411 modified_params.scale = scale_; | 411 modified_params.scale = scale_; |
412 widget_->SetScreenMetricsEmulationParameters(true, modified_params); | 412 widget_->SetScreenMetricsEmulationParameters(true, modified_params); |
413 | 413 |
414 widget_->SetDeviceScaleFactor(applied_device_scale_factor); | 414 widget_->SetDeviceScaleFactor(applied_device_scale_factor); |
415 widget_->view_screen_rect_ = applied_widget_rect_; | 415 widget_->view_screen_rect_ = applied_widget_rect_; |
416 | 416 |
417 gfx::Size physical_backing_size = gfx::ToCeiledSize(gfx::ScaleSize( | 417 gfx::Size physical_backing_size = gfx::ScaleToCeiledSize( |
418 original_size_, original_screen_info_.deviceScaleFactor)); | 418 original_size_, original_screen_info_.deviceScaleFactor); |
419 widget_->Resize(applied_widget_rect_.size(), | 419 widget_->Resize(applied_widget_rect_.size(), |
420 physical_backing_size, | 420 physical_backing_size, |
421 top_controls_shrink_blink_size, | 421 top_controls_shrink_blink_size, |
422 top_controls_height, | 422 top_controls_height, |
423 applied_widget_rect_.size(), | 423 applied_widget_rect_.size(), |
424 resizer_rect, | 424 resizer_rect, |
425 is_fullscreen_granted, | 425 is_fullscreen_granted, |
426 display_mode, | 426 display_mode, |
427 NO_RESIZE_ACK); | 427 NO_RESIZE_ACK); |
428 } | 428 } |
(...skipping 926 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1355 } | 1355 } |
1356 | 1356 |
1357 AutoResizeCompositor(); | 1357 AutoResizeCompositor(); |
1358 | 1358 |
1359 if (!resizing_mode_selector_->is_synchronous_mode()) | 1359 if (!resizing_mode_selector_->is_synchronous_mode()) |
1360 need_update_rect_for_auto_resize_ = true; | 1360 need_update_rect_for_auto_resize_ = true; |
1361 } | 1361 } |
1362 } | 1362 } |
1363 | 1363 |
1364 void RenderWidget::AutoResizeCompositor() { | 1364 void RenderWidget::AutoResizeCompositor() { |
1365 physical_backing_size_ = gfx::ToCeiledSize(gfx::ScaleSize(size_, | 1365 physical_backing_size_ = gfx::ScaleToCeiledSize(size_, device_scale_factor_); |
1366 device_scale_factor_)); | |
1367 if (compositor_) | 1366 if (compositor_) |
1368 compositor_->setViewportSize(size_, physical_backing_size_); | 1367 compositor_->setViewportSize(size_, physical_backing_size_); |
1369 } | 1368 } |
1370 | 1369 |
1371 void RenderWidget::initializeLayerTreeView() { | 1370 void RenderWidget::initializeLayerTreeView() { |
1372 DCHECK(!host_closing_); | 1371 DCHECK(!host_closing_); |
1373 | 1372 |
1374 compositor_ = RenderWidgetCompositor::Create(this, compositor_deps_); | 1373 compositor_ = RenderWidgetCompositor::Create(this, compositor_deps_); |
1375 compositor_->setViewportSize(size_, physical_backing_size_); | 1374 compositor_->setViewportSize(size_, physical_backing_size_); |
1376 if (init_complete_) | 1375 if (init_complete_) |
(...skipping 1042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2419 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { | 2418 void RenderWidget::RegisterVideoHoleFrame(RenderFrameImpl* frame) { |
2420 video_hole_frames_.AddObserver(frame); | 2419 video_hole_frames_.AddObserver(frame); |
2421 } | 2420 } |
2422 | 2421 |
2423 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { | 2422 void RenderWidget::UnregisterVideoHoleFrame(RenderFrameImpl* frame) { |
2424 video_hole_frames_.RemoveObserver(frame); | 2423 video_hole_frames_.RemoveObserver(frame); |
2425 } | 2424 } |
2426 #endif // defined(VIDEO_HOLE) | 2425 #endif // defined(VIDEO_HOLE) |
2427 | 2426 |
2428 } // namespace content | 2427 } // namespace content |
OLD | NEW |