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

Unified Diff: ui/ozone/platform/cast/ozone_platform_cast.cc

Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: NativePixmapManager is singleton Created 5 years, 5 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/platform/cast/ozone_platform_cast.cc
diff --git a/ui/ozone/platform/cast/ozone_platform_cast.cc b/ui/ozone/platform/cast/ozone_platform_cast.cc
index 60f7c9a901220a23d2ed3f2662da1cdb6a714211..d740e5a0b04f2963fcf76b6b2f83543b05e1ff99 100644
--- a/ui/ozone/platform/cast/ozone_platform_cast.cc
+++ b/ui/ozone/platform/cast/ozone_platform_cast.cc
@@ -5,6 +5,7 @@
#include "ui/ozone/platform/cast/ozone_platform_cast.h"
#include "base/command_line.h"
+#include "base/file_descriptor_posix.h"
#include "chromecast/public/cast_egl_platform.h"
#include "chromecast/public/cast_egl_platform_shlib.h"
#include "ui/ozone/common/native_display_delegate_ozone.h"
@@ -15,6 +16,7 @@
#include "ui/ozone/public/cursor_factory_ozone.h"
#include "ui/ozone/public/gpu_platform_support_host.h"
#include "ui/ozone/public/input_controller.h"
+#include "ui/ozone/public/native_pixmap_manager.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/system_input_injector.h"
@@ -68,6 +70,10 @@ class OzonePlatformCast : public OzonePlatform {
return make_scoped_ptr(new NativeDisplayDelegateOzone());
}
+ base::FileDescriptor GetVirtualDeviceFd() override {
+ return base::FileDescriptor();
+ }
+
void InitializeUI() override {
overlay_manager_.reset(new OverlayManagerCast());
cursor_factory_.reset(new CursorFactoryOzone());
@@ -102,4 +108,8 @@ OzonePlatform* CreateOzonePlatformCast() {
return new OzonePlatformCast(platform.Pass());
}
+NativePixmapManager* CreateNativePixmapManagerCast() {
+ return CreateStubNativePixmapManager();
+}
+
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698