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

Side by Side Diff: media/ozone/media_ozone_platform.cc

Issue 1610683003: Add initial SHM-only Wayland Ozone implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "media/ozone/media_ozone_platform.h" 5 #include "media/ozone/media_ozone_platform.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "ui/ozone/platform_object.h" 10 #include "ui/ozone/platform_object.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 50 }
51 51
52 MediaOzonePlatform* CreateMediaOzonePlatformGbm() { 52 MediaOzonePlatform* CreateMediaOzonePlatformGbm() {
53 return new MediaOzonePlatformStub; 53 return new MediaOzonePlatformStub;
54 } 54 }
55 55
56 MediaOzonePlatform* CreateMediaOzonePlatformHeadless() { 56 MediaOzonePlatform* CreateMediaOzonePlatformHeadless() {
57 return new MediaOzonePlatformStub; 57 return new MediaOzonePlatformStub;
58 } 58 }
59 59
60 MediaOzonePlatform* CreateMediaOzonePlatformWayland() {
61 return new MediaOzonePlatformStub;
62 }
63
60 MediaOzonePlatform::MediaOzonePlatform() { 64 MediaOzonePlatform::MediaOzonePlatform() {
61 CHECK(!instance_) << "There should only be a single MediaOzonePlatform."; 65 CHECK(!instance_) << "There should only be a single MediaOzonePlatform.";
62 instance_ = this; 66 instance_ = this;
63 } 67 }
64 68
65 MediaOzonePlatform::~MediaOzonePlatform() { 69 MediaOzonePlatform::~MediaOzonePlatform() {
66 CHECK_EQ(instance_, this); 70 CHECK_EQ(instance_, this);
67 instance_ = NULL; 71 instance_ = NULL;
68 } 72 }
69 73
(...skipping 23 matching lines...) Expand all
93 ui::PlatformObject<MediaOzonePlatform>::Create(); 97 ui::PlatformObject<MediaOzonePlatform>::Create();
94 98
95 // TODO(spang): Currently need to leak this object. 99 // TODO(spang): Currently need to leak this object.
96 CHECK_EQ(instance_, platform.release()); 100 CHECK_EQ(instance_, platform.release());
97 } 101 }
98 102
99 // static 103 // static
100 MediaOzonePlatform* MediaOzonePlatform::instance_; 104 MediaOzonePlatform* MediaOzonePlatform::instance_;
101 105
102 } // namespace media 106 } // namespace media
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | ui/ozone/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698