Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/drm/ozone_platform_gbm.h" | 5 #include "ui/ozone/platform/drm/ozone_platform_gbm.h" |
| 6 | 6 |
| 7 #include <dlfcn.h> | 7 #include <dlfcn.h> |
| 8 #include <fcntl.h> | 8 #include <fcntl.h> |
| 9 #include <gbm.h> | 9 #include <gbm.h> |
| 10 #include <stdlib.h> | 10 #include <stdlib.h> |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 98 return event_factory_ozone_->CreateSystemInputInjector(); | 98 return event_factory_ozone_->CreateSystemInputInjector(); |
| 99 } | 99 } |
| 100 scoped_ptr<PlatformWindow> CreatePlatformWindow( | 100 scoped_ptr<PlatformWindow> CreatePlatformWindow( |
| 101 PlatformWindowDelegate* delegate, | 101 PlatformWindowDelegate* delegate, |
| 102 const gfx::Rect& bounds) override { | 102 const gfx::Rect& bounds) override { |
| 103 scoped_ptr<DrmWindowHost> platform_window( | 103 scoped_ptr<DrmWindowHost> platform_window( |
| 104 new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(), | 104 new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(), |
| 105 event_factory_ozone_.get(), cursor_.get(), | 105 event_factory_ozone_.get(), cursor_.get(), |
| 106 window_manager_.get(), display_manager_.get())); | 106 window_manager_.get(), display_manager_.get())); |
| 107 platform_window->Initialize(); | 107 platform_window->Initialize(); |
| 108 return platform_window.Pass(); | 108 return std::move(platform_window); |
|
spang
2015/12/16 17:25:32
Unnecessary move.
mkollaro
2015/12/17 12:02:37
I get an error here without it:
../../../ui/ozone
| |
| 109 } | 109 } |
| 110 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 110 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { |
| 111 return make_scoped_ptr( | 111 return make_scoped_ptr( |
| 112 new DrmNativeDisplayDelegate(display_manager_.get())); | 112 new DrmNativeDisplayDelegate(display_manager_.get())); |
| 113 } | 113 } |
| 114 base::ScopedFD OpenClientNativePixmapDevice() const override { | 114 base::ScopedFD OpenClientNativePixmapDevice() const override { |
| 115 #if defined(USE_VGEM_MAP) | 115 #if defined(USE_VGEM_MAP) |
| 116 int vgem_fd = drmOpenWithType("vgem", nullptr, DRM_NODE_RENDER); | 116 int vgem_fd = drmOpenWithType("vgem", nullptr, DRM_NODE_RENDER); |
| 117 if (vgem_fd < 0) { | 117 if (vgem_fd < 0) { |
| 118 PLOG(ERROR) << "Failed to find vgem device"; | 118 PLOG(ERROR) << "Failed to find vgem device"; |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 181 DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm); | 181 DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm); |
| 182 }; | 182 }; |
| 183 | 183 |
| 184 } // namespace | 184 } // namespace |
| 185 | 185 |
| 186 OzonePlatform* CreateOzonePlatformGbm() { | 186 OzonePlatform* CreateOzonePlatformGbm() { |
| 187 return new OzonePlatformGbm; | 187 return new OzonePlatformGbm; |
| 188 } | 188 } |
| 189 | 189 |
| 190 } // namespace ui | 190 } // namespace ui |
| OLD | NEW |