API change

Minor modification that reflects a small API change in Skia

BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=233067

[jschuh, 2013-11-01 17:53:29]

Where does the actual serialization code live? That's going to need a thorough
review and probably its own fuzzer.

[sugoi1, 2013-11-01 17:59:53]

On 2013/11/01 17:53:29, Justin Schuh wrote:
> Where does the actual serialization code live? That's going to need a thorough
> review and probably its own fuzzer.

The code lives entirely inside the skia library.

If you can help me with the fuzzer, that would be great. I did add a fuzzer
inside skia that tests the serialization, but it hasn't been ported to
clusterfuzz and I have never touched clusterfuzz.

This current cl does absolutely nothing, though, it just uses the new API
instead of the old API, but there's no actual change in functionality. The
"secure" version of the serializing code has already landed in skia and I can
send you the cl ids if you want to review them.

[jschuh, 2013-11-01 18:22:53]

Okay, you'll want to coordinate with @inferno on getting the code fuzzed. When
do we expect stable channel to start using the serialized skia path?

[jschuh, 2013-11-01 18:44:02]

Accepting that, this change can be lgtm'd.

[sugoi1, 2013-11-01 18:47:21]

On 2013/11/01 18:22:53, Justin Schuh wrote:
> Okay, you'll want to coordinate with @inferno on getting the code fuzzed. When
> do we expect stable channel to start using the serialized skia path?

As soon as possible :) In an ideal world, this would be available for M32, so
that the switch to Aura doesn't make us lose functionality (SVG filters).

[jschuh, 2013-11-01 19:05:31]

On 2013/11/01 18:47:21, sugoi1 wrote:
> On 2013/11/01 18:22:53, Justin Schuh wrote:
> > Okay, you'll want to coordinate with @inferno on getting the code fuzzed.
When
> > do we expect stable channel to start using the serialized skia path?
> 
> As soon as possible :) In an ideal world, this would be available for M32, so
> that the switch to Aura doesn't make us lose functionality (SVG filters).

There's a tremendous amount of attack surface that needs to be covered here,
along with the inevitable fixes that will ensue. I think m32 might be a bit
optimistic.

[commit-bot: I haz the power, 2013-11-01 19:11:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sugoi@chromium.org/50603014/1

[commit-bot: I haz the power, 2013-11-01 19:57:17]

Retried try job too often on chromium_presubmit for step(s) presubmit
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=chromium_p...

[piman, 2013-11-01 21:16:34]

lgtm

[commit-bot: I haz the power, 2013-11-01 21:27:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sugoi@chromium.org/50603014/1

[commit-bot: I haz the power, 2013-11-02 00:40:52]

Retried try job too often on win_rel for step(s) content_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-03 21:11:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sugoi@chromium.org/50603014/1

[commit-bot: I haz the power, 2013-11-03 21:11:13]

Failed to apply patch for content/common/cc_messages.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/common/cc_messages.cc
  Hunk #1 FAILED at 210.
  Hunk #2 FAILED at 225.
  2 out of 2 hunks FAILED -- saving rejects to file
content/common/cc_messages.cc.rej

Patch:       content/common/cc_messages.cc
Index: content/common/cc_messages.cc
diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc
index
8b54af2523c7bbff6a07c3b4005dbef09be8d995..26a66dade8dff0f0b98ab4081f5ca92269bf339b
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::kAllowFiltersOverIPC)) {
-    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);
@@ -225,7 +226,8 @@ bool ParamTraits<skia::RefPtr<SkImageFilter> >::Read(
     return false;
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if ((length > 0) && command_line.HasSwitch(switches::kAllowFiltersOverIPC)) {
-    SkFlattenable* flattenable = SkDeserializeFlattenable(data, length);
+    SkFlattenable* flattenable = SkValidatingDeserializeFlattenable(
+        data, length, SkImageFilter::GetFlattenableType());
     *r = skia::AdoptRef(static_cast<SkImageFilter*>(flattenable));
   } else {
     r->clear();

[commit-bot: I haz the power, 2013-11-04 12:45:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sugoi@chromium.org/50603014/170002

[commit-bot: I haz the power, 2013-11-04 15:19:28]

Retried try job too often on win_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-04 16:03:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sugoi@chromium.org/50603014/170002

[commit-bot: I haz the power, 2013-11-04 17:42:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sugoi@chromium.org/50603014/170002

[commit-bot: I haz the power, 2013-11-04 19:11:16]

Step "update" is always a major failure.
Look at the try server FAQ for more details.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-11-05 16:35:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sugoi@chromium.org/50603014/660001

[commit-bot: I haz the power, 2013-11-05 20:19:57]

Change committed as 233067