| Index: content/common/cc_messages.h
|
| diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h
|
| index 55a8c497a4e538fbd449f1844ceb2508103f63a3..2dac19faeab1052c7ec27267322960efe7b42c1e 100644
|
| --- a/content/common/cc_messages.h
|
| +++ b/content/common/cc_messages.h
|
| @@ -187,7 +187,6 @@ IPC_STRUCT_TRAITS_BEGIN(cc::IOSurfaceDrawQuad)
|
| IPC_STRUCT_TRAITS_PARENT(cc::DrawQuad)
|
| IPC_STRUCT_TRAITS_MEMBER(io_surface_size)
|
| IPC_STRUCT_TRAITS_MEMBER(orientation)
|
| - IPC_STRUCT_TRAITS_MEMBER(allow_overlay)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(cc::RenderPassDrawQuad)
|
| @@ -269,7 +268,7 @@ IPC_STRUCT_TRAITS_BEGIN(cc::TransferableResource)
|
| IPC_STRUCT_TRAITS_MEMBER(read_lock_fences_enabled)
|
| IPC_STRUCT_TRAITS_MEMBER(is_repeated)
|
| IPC_STRUCT_TRAITS_MEMBER(is_software)
|
| - IPC_STRUCT_TRAITS_MEMBER(allow_overlay)
|
| + IPC_STRUCT_TRAITS_MEMBER(is_overlay_candidate)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| IPC_STRUCT_TRAITS_BEGIN(cc::ReturnedResource)
|
|
|