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

Side by Side Diff: ui/ozone/platform/caca/ozone_platform_caca.cc

Issue 1248713002: ozone: ClientPixmapManager passes VGEM fd from browser to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove redundant Pass() Created 5 years, 3 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/common/stub_overlay_manager.h" 10 #include "ui/ozone/common/stub_overlay_manager.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 const gfx::Rect& bounds) override { 54 const gfx::Rect& bounds) override {
55 scoped_ptr<CacaWindow> caca_window(new CacaWindow( 55 scoped_ptr<CacaWindow> caca_window(new CacaWindow(
56 delegate, window_manager_.get(), event_source_.get(), bounds)); 56 delegate, window_manager_.get(), event_source_.get(), bounds));
57 if (!caca_window->Initialize()) 57 if (!caca_window->Initialize())
58 return nullptr; 58 return nullptr;
59 return caca_window.Pass(); 59 return caca_window.Pass();
60 } 60 }
61 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { 61 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
62 return make_scoped_ptr(new NativeDisplayDelegateOzone()); 62 return make_scoped_ptr(new NativeDisplayDelegateOzone());
63 } 63 }
64 base::ScopedFD OpenClientNativePixmapDevice() const override {
65 return base::ScopedFD();
66 }
64 67
65 void InitializeUI() override { 68 void InitializeUI() override {
66 window_manager_.reset(new CacaWindowManager); 69 window_manager_.reset(new CacaWindowManager);
67 overlay_manager_.reset(new StubOverlayManager()); 70 overlay_manager_.reset(new StubOverlayManager());
68 event_source_.reset(new CacaEventSource()); 71 event_source_.reset(new CacaEventSource());
69 cursor_factory_ozone_.reset(new CursorFactoryOzone()); 72 cursor_factory_ozone_.reset(new CursorFactoryOzone());
70 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost()); 73 gpu_platform_support_host_.reset(CreateStubGpuPlatformSupportHost());
71 input_controller_ = CreateStubInputController(); 74 input_controller_ = CreateStubInputController();
72 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( 75 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
73 make_scoped_ptr(new NoKeyboardLayoutEngine())); 76 make_scoped_ptr(new NoKeyboardLayoutEngine()));
(...skipping 15 matching lines...) Expand all
89 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca); 92 DISALLOW_COPY_AND_ASSIGN(OzonePlatformCaca);
90 }; 93 };
91 94
92 } // namespace 95 } // namespace
93 96
94 OzonePlatform* CreateOzonePlatformCaca() { 97 OzonePlatform* CreateOzonePlatformCaca() {
95 return new OzonePlatformCaca; 98 return new OzonePlatformCaca;
96 } 99 }
97 100
98 } // namespace ui 101 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/common/stub_client_native_pixmap_factory.cc ('k') | ui/ozone/platform/cast/ozone_platform_cast.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698