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

Unified Diff: ui/ozone/platform/egltest/ozone_platform_egltest.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/egltest/ozone_platform_egltest.cc
diff --git a/ui/ozone/platform/egltest/ozone_platform_egltest.cc b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
index 2ec2a6649f40d48323d944d68a0ad556aaf2f7cc..d0facc121e1060423c951f38e48844a475595109 100644
--- a/ui/ozone/platform/egltest/ozone_platform_egltest.cc
+++ b/ui/ozone/platform/egltest/ozone_platform_egltest.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/environment.h"
+#include "base/file_descriptor_posix.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "base/threading/thread_checker.h"
@@ -27,6 +28,7 @@
#include "ui/ozone/public/cursor_factory_ozone.h"
#include "ui/ozone/public/gpu_platform_support.h"
#include "ui/ozone/public/gpu_platform_support_host.h"
+#include "ui/ozone/public/native_pixmap_manager.h"
#include "ui/ozone/public/ozone_platform.h"
#include "ui/ozone/public/ozone_switches.h"
#include "ui/ozone/public/surface_factory_ozone.h"
@@ -368,6 +370,9 @@ class OzonePlatformEgltest : public OzonePlatform {
scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
return make_scoped_ptr(new NativeDisplayDelegateOzone());
}
+ base::FileDescriptor GetVirtualDeviceFd() override {
+ return base::FileDescriptor();
+ }
void InitializeUI() override {
device_manager_ = CreateDeviceManager();
@@ -409,4 +414,8 @@ OzonePlatform* CreateOzonePlatformEgltest() {
return platform;
}
+NativePixmapManager* CreateNativePixmapManagerEgltest() {
+ return CreateStubNativePixmapManager();
+}
+
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698