| 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 "ipc/ipc_message_macros.h" | 11 #include "ipc/ipc_message_macros.h" |
| 11 #include "third_party/skia/include/core/SkBitmap.h" | 12 #include "third_party/skia/include/core/SkBitmap.h" |
| 12 #include "ui/gfx/geometry/point.h" | 13 #include "ui/gfx/geometry/point.h" |
| 13 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
| 14 #include "ui/gfx/ipc/gfx_param_traits.h" | 15 #include "ui/gfx/ipc/gfx_param_traits.h" |
| 15 #include "ui/gfx/native_widget_types.h" | 16 #include "ui/gfx/native_widget_types.h" |
| 16 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" | 17 #include "ui/ozone/common/gpu/ozone_gpu_message_params.h" |
| 17 #include "ui/ozone/ozone_export.h" | 18 #include "ui/ozone/ozone_export.h" |
| 18 | 19 |
| 19 #undef IPC_MESSAGE_EXPORT | 20 #undef IPC_MESSAGE_EXPORT |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 85 |
| 85 // Configure a display with the specified mode at the specified location. | 86 // Configure a display with the specified mode at the specified location. |
| 86 IPC_MESSAGE_CONTROL3(OzoneGpuMsg_ConfigureNativeDisplay, | 87 IPC_MESSAGE_CONTROL3(OzoneGpuMsg_ConfigureNativeDisplay, |
| 87 int64_t, // display ID | 88 int64_t, // display ID |
| 88 ui::DisplayMode_Params, // display mode | 89 ui::DisplayMode_Params, // display mode |
| 89 gfx::Point) // origin for the display | 90 gfx::Point) // origin for the display |
| 90 | 91 |
| 91 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_DisableNativeDisplay, | 92 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_DisableNativeDisplay, |
| 92 int64_t) // display ID | 93 int64_t) // display ID |
| 93 | 94 |
| 94 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_AddGraphicsDevice, | 95 IPC_MESSAGE_CONTROL2(OzoneGpuMsg_AddGraphicsDevice, |
| 95 base::FilePath /* device_path */) | 96 base::FilePath /* device_path */, |
| 97 base::FileDescriptor /* device_fd */) |
| 96 | 98 |
| 97 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_RemoveGraphicsDevice, | 99 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_RemoveGraphicsDevice, |
| 98 base::FilePath /* device_path */) | 100 base::FilePath /* device_path */) |
| 99 | 101 |
| 100 // Take control of the display | 102 // Take control of the display |
| 101 IPC_MESSAGE_CONTROL0(OzoneGpuMsg_TakeDisplayControl) | 103 IPC_MESSAGE_CONTROL0(OzoneGpuMsg_TakeDisplayControl) |
| 102 | 104 |
| 103 // Let other entity control the display | 105 // Let other entity control the display |
| 104 IPC_MESSAGE_CONTROL0(OzoneGpuMsg_RelinquishDisplayControl) | 106 IPC_MESSAGE_CONTROL0(OzoneGpuMsg_RelinquishDisplayControl) |
| 105 | 107 |
| 106 //------------------------------------------------------------------------------ | 108 //------------------------------------------------------------------------------ |
| 107 // Browser Messages | 109 // Browser Messages |
| 108 // These messages are from the GPU to the browser process. | 110 // These messages are from the GPU to the browser process. |
| 109 | 111 |
| 110 // Updates the list of active displays. | 112 // Updates the list of active displays. |
| 111 IPC_MESSAGE_CONTROL1(OzoneHostMsg_UpdateNativeDisplays, | 113 IPC_MESSAGE_CONTROL1(OzoneHostMsg_UpdateNativeDisplays, |
| 112 std::vector<ui::DisplaySnapshot_Params>) | 114 std::vector<ui::DisplaySnapshot_Params>) |
| 113 | 115 |
| 114 IPC_MESSAGE_CONTROL2(OzoneHostMsg_DisplayConfigured, | 116 IPC_MESSAGE_CONTROL2(OzoneHostMsg_DisplayConfigured, |
| 115 int64_t /* display_id */, | 117 int64_t /* display_id */, |
| 116 bool /* status */) | 118 bool /* status */) |
| OLD | NEW |