API change

content/common/cc_messages.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.
 
 #include "content/common/cc_messages.h"
 
 #include "base/command_line.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/filter_operations.h"
 #include "content/public/common/common_param_traits.h"
@@ skipping 192 matching lines @@
     LogParam(p.at(i), l);
   }
   l->append(")");
 }
 
 void ParamTraits<skia::RefPtr<SkImageFilter> >::Write(
     Message* m, const param_type& p) {
   SkImageFilter* filter = p.get();
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (filter && !command_line.HasSwitch(switches::kDisableFiltersOverIPC)) {
-    skia::RefPtr<SkData> data = skia::AdoptRef(SkSerializeFlattenable(filter));
+    skia::RefPtr<SkData> data =
+        skia::AdoptRef(SkValidatingSerializeFlattenable(filter));
     m->WriteData(static_cast<const char*>(data->data()), data->size());
   } else {
     m->WriteData(0, 0);
   }
 }
 
 bool ParamTraits<skia::RefPtr<SkImageFilter> >::Read(
     const Message* m, PickleIterator* iter, param_type* r) {
   const char* data = 0;
   int length = 0;
   if (!m->ReadData(iter, &data, &length))
     return false;
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if ((length > 0) &&
       !command_line.HasSwitch(switches::kDisableFiltersOverIPC)) {
-    SkFlattenable* flattenable = SkDeserializeFlattenable(data, length);
+    SkFlattenable* flattenable = SkValidatingDeserializeFlattenable(
+        data, length, SkImageFilter::GetFlattenableType());
     *r = skia::AdoptRef(static_cast<SkImageFilter*>(flattenable));
   } else {
     r->clear();
   }
   return true;
 }
 
 void ParamTraits<skia::RefPtr<SkImageFilter> >::Log(
     const param_type& p, std::string* l) {
   l->append("(");
@@ skipping 494 matching lines @@
   l->append(", [");
   for (size_t i = 0; i < p.render_pass_list.size(); ++i) {
     if (i)
       l->append(", ");
     LogParam(*p.render_pass_list[i], l);
   }
   l->append("])");
 }
 
 }  // namespace IPC