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/browser/renderer_host/render_widget_host_view_base.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_base.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/browser/accessibility/browser_accessibility_manager.h" | 8 #include "content/browser/accessibility/browser_accessibility_manager.h" |
| 9 #include "content/browser/browser_main_loop.h" |
9 #include "content/browser/gpu/gpu_data_manager_impl.h" | 10 #include "content/browser/gpu/gpu_data_manager_impl.h" |
10 #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h" | 11 #include "content/browser/renderer_host/input/synthetic_gesture_target_base.h" |
| 12 #include "content/browser/renderer_host/media/media_stream_manager.h" |
11 #include "content/browser/renderer_host/render_process_host_impl.h" | 13 #include "content/browser/renderer_host/render_process_host_impl.h" |
12 #include "content/browser/renderer_host/render_widget_host_impl.h" | 14 #include "content/browser/renderer_host/render_widget_host_impl.h" |
13 #include "content/common/content_switches_internal.h" | 15 #include "content/common/content_switches_internal.h" |
14 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" | 16 #include "content/public/browser/render_widget_host_view_frame_subscriber.h" |
15 #include "third_party/WebKit/public/platform/WebScreenInfo.h" | 17 #include "third_party/WebKit/public/platform/WebScreenInfo.h" |
16 #include "ui/gfx/display.h" | 18 #include "ui/gfx/display.h" |
17 #include "ui/gfx/screen.h" | 19 #include "ui/gfx/screen.h" |
18 #include "ui/gfx/size_conversions.h" | 20 #include "ui/gfx/size_conversions.h" |
19 #include "ui/gfx/size_f.h" | 21 #include "ui/gfx/size_f.h" |
20 | 22 |
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 gfx::Screen::GetScreenFor(view)->GetDisplayNearestWindow(view); | 517 gfx::Screen::GetScreenFor(view)->GetDisplayNearestWindow(view); |
516 if (current_display_area_ == display.work_area() && | 518 if (current_display_area_ == display.work_area() && |
517 current_device_scale_factor_ == display.device_scale_factor() && | 519 current_device_scale_factor_ == display.device_scale_factor() && |
518 current_display_rotation_ == display.rotation()) { | 520 current_display_rotation_ == display.rotation()) { |
519 return false; | 521 return false; |
520 } | 522 } |
521 | 523 |
522 current_display_area_ = display.work_area(); | 524 current_display_area_ = display.work_area(); |
523 current_device_scale_factor_ = display.device_scale_factor(); | 525 current_device_scale_factor_ = display.device_scale_factor(); |
524 current_display_rotation_ = display.rotation(); | 526 current_display_rotation_ = display.rotation(); |
| 527 |
| 528 content::MediaStreamManager* manager = |
| 529 content::BrowserMainLoop::GetInstance()->media_stream_manager(); |
| 530 manager->SetDisplayRotation(current_display_rotation_); |
| 531 |
525 return true; | 532 return true; |
526 } | 533 } |
527 | 534 |
528 scoped_ptr<SyntheticGestureTarget> | 535 scoped_ptr<SyntheticGestureTarget> |
529 RenderWidgetHostViewBase::CreateSyntheticGestureTarget() { | 536 RenderWidgetHostViewBase::CreateSyntheticGestureTarget() { |
530 RenderWidgetHostImpl* host = | 537 RenderWidgetHostImpl* host = |
531 RenderWidgetHostImpl::From(GetRenderWidgetHost()); | 538 RenderWidgetHostImpl::From(GetRenderWidgetHost()); |
532 return scoped_ptr<SyntheticGestureTarget>( | 539 return scoped_ptr<SyntheticGestureTarget>( |
533 new SyntheticGestureTargetBase(host)); | 540 new SyntheticGestureTargetBase(host)); |
534 } | 541 } |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 | 599 |
593 gfx::Size RenderWidgetHostViewBase::GetVisibleViewportSize() const { | 600 gfx::Size RenderWidgetHostViewBase::GetVisibleViewportSize() const { |
594 return GetViewBounds().size(); | 601 return GetViewBounds().size(); |
595 } | 602 } |
596 | 603 |
597 void RenderWidgetHostViewBase::SetInsets(const gfx::Insets& insets) { | 604 void RenderWidgetHostViewBase::SetInsets(const gfx::Insets& insets) { |
598 NOTIMPLEMENTED(); | 605 NOTIMPLEMENTED(); |
599 } | 606 } |
600 | 607 |
601 } // namespace content | 608 } // namespace content |
OLD | NEW |