Chromium Code Reviews| Index: content/common/gpu/media/rendering_helper.cc |
| diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc |
| index 5a499ff02a878e9da27fb4e7f522e94411bed142..5393e263eb0955a5c8c45024e1a6529a132bc93d 100644 |
| --- a/content/common/gpu/media/rendering_helper.cc |
| +++ b/content/common/gpu/media/rendering_helper.cc |
| @@ -240,6 +240,7 @@ void RenderingHelper::Setup() { |
| platform_window_delegate_.reset(new RenderingHelper::StubOzoneDelegate()); |
| window_ = platform_window_delegate_->accelerated_widget(); |
| + gfx::Size window_size(800, 600); |
| #if defined(OS_CHROMEOS) |
| // We hold onto the main loop here to wait for the DisplayController |
| // to give us the size of the display so we can create a window of |
| @@ -255,11 +256,11 @@ void RenderingHelper::Setup() { |
| wait_display_setup.Run(); |
| display_configurator_->RemoveObserver(&display_setup_observer); |
| - platform_window_delegate_->platform_window()->SetBounds( |
| - gfx::Rect(display_configurator_->framebuffer_size())); |
| -#else |
| - platform_window_delegate_->platform_window()->SetBounds(gfx::Rect(800, 600)); |
| + if (!display_configurator_->framebuffer_size().IsEmpty()) |
|
Owen Lin
2015/04/07 03:33:56
I would prefer storing the result in a local varia
dnicoara
2015/04/14 13:48:16
Done.
|
| + window_size = display_configurator_->framebuffer_size(); |
| #endif |
| + platform_window_delegate_->platform_window()->SetBounds( |
| + gfx::Rect(window_size)); |
| // On Ozone/DRI, platform windows are associated with the physical |
| // outputs. Association is achieved by matching the bounds of the |