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

Unified Diff: ui/ozone/platform/caca/ozone_platform_caca.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/caca/ozone_platform_caca.cc
diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc
index fdfebe22402d4d149a200af974b1767513610402..5e01fd51021c51247f2f65a2df555e4ab540e851 100644
--- a/ui/ozone/platform/caca/ozone_platform_caca.cc
+++ b/ui/ozone/platform/caca/ozone_platform_caca.cc
@@ -4,6 +4,7 @@
#include "ui/ozone/platform/caca/ozone_platform_caca.h"
+#include "base/file_descriptor_posix.h"
#include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
#include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h"
#include "ui/ozone/common/native_display_delegate_ozone.h"
@@ -15,6 +16,7 @@
#include "ui/ozone/public/gpu_platform_support.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"
@@ -62,6 +64,10 @@ class OzonePlatformCaca : public OzonePlatform {
return make_scoped_ptr(new NativeDisplayDelegateOzone());
}
+ base::FileDescriptor GetVirtualDeviceFd() override {
+ return base::FileDescriptor();
+ }
+
void InitializeUI() override {
window_manager_.reset(new CacaWindowManager);
overlay_manager_.reset(new StubOverlayManager());
@@ -95,4 +101,8 @@ OzonePlatform* CreateOzonePlatformCaca() {
return new OzonePlatformCaca;
}
+NativePixmapManager* CreateNativePixmapManagerCaca() {
+ return CreateStubNativePixmapManager();
+}
+
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698