| 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 // Multiply-included message file, hence no include guard here, but see below | 5 // Multiply-included message file, hence no include guard here, but see below |
| 6 // for a much smaller-than-usual include guard section. | 6 // for a much smaller-than-usual include guard section. |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/file_descriptor_posix.h" | 10 #include "base/file_descriptor_posix.h" |
| 11 #include "ipc/ipc_message_macros.h" | 11 #include "ipc/ipc_message_macros.h" |
| 12 #include "third_party/skia/include/core/SkBitmap.h" | 12 #include "third_party/skia/include/core/SkBitmap.h" |
| 13 #include "ui/display/types/display_constants.h" | 13 #include "ui/display/types/display_constants.h" |
| 14 #include "ui/display/types/gamma_ramp_rgb_entry.h" | |
| 15 #include "ui/gfx/geometry/point.h" | 14 #include "ui/gfx/geometry/point.h" |
| 16 #include "ui/gfx/geometry/rect.h" | 15 #include "ui/gfx/geometry/rect.h" |
| 17 #include "ui/gfx/ipc/gfx_param_traits.h" | 16 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 18 #include "ui/gfx/native_widget_types.h" | 17 #include "ui/gfx/native_widget_types.h" |
| 19 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" | 18 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" |
| 20 #include "ui/ozone/ozone_export.h" | 19 #include "ui/ozone/ozone_export.h" |
| 21 | 20 |
| 22 #undef IPC_MESSAGE_EXPORT | 21 #undef IPC_MESSAGE_EXPORT |
| 23 #define IPC_MESSAGE_EXPORT OZONE_EXPORT | 22 #define IPC_MESSAGE_EXPORT OZONE_EXPORT |
| 24 | 23 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 44 IPC_STRUCT_TRAITS_MEMBER(has_overscan) | 43 IPC_STRUCT_TRAITS_MEMBER(has_overscan) |
| 45 IPC_STRUCT_TRAITS_MEMBER(display_name) | 44 IPC_STRUCT_TRAITS_MEMBER(display_name) |
| 46 IPC_STRUCT_TRAITS_MEMBER(modes) | 45 IPC_STRUCT_TRAITS_MEMBER(modes) |
| 47 IPC_STRUCT_TRAITS_MEMBER(has_current_mode) | 46 IPC_STRUCT_TRAITS_MEMBER(has_current_mode) |
| 48 IPC_STRUCT_TRAITS_MEMBER(current_mode) | 47 IPC_STRUCT_TRAITS_MEMBER(current_mode) |
| 49 IPC_STRUCT_TRAITS_MEMBER(has_native_mode) | 48 IPC_STRUCT_TRAITS_MEMBER(has_native_mode) |
| 50 IPC_STRUCT_TRAITS_MEMBER(native_mode) | 49 IPC_STRUCT_TRAITS_MEMBER(native_mode) |
| 51 IPC_STRUCT_TRAITS_MEMBER(string_representation) | 50 IPC_STRUCT_TRAITS_MEMBER(string_representation) |
| 52 IPC_STRUCT_TRAITS_END() | 51 IPC_STRUCT_TRAITS_END() |
| 53 | 52 |
| 54 IPC_STRUCT_TRAITS_BEGIN(ui::GammaRampRGBEntry) | |
| 55 IPC_STRUCT_TRAITS_MEMBER(r) | |
| 56 IPC_STRUCT_TRAITS_MEMBER(g) | |
| 57 IPC_STRUCT_TRAITS_MEMBER(b) | |
| 58 IPC_STRUCT_TRAITS_END() | |
| 59 | |
| 60 //------------------------------------------------------------------------------ | 53 //------------------------------------------------------------------------------ |
| 61 // GPU Messages | 54 // GPU Messages |
| 62 // These are messages from the browser to the GPU process. | 55 // These are messages from the browser to the GPU process. |
| 63 | 56 |
| 64 // Update the HW cursor bitmap & move to specified location. | 57 // Update the HW cursor bitmap & move to specified location. |
| 65 IPC_MESSAGE_CONTROL4(OzoneGpuMsg_CursorSet, | 58 IPC_MESSAGE_CONTROL4(OzoneGpuMsg_CursorSet, |
| 66 gfx::AcceleratedWidget, | 59 gfx::AcceleratedWidget, |
| 67 std::vector<SkBitmap>, | 60 std::vector<SkBitmap>, |
| 68 gfx::Point /* location */, | 61 gfx::Point /* location */, |
| 69 int /* frame_delay_ms */) | 62 int /* frame_delay_ms */) |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 104 |
| 112 // Let other entity control the display | 105 // Let other entity control the display |
| 113 IPC_MESSAGE_CONTROL0(OzoneGpuMsg_RelinquishDisplayControl) | 106 IPC_MESSAGE_CONTROL0(OzoneGpuMsg_RelinquishDisplayControl) |
| 114 | 107 |
| 115 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_GetHDCPState, int64_t /* display_id */) | 108 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_GetHDCPState, int64_t /* display_id */) |
| 116 | 109 |
| 117 IPC_MESSAGE_CONTROL2(OzoneGpuMsg_SetHDCPState, | 110 IPC_MESSAGE_CONTROL2(OzoneGpuMsg_SetHDCPState, |
| 118 int64_t /* display_id */, | 111 int64_t /* display_id */, |
| 119 ui::HDCPState /* state */) | 112 ui::HDCPState /* state */) |
| 120 | 113 |
| 121 // Provides the gamma ramp for display adjustment. | |
| 122 IPC_MESSAGE_CONTROL2(OzoneGpuMsg_SetGammaRamp, | |
| 123 int64_t, // display ID, | |
| 124 std::vector<ui::GammaRampRGBEntry>) // lut | |
| 125 | |
| 126 //------------------------------------------------------------------------------ | 114 //------------------------------------------------------------------------------ |
| 127 // Browser Messages | 115 // Browser Messages |
| 128 // These messages are from the GPU to the browser process. | 116 // These messages are from the GPU to the browser process. |
| 129 | 117 |
| 130 // Updates the list of active displays. | 118 // Updates the list of active displays. |
| 131 IPC_MESSAGE_CONTROL1(OzoneHostMsg_UpdateNativeDisplays, | 119 IPC_MESSAGE_CONTROL1(OzoneHostMsg_UpdateNativeDisplays, |
| 132 std::vector<ui::DisplaySnapshot_Params>) | 120 std::vector<ui::DisplaySnapshot_Params>) |
| 133 | 121 |
| 134 IPC_MESSAGE_CONTROL2(OzoneHostMsg_DisplayConfigured, | 122 IPC_MESSAGE_CONTROL2(OzoneHostMsg_DisplayConfigured, |
| 135 int64_t /* display_id */, | 123 int64_t /* display_id */, |
| 136 bool /* status */) | 124 bool /* status */) |
| 137 | 125 |
| 138 // Response for OzoneGpuMsg_GetHDCPState. | 126 // Response for OzoneGpuMsg_GetHDCPState. |
| 139 IPC_MESSAGE_CONTROL3(OzoneHostMsg_HDCPStateReceived, | 127 IPC_MESSAGE_CONTROL3(OzoneHostMsg_HDCPStateReceived, |
| 140 int64_t /* display_id */, | 128 int64_t /* display_id */, |
| 141 bool /* success */, | 129 bool /* success */, |
| 142 ui::HDCPState /* state */) | 130 ui::HDCPState /* state */) |
| 143 | 131 |
| 144 // Response for OzoneGpuMsg_SetHDCPState. | 132 // Response for OzoneGpuMsg_SetHDCPState. |
| 145 IPC_MESSAGE_CONTROL2(OzoneHostMsg_HDCPStateUpdated, | 133 IPC_MESSAGE_CONTROL2(OzoneHostMsg_HDCPStateUpdated, |
| 146 int64_t /* display_id */, | 134 int64_t /* display_id */, |
| 147 bool /* success */) | 135 bool /* success */) |
| OLD | NEW |