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

Side by Side Diff: ui/ozone/platform/drm/gpu/gbm_surfaceless.cc

Issue 1166463004: Revert of Adding status to swap complete (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/drm/gpu/gbm_surfaceless.h" 5 #include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "ui/ozone/platform/drm/gpu/drm_device.h" 9 #include "ui/ozone/platform/drm/gpu/drm_device.h"
10 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h" 10 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
11 #include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h" 11 #include "ui/ozone/platform/drm/gpu/drm_vsync_provider.h"
12 #include "ui/ozone/platform/drm/gpu/drm_window.h" 12 #include "ui/ozone/platform/drm/gpu/drm_window.h"
13 #include "ui/ozone/platform/drm/gpu/gbm_buffer.h" 13 #include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
14 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h" 14 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
15 15
16 namespace ui { 16 namespace ui {
17 namespace {
18 void EmptyPageFlipCallback(gfx::SwapResult result) {
19 }
20 } // namespace
21 17
22 GbmSurfaceless::GbmSurfaceless(DrmWindow* window_delegate, 18 GbmSurfaceless::GbmSurfaceless(DrmWindow* window_delegate,
23 DrmDeviceManager* drm_device_manager) 19 DrmDeviceManager* drm_device_manager)
24 : window_delegate_(window_delegate), 20 : window_delegate_(window_delegate),
25 drm_device_manager_(drm_device_manager) { 21 drm_device_manager_(drm_device_manager) {
26 } 22 }
27 23
28 GbmSurfaceless::~GbmSurfaceless() { 24 GbmSurfaceless::~GbmSurfaceless() {
29 } 25 }
30 26
31 intptr_t GbmSurfaceless::GetNativeWindow() { 27 intptr_t GbmSurfaceless::GetNativeWindow() {
32 NOTREACHED(); 28 NOTREACHED();
33 return 0; 29 return 0;
34 } 30 }
35 31
36 bool GbmSurfaceless::ResizeNativeWindow(const gfx::Size& viewport_size) { 32 bool GbmSurfaceless::ResizeNativeWindow(const gfx::Size& viewport_size) {
37 return true; 33 return true;
38 } 34 }
39 35
40 bool GbmSurfaceless::OnSwapBuffers() { 36 bool GbmSurfaceless::OnSwapBuffers() {
41 return window_delegate_->SchedulePageFlip(true /* is_sync */, 37 return window_delegate_->SchedulePageFlip(true /* is_sync */,
42 base::Bind(&EmptyPageFlipCallback)); 38 base::Bind(&base::DoNothing));
43 } 39 }
44 40
45 bool GbmSurfaceless::OnSwapBuffersAsync( 41 bool GbmSurfaceless::OnSwapBuffersAsync(
46 const SwapCompletionCallback& callback) { 42 const SwapCompletionCallback& callback) {
47 return window_delegate_->SchedulePageFlip(false /* is_sync */, callback); 43 return window_delegate_->SchedulePageFlip(false /* is_sync */, callback);
48 } 44 }
49 45
50 scoped_ptr<gfx::VSyncProvider> GbmSurfaceless::CreateVSyncProvider() { 46 scoped_ptr<gfx::VSyncProvider> GbmSurfaceless::CreateVSyncProvider() {
51 return make_scoped_ptr(new DrmVSyncProvider(window_delegate_)); 47 return make_scoped_ptr(new DrmVSyncProvider(window_delegate_));
52 } 48 }
53 49
54 bool GbmSurfaceless::IsUniversalDisplayLinkDevice() { 50 bool GbmSurfaceless::IsUniversalDisplayLinkDevice() {
55 if (!drm_device_manager_) 51 if (!drm_device_manager_)
56 return false; 52 return false;
57 scoped_refptr<DrmDevice> drm_primary = 53 scoped_refptr<DrmDevice> drm_primary =
58 drm_device_manager_->GetDrmDevice(gfx::kNullAcceleratedWidget); 54 drm_device_manager_->GetDrmDevice(gfx::kNullAcceleratedWidget);
59 DCHECK(drm_primary); 55 DCHECK(drm_primary);
60 56
61 HardwareDisplayController* controller = window_delegate_->GetController(); 57 HardwareDisplayController* controller = window_delegate_->GetController();
62 if (!controller) 58 if (!controller)
63 return false; 59 return false;
64 scoped_refptr<DrmDevice> drm = controller->GetAllocationDrmDevice(); 60 scoped_refptr<DrmDevice> drm = controller->GetAllocationDrmDevice();
65 DCHECK(drm); 61 DCHECK(drm);
66 62
67 return drm_primary != drm; 63 return drm_primary != drm;
68 } 64 }
69 65
70 } // namespace ui 66 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/gpu/gbm_surface.cc ('k') | ui/ozone/platform/drm/gpu/hardware_display_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698