| Index: content/common/view_messages.h
|
| diff --git a/content/common/view_messages.h b/content/common/view_messages.h
|
| index 0519cf725c4172af6097f2054101e3a30cd38607..dbe6eefb7adf40f0406c8540bcae69566f39e362 100644
|
| --- a/content/common/view_messages.h
|
| +++ b/content/common/view_messages.h
|
| @@ -32,6 +32,7 @@
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
|
| +#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositorFrame.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebFindOptions.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
|
| @@ -119,6 +120,13 @@ IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect)
|
| IPC_STRUCT_TRAITS_MEMBER(height)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(WebKit::WebFloatRect)
|
| + IPC_STRUCT_TRAITS_MEMBER(x)
|
| + IPC_STRUCT_TRAITS_MEMBER(y)
|
| + IPC_STRUCT_TRAITS_MEMBER(width)
|
| + IPC_STRUCT_TRAITS_MEMBER(height)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(WebKit::WebScreenInfo)
|
| IPC_STRUCT_TRAITS_MEMBER(verticalDPI)
|
| IPC_STRUCT_TRAITS_MEMBER(horizontalDPI)
|
| @@ -221,6 +229,46 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
|
| IPC_STRUCT_TRAITS_MEMBER(sync_xhr_in_documents_enabled)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCompositorMatrix)
|
| + IPC_STRUCT_TRAITS_MEMBER(m11)
|
| + IPC_STRUCT_TRAITS_MEMBER(m12)
|
| + IPC_STRUCT_TRAITS_MEMBER(m13)
|
| + IPC_STRUCT_TRAITS_MEMBER(m14)
|
| + IPC_STRUCT_TRAITS_MEMBER(m21)
|
| + IPC_STRUCT_TRAITS_MEMBER(m22)
|
| + IPC_STRUCT_TRAITS_MEMBER(m23)
|
| + IPC_STRUCT_TRAITS_MEMBER(m24)
|
| + IPC_STRUCT_TRAITS_MEMBER(m31)
|
| + IPC_STRUCT_TRAITS_MEMBER(m32)
|
| + IPC_STRUCT_TRAITS_MEMBER(m33)
|
| + IPC_STRUCT_TRAITS_MEMBER(m34)
|
| + IPC_STRUCT_TRAITS_MEMBER(m41)
|
| + IPC_STRUCT_TRAITS_MEMBER(m42)
|
| + IPC_STRUCT_TRAITS_MEMBER(m43)
|
| + IPC_STRUCT_TRAITS_MEMBER(m44)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| +IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCompositorQuad)
|
| + IPC_STRUCT_TRAITS_MEMBER(quadTransform)
|
| + IPC_STRUCT_TRAITS_MEMBER(layerTransform)
|
| + IPC_STRUCT_TRAITS_MEMBER(layerRect)
|
| + IPC_STRUCT_TRAITS_MEMBER(scissorRect)
|
| + IPC_STRUCT_TRAITS_MEMBER(opacity)
|
| + IPC_STRUCT_TRAITS_MEMBER(opaque)
|
| +
|
| + IPC_STRUCT_TRAITS_MEMBER(quadRect)
|
| + IPC_STRUCT_TRAITS_MEMBER(quadVisibleRect)
|
| + IPC_STRUCT_TRAITS_MEMBER(opaqueRect)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| +IPC_STRUCT_BEGIN(CompositorHostMsg_DrawFrame_Params)
|
| + IPC_STRUCT_MEMBER(std::vector<WebKit::WebCompositorQuad>, quads)
|
| + IPC_STRUCT_MEMBER(WebKit::WebFloatRect, framebuffer_output_rect)
|
| +IPC_STRUCT_END()
|
| +
|
| +IPC_MESSAGE_ROUTED1(CompositorHostMsg_DrawFrame,
|
| + CompositorHostMsg_DrawFrame_Params)
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(WebMenuItem)
|
| IPC_STRUCT_TRAITS_MEMBER(label)
|
| IPC_STRUCT_TRAITS_MEMBER(toolTip)
|
|
|