summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authorsugoi@chromium.org <sugoi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-05 20:19:54 +0000
committersugoi@chromium.org <sugoi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-05 20:19:54 +0000
commit82757b108ec291fcc9c24d4c30e305f14f0adbf7 (patch)
tree6b6e5fc89323902bdd68226544ad9abbfb14025d /content/common
parente9d3b95f20676b8b38b0333c48aeee35c4d89c9c (diff)
downloadchromium_src-82757b108ec291fcc9c24d4c30e305f14f0adbf7.zip
chromium_src-82757b108ec291fcc9c24d4c30e305f14f0adbf7.tar.gz
chromium_src-82757b108ec291fcc9c24d4c30e305f14f0adbf7.tar.bz2
Minor modification that reflects a small API change in Skia
BUG= Review URL: https://codereview.chromium.org/50603014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/cc_messages.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc
index ad6fcbe..d987c78 100644
--- a/content/common/cc_messages.cc
+++ b/content/common/cc_messages.cc
@@ -210,7 +210,8 @@ void ParamTraits<skia::RefPtr<SkImageFilter> >::Write(
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);
@@ -226,7 +227,8 @@ bool ParamTraits<skia::RefPtr<SkImageFilter> >::Read(
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();