Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: ui/ozone/ozone_platform.cc

Issue 269673005: media: Add MediaOzonePlatform support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/ozone/ozone_platform.cc
diff --git a/ui/ozone/ozone_platform.cc b/ui/ozone/ozone_platform.cc
index e8199b2ce93f86846235f73b8459b9f650859d5f..3edc093c2505f3b68a2a5695f564b3ac9eeefd68 100644
--- a/ui/ozone/ozone_platform.cc
+++ b/ui/ozone/ozone_platform.cc
@@ -5,6 +5,7 @@
#include "base/command_line.h"
#include "base/debug/trace_event.h"
#include "base/logging.h"
+#include "content/common/gpu/media/video_decode_factory_ozone.h"
#include "ui/base/cursor/ozone/cursor_factory_ozone.h"
#include "ui/events/ozone/event_factory_ozone.h"
#include "ui/gfx/ozone/surface_factory_ozone.h"
@@ -43,6 +44,7 @@ std::string GetPlatformName() {
OzonePlatform::OzonePlatform() {}
OzonePlatform::~OzonePlatform() {
+ content::VideoDecodeFactoryOzone::SetInstance(NULL);
gfx::SurfaceFactoryOzone::SetInstance(NULL);
ui::EventFactoryOzone::SetInstance(NULL);
ui::CursorFactoryOzone::SetInstance(NULL);
@@ -60,6 +62,8 @@ void OzonePlatform::Initialize() {
instance_ = CreatePlatform(platform);
// Inject ozone interfaces.
+ content::VideoDecodeFactoryOzone::SetInstance(
+ instance_->GetVideoDecodeFactoryOzone());
gfx::SurfaceFactoryOzone::SetInstance(instance_->GetSurfaceFactoryOzone());
ui::EventFactoryOzone::SetInstance(instance_->GetEventFactoryOzone());
ui::InputMethodContextFactoryOzone::SetInstance(

Powered by Google App Engine
This is Rietveld 408576698