diff options
| author | tiago.vignatti <tiago.vignatti@intel.com> | 2015-03-11 12:44:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-11 19:46:02 +0000 |
| commit | ac25812351c8753b68176cf2595912738c26e4b8 (patch) | |
| tree | 76961cad1a5a566902778b4fa67a8886c342f0de /content | |
| parent | 4a36585c7c380782e999a259c74edd6c06fea793 (diff) | |
| download | chromium_src-ac25812351c8753b68176cf2595912738c26e4b8.zip chromium_src-ac25812351c8753b68176cf2595912738c26e4b8.tar.gz chromium_src-ac25812351c8753b68176cf2595912738c26e4b8.tar.bz2 | |
Fix video_decode_accelerator_unittest build on non-CrOS
When running this unittest in non-CrOS systems, DisplayConfigurator
configure_display_ needs to be initialized as true as well, so the Native
Display will actually be created properly at ::Init time.
BUG=none
TEST=video_decode_accelerator_unittest --vmodule=*/ui/ozone/platform/drm/*=3,
and check the Ozone DRM informational messages that creates the display
Review URL: https://codereview.chromium.org/995103002
Cr-Commit-Position: refs/heads/master@{#320120}
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/gpu/media/DEPS | 1 | ||||
| -rw-r--r-- | content/common/gpu/media/rendering_helper.cc | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/content/common/gpu/media/DEPS b/content/common/gpu/media/DEPS index bf3155c..dac3d1c 100644 --- a/content/common/gpu/media/DEPS +++ b/content/common/gpu/media/DEPS @@ -3,6 +3,7 @@ include_rules = [ "+third_party/libva", "+third_party/libyuv", "+ui/display/chromeos", + "+ui/display/types", "+ui/platform_window", "+third_party/v4l-utils", ] diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc index 3ceea1f..5a499ff 100644 --- a/content/common/gpu/media/rendering_helper.cc +++ b/content/common/gpu/media/rendering_helper.cc @@ -40,6 +40,7 @@ #if defined(USE_OZONE) #if defined(OS_CHROMEOS) #include "ui/display/chromeos/display_configurator.h" +#include "ui/display/types/native_display_delegate.h" #endif // defined(OS_CHROMEOS) #include "ui/ozone/public/ozone_platform.h" #include "ui/platform_window/platform_window.h" @@ -246,6 +247,7 @@ void RenderingHelper::Setup() { base::RunLoop wait_display_setup; DisplayConfiguratorObserver display_setup_observer(&wait_display_setup); display_configurator_.reset(new ui::DisplayConfigurator()); + display_configurator_->SetDelegateForTesting(0); display_configurator_->AddObserver(&display_setup_observer); display_configurator_->Init(true); display_configurator_->ForceInitialConfigure(0); |