| Index: content/common/cc_messages.h
|
| diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h
|
| index 52b802094c0eae16cf58a676ba7b39c9781ef4b2..4e5d337df5ae44e063d1ed4a5a102f8bb3f5b610 100644
|
| --- a/content/common/cc_messages.h
|
| +++ b/content/common/cc_messages.h
|
| @@ -3,16 +3,20 @@
|
| // found in the LICENSE file.
|
| //
|
| // IPC Messages sent between compositor instances.
|
| -// Multiply-included message file, hence no include guard.
|
|
|
| #include "content/common/content_export.h"
|
| #include "ipc/ipc_message_macros.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
|
| -#include "third_party/WebKit/Source/Platform/chromium/public/WebTransformationMatrix.h"
|
| +#include "third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h"
|
|
|
| #ifndef CONTENT_COMMON_CC_MESSAGES_H_
|
| #define CONTENT_COMMON_CC_MESSAGES_H_
|
|
|
| +namespace WebKit {
|
| +class WebData;
|
| +class WebFilterOperations;
|
| +class WebTransformationMatrix;
|
| +}
|
| +
|
| namespace IPC {
|
|
|
| template <>
|
| @@ -24,6 +28,22 @@ struct ParamTraits<WebKit::WebData> {
|
| };
|
|
|
| template <>
|
| +struct ParamTraits<WebKit::WebFilterOperation> {
|
| + typedef WebKit::WebFilterOperation param_type;
|
| + static void Write(Message* m, const param_type& p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static void Log(const param_type& p, std::string* l);
|
| +};
|
| +
|
| +template <>
|
| +struct ParamTraits<WebKit::WebFilterOperations> {
|
| + typedef WebKit::WebFilterOperations param_type;
|
| + static void Write(Message* m, const param_type& p);
|
| + static bool Read(const Message* m, PickleIterator* iter, param_type* r);
|
| + static void Log(const param_type& p, std::string* l);
|
| +};
|
| +
|
| +template <>
|
| struct ParamTraits<WebKit::WebTransformationMatrix> {
|
| typedef WebKit::WebTransformationMatrix param_type;
|
| static void Write(Message* m, const param_type& p);
|
| @@ -35,7 +55,10 @@ struct ParamTraits<WebKit::WebTransformationMatrix> {
|
|
|
| #endif // CONTENT_COMMON_CC_MESSAGES_H_
|
|
|
| +// Multiply-included message file, hence no include guard.
|
|
|
| #define IPC_MESSAGE_START CCMsgStart
|
| #undef IPC_MESSAGE_EXPORT
|
| #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
|
| +
|
| +IPC_ENUM_TRAITS(WebKit::WebFilterOperation::FilterType)
|
|
|