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

Side by Side 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: Introduce OzoneClient Created 5 years, 7 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
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 "ui/ozone/platform/caca/ozone_platform_caca.h" 5 #include "ui/ozone/platform/caca/ozone_platform_caca.h"
6 6
7 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" 7 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
8 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h" 8 #include "ui/events/ozone/layout/no/no_keyboard_layout_engine.h"
9 #include "ui/ozone/common/native_display_delegate_ozone.h" 9 #include "ui/ozone/common/native_display_delegate_ozone.h"
10 #include "ui/ozone/platform/caca/caca_event_source.h" 10 #include "ui/ozone/platform/caca/caca_event_source.h"
11 #include "ui/ozone/platform/caca/caca_window.h" 11 #include "ui/ozone/platform/caca/caca_window.h"
12 #include "ui/ozone/platform/caca/caca_window_manager.h" 12 #include "ui/ozone/platform/caca/caca_window_manager.h"
13 #include "ui/ozone/public/cursor_factory_ozone.h" 13 #include "ui/ozone/public/cursor_factory_ozone.h"
14 #include "ui/ozone/public/gpu_platform_support.h" 14 #include "ui/ozone/public/gpu_platform_support.h"
15 #include "ui/ozone/public/gpu_platform_support_host.h" 15 #include "ui/ozone/public/gpu_platform_support_host.h"
16 #include "ui/ozone/public/input_controller.h" 16 #include "ui/ozone/public/input_controller.h"
17 #include "ui/ozone/public/ozone_client.h"
17 #include "ui/ozone/public/ozone_platform.h" 18 #include "ui/ozone/public/ozone_platform.h"
19 #include "ui/ozone/public/surface_client_factory_ozone.h"
18 #include "ui/ozone/public/system_input_injector.h" 20 #include "ui/ozone/public/system_input_injector.h"
19 21
20 namespace ui { 22 namespace ui {
21 23
22 namespace { 24 namespace {
23 25
24 class OzonePlatformCaca : public OzonePlatform { 26 class OzonePlatformCaca : public OzonePlatform {
25 public: 27 public:
26 OzonePlatformCaca() {} 28 OzonePlatformCaca() {}
27 ~OzonePlatformCaca() override {} 29 ~OzonePlatformCaca() override {}
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 scoped_ptr<CacaWindowManager> window_manager_; 78 scoped_ptr<CacaWindowManager> window_manager_;
77 scoped_ptr<CacaEventSource> event_source_; 79 scoped_ptr<CacaEventSource> event_source_;
78 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_; 80 scoped_ptr<CursorFactoryOzone> cursor_factory_ozone_;
79 scoped_ptr<GpuPlatformSupport> gpu_platform_support_; 81 scoped_ptr<GpuPlatformSupport> gpu_platform_support_;
80 scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_; 82 scoped_ptr<GpuPlatformSupportHost> gpu_platform_support_host_;
81 scoped_ptr<InputController> input_controller_; 83 scoped_ptr<InputController> input_controller_;
82 84
83 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); 85 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
84 }; 86 };
85 87
88 class OzoneClientCaca : public OzoneClient {
89 public:
90 OzoneClientCaca() {}
91 ~OzoneClientCaca() override {}
92
93 // OzoneClient:
94 SurfaceClientFactoryOzone* GetSurfaceClientFactoryOzone() override {
95 return surface_client_.get();
96 }
97
98 void InitializeUI() override {
99 if (!surface_client_)
100 surface_client_.reset(new SurfaceClientFactoryOzone);
101 }
102
103 void InitializeRenderer() override {
104 if (!surface_client_)
105 surface_client_.reset(new SurfaceClientFactoryOzone);
106 }
107
108 private:
109 scoped_ptr<SurfaceClientFactoryOzone> surface_client_;
110
111 DISALLOW_COPY_AND_ASSIGN(OzoneClientCaca);
112 };
113
86 } // namespace 114 } // namespace
87 115
88 OzonePlatform* CreateOzonePlatformCaca() { 116 OzonePlatform* CreateOzonePlatformCaca() {
89 return new OzonePlatformCaca; 117 return new OzonePlatformCaca;
90 } 118 }
91 119
120 OzoneClient* CreateOzoneClientCaca() {
121 return new OzoneClientCaca;
122 }
123
92 } // namespace ui 124 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698