Add pickling traits for the WebFilterOperations class.

content/public/common/webkit_param_traits.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // NOTE: New trait definitions that will be used by Chrome Frame must be placed
 // in common_param_traits2.cc.
 
 #include "content/public/common/webkit_param_traits.h"
 
 #include "base/string_number_conversions.h"
@@ skipping 15 matching lines @@
     : type(NPVARIANT_PARAM_VOID),
       bool_value(false),
       int_value(0),
       double_value(0),
       npobject_routing_id(-1) {
 }
 
 NPVariant_Param::~NPVariant_Param() {
 }
 
+IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint)
+  IPC_STRUCT_TRAITS_MEMBER(x)
+  IPC_STRUCT_TRAITS_MEMBER(y)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect)
+  IPC_STRUCT_TRAITS_MEMBER(x)
+  IPC_STRUCT_TRAITS_MEMBER(y)
+  IPC_STRUCT_TRAITS_MEMBER(width)
+  IPC_STRUCT_TRAITS_MEMBER(height)
+IPC_STRUCT_TRAITS_END()

[danakj, 2012/09/21 23:38:26]

I strongly suspect this is the wrong thing to do, but I don't know what is the
right thing to allow us to pickle WebFilterOperation which has these as members.

+
 namespace IPC {
 
 void ParamTraits<WebKit::WebData>::Write(Message* m, const param_type& p) {
   if (p.isEmpty()) {
     m->WriteData(NULL, 0);
   } else {
     m->WriteData(p.data(), p.size());
   }
 }
 
@@ skipping 110 matching lines @@
   LogParam(p.m41(), l);
   l->append(", ");
   LogParam(p.m42(), l);
   l->append(", ");
   LogParam(p.m43(), l);
   l->append(", ");
   LogParam(p.m44(), l);
   l->append(") ");
 }
 
+void ParamTraits<WebKit::WebFilterOperations>::Write(
+    Message* m, const param_type& p) {
+  if (p.isEmpty()) {
+    WriteParam(m, 0);
+    return;
+  }
+
+  WriteParam(m, p.size());
+  for (std::size_t i = 0; i < p.size(); ++i) {
+    WriteParam(m, p.at(i));
+  }
+}
+
+bool ParamTraits<WebKit::WebFilterOperations>::Read(
+    const Message* m, PickleIterator* iter, param_type* r) {
+  size_t count;
+  if (!ReadParam(m, iter, &count))
+    return false;
+
+  for (std::size_t i = 0; i < count; ++i) {
+    WebKit::WebFilterOperation op =
+        WebKit::WebFilterOperation::createEmptyFilter();
+    if (!ReadParam(m, iter, &op))
+      return false;
+    r->append(op);
+  }
+  return true;
+}
+
+void ParamTraits<WebKit::WebFilterOperations>::Log(
+    const param_type& p, std::string* l) {
+  l->append("(");
+  for (std::size_t i = 0; i < p.size(); ++i) {
+    if (i)
+      l->append(", ");
+    LogParam(p.at(i), l);
+  }
+  l->append(")");
+}
+
+void ParamTraits<WebKit::WebFilterOperation>::Write(
+    Message* m, const param_type& p) {
+  WriteParam(m, static_cast<unsigned>(p.type()));
+  switch (p.type()) {
+    case WebKit::WebFilterOperation::FilterTypeGrayscale:
+    case WebKit::WebFilterOperation::FilterTypeSepia:
+    case WebKit::WebFilterOperation::FilterTypeSaturate:
+    case WebKit::WebFilterOperation::FilterTypeHueRotate:
+    case WebKit::WebFilterOperation::FilterTypeInvert:
+    case WebKit::WebFilterOperation::FilterTypeBrightness:
+    case WebKit::WebFilterOperation::FilterTypeContrast:
+    case WebKit::WebFilterOperation::FilterTypeOpacity:
+    case WebKit::WebFilterOperation::FilterTypeBlur:
+      WriteParam(m, p.amount());
+      break;
+    case WebKit::WebFilterOperation::FilterTypeDropShadow:
+      WriteParam(m, p.dropShadowOffset());
+      WriteParam(m, p.amount());
+      WriteParam(m, p.dropShadowColor());
+      break;
+    case WebKit::WebFilterOperation::FilterTypeColorMatrix:
+      for (int i = 0; i < 20; ++i)
+        WriteParam(m, p.matrix()[i]);
+      break;
+    case WebKit::WebFilterOperation::FilterTypeZoom:
+      WriteParam(m, p.zoomRect());
+      WriteParam(m, p.amount());
+      break;
+  }
+}
+
+bool ParamTraits<WebKit::WebFilterOperation>::Read(
+    const Message* m, PickleIterator* iter, param_type* r) {
+  unsigned type;
+  float amount;
+  WebKit::WebPoint dropShadowOffset;
+  WebKit::WebColor dropShadowColor;
+  SkScalar matrix[20];
+  WebKit::WebRect zoomRect;
+
+  if (!ReadParam(m, iter, &type))
+    return false;
+  r->setType(static_cast<WebKit::WebFilterOperation::FilterType>(type));
+
+  switch (type) {
+    case WebKit::WebFilterOperation::FilterTypeGrayscale:
+    case WebKit::WebFilterOperation::FilterTypeSepia:
+    case WebKit::WebFilterOperation::FilterTypeSaturate:
+    case WebKit::WebFilterOperation::FilterTypeHueRotate:
+    case WebKit::WebFilterOperation::FilterTypeInvert:
+    case WebKit::WebFilterOperation::FilterTypeBrightness:
+    case WebKit::WebFilterOperation::FilterTypeContrast:
+    case WebKit::WebFilterOperation::FilterTypeOpacity:
+    case WebKit::WebFilterOperation::FilterTypeBlur:
+      if (!ReadParam(m, iter, &amount))
+        return false;
+      r->setAmount(amount);
+      break;
+    case WebKit::WebFilterOperation::FilterTypeDropShadow:
+      if (!ReadParam(m, iter, &dropShadowOffset) ||
+          !ReadParam(m, iter, &amount) ||
+          !ReadParam(m, iter, &dropShadowColor))
+        return false;
+      r->setDropShadowOffset(dropShadowOffset);
+      r->setAmount(amount);
+      r->setDropShadowColor(dropShadowColor);
+      break;
+    case WebKit::WebFilterOperation::FilterTypeColorMatrix:
+      for (int i = 0; i < 20; ++i) {
+        if (!ReadParam(m, iter, &matrix[i]))
+          return false;
+      }
+      r->setMatrix(matrix);
+      break;
+    case WebKit::WebFilterOperation::FilterTypeZoom:
+      if (!ReadParam(m, iter, &zoomRect) ||
+          !ReadParam(m, iter, &amount))
+        return false;
+      r->setZoomRect(zoomRect);
+      r->setAmount(amount);
+      break;
+  }
+  return true;
+}
+
+void ParamTraits<WebKit::WebFilterOperation>::Log(
+    const param_type& p, std::string* l) {
+  l->append("(");
+  LogParam(static_cast<unsigned>(p.type()), l);
+  l->append(", ");
+
+  switch (p.type()) {
+    case WebKit::WebFilterOperation::FilterTypeGrayscale:
+    case WebKit::WebFilterOperation::FilterTypeSepia:
+    case WebKit::WebFilterOperation::FilterTypeSaturate:
+    case WebKit::WebFilterOperation::FilterTypeHueRotate:
+    case WebKit::WebFilterOperation::FilterTypeInvert:
+    case WebKit::WebFilterOperation::FilterTypeBrightness:
+    case WebKit::WebFilterOperation::FilterTypeContrast:
+    case WebKit::WebFilterOperation::FilterTypeOpacity:
+    case WebKit::WebFilterOperation::FilterTypeBlur:
+      LogParam(p.amount(), l);
+      break;
+    case WebKit::WebFilterOperation::FilterTypeDropShadow:
+      LogParam(p.dropShadowOffset(), l);
+      l->append(", ");
+      LogParam(p.amount(), l);
+      l->append(", ");
+      LogParam(p.dropShadowColor(), l);
+      break;
+    case WebKit::WebFilterOperation::FilterTypeColorMatrix:
+      for (int i = 0; i < 20; ++i) {
+        if (i)
+          l->append(", ");
+        LogParam(p.matrix()[i], l);
+      }
+      break;
+    case WebKit::WebFilterOperation::FilterTypeZoom:
+      LogParam(p.zoomRect(), l);
+      l->append(", ");
+      LogParam(p.amount(), l);
+      break;
+  }
+  l->append(")");
+}
+
 void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.base_time.is_null());
   if (p.base_time.is_null())
     return;
   WriteParam(m, p.base_ticks);
   WriteParam(m, p.base_time);
   WriteParam(m, p.proxy_start);
   WriteParam(m, p.proxy_end);
   WriteParam(m, p.dns_start);
@@ skipping 296 matching lines @@
       ReadParam(m, iter, &p->ssl_valid) &&
       ReadParam(m, iter, &p->preferred) &&
       ReadParam(m, iter, &p->blacklisted_by_user);
 }
 void ParamTraits<webkit::forms::PasswordForm>::Log(const param_type& p,
                                                    std::string* l) {
   l->append("<PasswordForm>");
 }
 
 }  // namespace IPC