commit 1dd3830b7254eaea8d710b256f7f040668f02458
author mtklein <mtklein@chromium.org> Tue Jul 07 08:13:11 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 07 08:13:11 2015 -0700
tree 67eaf2f821872697f021ee6e749bee513cb24f2e
parent 31cd6a030218373587a7ba943e4d76e96a71f207

Merge crrev.com/1151663002 into M44.

Patched nearly cleanly, with some cosmetic conflics in SkPicture.h.

Original change:
  Don't serialize SkPictures in SkPictureShaders when in untrusted mode.
  This requires we "first" add a has-picture bool to SkPictureShader serialized format.
  BUG=chromium:486947, billions and billions of others.
  Review URL: https://codereview.chromium.org/1151663002

NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
TBR=reed@google.com

Review URL: https://codereview.chromium.org/1231433004