| 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 "ipc/ipc_message_macros.h" | 10 #include "ipc/ipc_message_macros.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 IPC_STRUCT_TRAITS_MEMBER(has_native_mode) | 45 IPC_STRUCT_TRAITS_MEMBER(has_native_mode) |
| 46 IPC_STRUCT_TRAITS_MEMBER(native_mode) | 46 IPC_STRUCT_TRAITS_MEMBER(native_mode) |
| 47 IPC_STRUCT_TRAITS_MEMBER(string_representation) | 47 IPC_STRUCT_TRAITS_MEMBER(string_representation) |
| 48 IPC_STRUCT_TRAITS_END() | 48 IPC_STRUCT_TRAITS_END() |
| 49 | 49 |
| 50 //------------------------------------------------------------------------------ | 50 //------------------------------------------------------------------------------ |
| 51 // GPU Messages | 51 // GPU Messages |
| 52 // These are messages from the browser to the GPU process. | 52 // These are messages from the browser to the GPU process. |
| 53 | 53 |
| 54 // Update the HW cursor bitmap & move to specified location. | 54 // Update the HW cursor bitmap & move to specified location. |
| 55 IPC_MESSAGE_CONTROL3(OzoneGpuMsg_CursorSet, | 55 IPC_MESSAGE_CONTROL4(OzoneGpuMsg_CursorSet, |
| 56 gfx::AcceleratedWidget, SkBitmap, gfx::Point) | 56 gfx::AcceleratedWidget, |
| 57 std::vector<SkBitmap>, |
| 58 gfx::Point /* location */, |
| 59 int /* frame_delay_ms */) |
| 57 | 60 |
| 58 // Move the HW cursor to the specified location. | 61 // Move the HW cursor to the specified location. |
| 59 IPC_MESSAGE_CONTROL2(OzoneGpuMsg_CursorMove, | 62 IPC_MESSAGE_CONTROL2(OzoneGpuMsg_CursorMove, |
| 60 gfx::AcceleratedWidget, gfx::Point) | 63 gfx::AcceleratedWidget, gfx::Point) |
| 61 | 64 |
| 62 // Explicit creation of a WindowDelegate. We explicitly create the window | 65 // Explicit creation of a WindowDelegate. We explicitly create the window |
| 63 // delegate such that any state change in the window is not lost while the | 66 // delegate such that any state change in the window is not lost while the |
| 64 // surface is created on the GPU side. | 67 // surface is created on the GPU side. |
| 65 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_CreateWindowDelegate, | 68 IPC_MESSAGE_CONTROL1(OzoneGpuMsg_CreateWindowDelegate, |
| 66 gfx::AcceleratedWidget /* widget */) | 69 gfx::AcceleratedWidget /* widget */) |
| (...skipping 24 matching lines...) Expand all Loading... |
| 91 int64_t) // display ID | 94 int64_t) // display ID |
| 92 | 95 |
| 93 //------------------------------------------------------------------------------ | 96 //------------------------------------------------------------------------------ |
| 94 // Browser Messages | 97 // Browser Messages |
| 95 // These messages are from the GPU to the browser process. | 98 // These messages are from the GPU to the browser process. |
| 96 | 99 |
| 97 // Updates the list of active displays. | 100 // Updates the list of active displays. |
| 98 IPC_MESSAGE_CONTROL1(OzoneHostMsg_UpdateNativeDisplays, | 101 IPC_MESSAGE_CONTROL1(OzoneHostMsg_UpdateNativeDisplays, |
| 99 std::vector<ui::DisplaySnapshot_Params>) | 102 std::vector<ui::DisplaySnapshot_Params>) |
| 100 #endif | 103 #endif |
| OLD | NEW |