| Index: content/common/view_messages.h
|
| diff --git a/content/common/view_messages.h b/content/common/view_messages.h
|
| index 087bf68520d19596840791651dafdea9aa8c64db..14aaf3e544efed6d8da5dc972234c7ecaa6479f2 100644
|
| --- a/content/common/view_messages.h
|
| +++ b/content/common/view_messages.h
|
| @@ -30,7 +30,6 @@
|
| #include "media/base/media_log_event.h"
|
| #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/WebFindOptions.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h"
|
| @@ -214,11 +213,6 @@ IPC_STRUCT_TRAITS_BEGIN(webkit_glue::WebPreferences)
|
| IPC_STRUCT_TRAITS_MEMBER(css_variables_enabled)
|
| IPC_STRUCT_TRAITS_MEMBER(device_supports_touch)
|
| IPC_STRUCT_TRAITS_MEMBER(device_supports_mouse)
|
| -#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
|
| - IPC_STRUCT_TRAITS_MEMBER(threaded_animation_enabled)
|
| - IPC_STRUCT_TRAITS_MEMBER(partial_swap_enabled)
|
| - IPC_STRUCT_TRAITS_MEMBER(per_tile_painting_enabled)
|
| -#endif
|
| IPC_STRUCT_TRAITS_MEMBER(default_tile_width)
|
| IPC_STRUCT_TRAITS_MEMBER(default_tile_height)
|
| IPC_STRUCT_TRAITS_MEMBER(max_untiled_layer_width)
|
|
|