| Index: ui/ozone/platform/drm/host/drm_display_host.h
|
| diff --git a/ui/ozone/platform/drm/host/drm_display_host.h b/ui/ozone/platform/drm/host/drm_display_host.h
|
| index 039dc55682244b10c9d4d88f381e9c9e1c981bff..8ccc7b7df270ea7a08975128ff22658784fd2cb5 100644
|
| --- a/ui/ozone/platform/drm/host/drm_display_host.h
|
| +++ b/ui/ozone/platform/drm/host/drm_display_host.h
|
| @@ -12,10 +12,13 @@
|
| #include "ui/display/types/native_display_delegate.h"
|
| #include "ui/ozone/platform/drm/host/gpu_thread_observer.h"
|
|
|
| +namespace display {
|
| +class DisplaySnapshot;
|
| +}
|
| +
|
| namespace ui {
|
|
|
| struct DisplaySnapshot_Params;
|
| -class DisplaySnapshot;
|
| class GpuThreadAdapter;
|
|
|
| class DrmDisplayHost : public GpuThreadObserver {
|
| @@ -25,22 +28,24 @@ class DrmDisplayHost : public GpuThreadObserver {
|
| bool is_dummy);
|
| ~DrmDisplayHost() override;
|
|
|
| - DisplaySnapshot* snapshot() const { return snapshot_.get(); }
|
| + display::DisplaySnapshot* snapshot() const { return snapshot_.get(); }
|
|
|
| void UpdateDisplaySnapshot(const DisplaySnapshot_Params& params);
|
| - void Configure(const DisplayMode* mode,
|
| + void Configure(const display::DisplayMode* mode,
|
| const gfx::Point& origin,
|
| - const ConfigureCallback& callback);
|
| - void GetHDCPState(const GetHDCPStateCallback& callback);
|
| - void SetHDCPState(HDCPState state, const SetHDCPStateCallback& callback);
|
| - void SetColorCorrection(const std::vector<GammaRampRGBEntry>& degamma_lut,
|
| - const std::vector<GammaRampRGBEntry>& gamma_lut,
|
| - const std::vector<float>& correction_matrix);
|
| + const display::ConfigureCallback& callback);
|
| + void GetHDCPState(const display::GetHDCPStateCallback& callback);
|
| + void SetHDCPState(display::HDCPState state,
|
| + const display::SetHDCPStateCallback& callback);
|
| + void SetColorCorrection(
|
| + const std::vector<display::GammaRampRGBEntry>& degamma_lut,
|
| + const std::vector<display::GammaRampRGBEntry>& gamma_lut,
|
| + const std::vector<float>& correction_matrix);
|
|
|
| // Called when the IPC from the GPU process arrives to answer the above
|
| // commands.
|
| void OnDisplayConfigured(bool status);
|
| - void OnHDCPStateReceived(bool status, HDCPState state);
|
| + void OnHDCPStateReceived(bool status, display::HDCPState state);
|
| void OnHDCPStateUpdated(bool status);
|
|
|
| // GpuThreadObserver:
|
| @@ -54,15 +59,15 @@ class DrmDisplayHost : public GpuThreadObserver {
|
|
|
| GpuThreadAdapter* sender_; // Not owned.
|
|
|
| - std::unique_ptr<DisplaySnapshot> snapshot_;
|
| + std::unique_ptr<display::DisplaySnapshot> snapshot_;
|
|
|
| // Used during startup to signify that any display configuration should be
|
| // synchronous and succeed.
|
| bool is_dummy_;
|
|
|
| - ConfigureCallback configure_callback_;
|
| - GetHDCPStateCallback get_hdcp_callback_;
|
| - SetHDCPStateCallback set_hdcp_callback_;
|
| + display::ConfigureCallback configure_callback_;
|
| + display::GetHDCPStateCallback get_hdcp_callback_;
|
| + display::SetHDCPStateCallback set_hdcp_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DrmDisplayHost);
|
| };
|
|
|