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

Unified Diff: ui/ozone/platform/drm/ozone_platform_drm.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/drm/ozone_platform_drm.cc
diff --git a/ui/ozone/platform/drm/ozone_platform_drm.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc
index 0d40c719b4f44861e4d0da4501b382e309608665..b0047a01b04c73b3368874dc944843bbdb8ac96f 100644
--- a/ui/ozone/platform/drm/ozone_platform_drm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_drm.cc
@@ -5,6 +5,7 @@
#include "ui/ozone/platform/drm/ozone_platform_drm.h"
#include "base/at_exit.h"
+#include "base/file_descriptor_posix.h"
#include "base/thread_task_runner_handle.h"
#include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
#include "ui/events/ozone/device/device_manager.h"
@@ -28,6 +29,7 @@
#include "ui/ozone/platform/drm/host/drm_overlay_manager.h"
#include "ui/ozone/platform/drm/host/drm_window_host.h"
#include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
+#include "ui/ozone/public/native_pixmap_manager.h"
#include "ui/ozone/public/ozone_gpu_test_helper.h"
#include "ui/ozone/public/ozone_platform.h"
@@ -90,6 +92,9 @@ class OzonePlatformDrm : public OzonePlatform {
return make_scoped_ptr(
new DrmNativeDisplayDelegate(display_manager_.get()));
}
+ base::FileDescriptor GetVirtualDeviceFd() override {
+ return base::FileDescriptor();
+ }
void InitializeUI() override {
drm_device_manager_.reset(new DrmDeviceManager(
scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
@@ -165,4 +170,12 @@ OzonePlatform* CreateOzonePlatformDrm() {
return new OzonePlatformDrm;
}
+NativePixmapManager* CreateNativePixmapManagerDri() {
+ return CreateStubNativePixmapManager();
+}
+
+NativePixmapManager* CreateNativePixmapManagerDrm() {
+ return CreateStubNativePixmapManager();
+}
+
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698