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

Side by Side Diff: ui/ozone/platform/drm/host/drm_display_host.cc

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/host/drm_display_host.h" 5 #include "ui/ozone/platform/drm/host/drm_display_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
11 #include "ui/display/types/display_mode.h" 11 #include "ui/display/types/display_mode.h"
12 #include "ui/ozone/common/display_snapshot_proxy.h" 12 #include "ui/ozone/common/display_snapshot_proxy.h"
13 #include "ui/ozone/platform/drm/host/gpu_thread_adapter.h" 13 #include "ui/ozone/platform/drm/host/gpu_thread_adapter.h"
14 14
15 namespace ui { 15 namespace ui {
16 16
17 namespace { 17 namespace {
18 18
19 DisplayMode_Params GetDisplayModeParams(const DisplayMode& mode) { 19 DisplayMode_Params GetDisplayModeParams(const display::DisplayMode& mode) {
20 DisplayMode_Params params; 20 DisplayMode_Params params;
21 params.size = mode.size(); 21 params.size = mode.size();
22 params.is_interlaced = mode.is_interlaced(); 22 params.is_interlaced = mode.is_interlaced();
23 params.refresh_rate = mode.refresh_rate(); 23 params.refresh_rate = mode.refresh_rate();
24 return params; 24 return params;
25 } 25 }
26 26
27 } // namespace 27 } // namespace
28 28
29 DrmDisplayHost::DrmDisplayHost(GpuThreadAdapter* sender, 29 DrmDisplayHost::DrmDisplayHost(GpuThreadAdapter* sender,
30 const DisplaySnapshot_Params& params, 30 const DisplaySnapshot_Params& params,
31 bool is_dummy) 31 bool is_dummy)
32 : sender_(sender), 32 : sender_(sender),
33 snapshot_(new DisplaySnapshotProxy(params)), 33 snapshot_(new DisplaySnapshotProxy(params)),
34 is_dummy_(is_dummy) { 34 is_dummy_(is_dummy) {
35 sender_->AddGpuThreadObserver(this); 35 sender_->AddGpuThreadObserver(this);
36 } 36 }
37 37
38 DrmDisplayHost::~DrmDisplayHost() { 38 DrmDisplayHost::~DrmDisplayHost() {
39 sender_->RemoveGpuThreadObserver(this); 39 sender_->RemoveGpuThreadObserver(this);
40 ClearCallbacks(); 40 ClearCallbacks();
41 } 41 }
42 42
43 void DrmDisplayHost::UpdateDisplaySnapshot( 43 void DrmDisplayHost::UpdateDisplaySnapshot(
44 const DisplaySnapshot_Params& params) { 44 const DisplaySnapshot_Params& params) {
45 snapshot_ = base::MakeUnique<DisplaySnapshotProxy>(params); 45 snapshot_ = base::MakeUnique<DisplaySnapshotProxy>(params);
46 } 46 }
47 47
48 void DrmDisplayHost::Configure(const DisplayMode* mode, 48 void DrmDisplayHost::Configure(const display::DisplayMode* mode,
49 const gfx::Point& origin, 49 const gfx::Point& origin,
50 const ConfigureCallback& callback) { 50 const display::ConfigureCallback& callback) {
51 if (is_dummy_) { 51 if (is_dummy_) {
52 callback.Run(true); 52 callback.Run(true);
53 return; 53 return;
54 } 54 }
55 55
56 configure_callback_ = callback; 56 configure_callback_ = callback;
57 bool status = false; 57 bool status = false;
58 if (mode) { 58 if (mode) {
59 status = sender_->GpuConfigureNativeDisplay( 59 status = sender_->GpuConfigureNativeDisplay(
60 snapshot_->display_id(), GetDisplayModeParams(*mode), origin); 60 snapshot_->display_id(), GetDisplayModeParams(*mode), origin);
(...skipping 10 matching lines...) Expand all
71 base::ThreadTaskRunnerHandle::Get()->PostTask( 71 base::ThreadTaskRunnerHandle::Get()->PostTask(
72 FROM_HERE, base::Bind(configure_callback_, status)); 72 FROM_HERE, base::Bind(configure_callback_, status));
73 } else { 73 } else {
74 LOG(ERROR) << "Got unexpected event for display " 74 LOG(ERROR) << "Got unexpected event for display "
75 << snapshot_->display_id(); 75 << snapshot_->display_id();
76 } 76 }
77 77
78 configure_callback_.Reset(); 78 configure_callback_.Reset();
79 } 79 }
80 80
81 void DrmDisplayHost::GetHDCPState(const GetHDCPStateCallback& callback) { 81 void DrmDisplayHost::GetHDCPState(
82 const display::GetHDCPStateCallback& callback) {
82 get_hdcp_callback_ = callback; 83 get_hdcp_callback_ = callback;
83 if (!sender_->GpuGetHDCPState(snapshot_->display_id())) 84 if (!sender_->GpuGetHDCPState(snapshot_->display_id()))
84 OnHDCPStateReceived(false, HDCP_STATE_UNDESIRED); 85 OnHDCPStateReceived(false, display::HDCP_STATE_UNDESIRED);
85 } 86 }
86 87
87 void DrmDisplayHost::OnHDCPStateReceived(bool status, HDCPState state) { 88 void DrmDisplayHost::OnHDCPStateReceived(bool status,
89 display::HDCPState state) {
88 if (!get_hdcp_callback_.is_null()) { 90 if (!get_hdcp_callback_.is_null()) {
89 base::ThreadTaskRunnerHandle::Get()->PostTask( 91 base::ThreadTaskRunnerHandle::Get()->PostTask(
90 FROM_HERE, base::Bind(get_hdcp_callback_, status, state)); 92 FROM_HERE, base::Bind(get_hdcp_callback_, status, state));
91 } else { 93 } else {
92 LOG(ERROR) << "Got unexpected event for display " 94 LOG(ERROR) << "Got unexpected event for display "
93 << snapshot_->display_id(); 95 << snapshot_->display_id();
94 } 96 }
95 97
96 get_hdcp_callback_.Reset(); 98 get_hdcp_callback_.Reset();
97 } 99 }
98 100
99 void DrmDisplayHost::SetHDCPState(HDCPState state, 101 void DrmDisplayHost::SetHDCPState(
100 const SetHDCPStateCallback& callback) { 102 display::HDCPState state,
103 const display::SetHDCPStateCallback& callback) {
101 set_hdcp_callback_ = callback; 104 set_hdcp_callback_ = callback;
102 if (!sender_->GpuSetHDCPState(snapshot_->display_id(), state)) 105 if (!sender_->GpuSetHDCPState(snapshot_->display_id(), state))
103 OnHDCPStateUpdated(false); 106 OnHDCPStateUpdated(false);
104 } 107 }
105 108
106 void DrmDisplayHost::OnHDCPStateUpdated(bool status) { 109 void DrmDisplayHost::OnHDCPStateUpdated(bool status) {
107 if (!set_hdcp_callback_.is_null()) { 110 if (!set_hdcp_callback_.is_null()) {
108 base::ThreadTaskRunnerHandle::Get()->PostTask( 111 base::ThreadTaskRunnerHandle::Get()->PostTask(
109 FROM_HERE, base::Bind(set_hdcp_callback_, status)); 112 FROM_HERE, base::Bind(set_hdcp_callback_, status));
110 } else { 113 } else {
111 LOG(ERROR) << "Got unexpected event for display " 114 LOG(ERROR) << "Got unexpected event for display "
112 << snapshot_->display_id(); 115 << snapshot_->display_id();
113 } 116 }
114 117
115 set_hdcp_callback_.Reset(); 118 set_hdcp_callback_.Reset();
116 } 119 }
117 120
118 void DrmDisplayHost::SetColorCorrection( 121 void DrmDisplayHost::SetColorCorrection(
119 const std::vector<GammaRampRGBEntry>& degamma_lut, 122 const std::vector<display::GammaRampRGBEntry>& degamma_lut,
120 const std::vector<GammaRampRGBEntry>& gamma_lut, 123 const std::vector<display::GammaRampRGBEntry>& gamma_lut,
121 const std::vector<float>& correction_matrix) { 124 const std::vector<float>& correction_matrix) {
122 sender_->GpuSetColorCorrection(snapshot_->display_id(), degamma_lut, 125 sender_->GpuSetColorCorrection(snapshot_->display_id(), degamma_lut,
123 gamma_lut, correction_matrix); 126 gamma_lut, correction_matrix);
124 } 127 }
125 128
126 void DrmDisplayHost::OnGpuProcessLaunched() {} 129 void DrmDisplayHost::OnGpuProcessLaunched() {}
127 130
128 void DrmDisplayHost::OnGpuThreadReady() { 131 void DrmDisplayHost::OnGpuThreadReady() {
129 is_dummy_ = false; 132 is_dummy_ = false;
130 133
131 // Note: These responses are done here since the OnChannelDestroyed() is 134 // Note: These responses are done here since the OnChannelDestroyed() is
132 // called after OnChannelEstablished(). 135 // called after OnChannelEstablished().
133 ClearCallbacks(); 136 ClearCallbacks();
134 } 137 }
135 138
136 void DrmDisplayHost::OnGpuThreadRetired() {} 139 void DrmDisplayHost::OnGpuThreadRetired() {}
137 140
138 void DrmDisplayHost::ClearCallbacks() { 141 void DrmDisplayHost::ClearCallbacks() {
139 if (!configure_callback_.is_null()) 142 if (!configure_callback_.is_null())
140 OnDisplayConfigured(false); 143 OnDisplayConfigured(false);
141 if (!get_hdcp_callback_.is_null()) 144 if (!get_hdcp_callback_.is_null())
142 OnHDCPStateReceived(false, HDCP_STATE_UNDESIRED); 145 OnHDCPStateReceived(false, display::HDCP_STATE_UNDESIRED);
143 if (!set_hdcp_callback_.is_null()) 146 if (!set_hdcp_callback_.is_null())
144 OnHDCPStateUpdated(false); 147 OnHDCPStateUpdated(false);
145 } 148 }
146 149
147 } // namespace ui 150 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/host/drm_display_host.h ('k') | ui/ozone/platform/drm/host/drm_display_host_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698