author Wes Kocher <>
Thu, 21 Jan 2016 16:24:42 -0800
changeset 281044 8a72770299f19f93f281874098ac8e94c76c8265
parent 255574 b8802b591ce273baec00243ce338845741dee21d
child 316822 b508adb15d65a4e5cf535e987b1e0da8d6d7a77f
permissions -rw-r--r--
Merge inbound to m-c a=merge

This is an import of Skia from 2014-07-28 (b1ab5fdd11bb358d738c1bfa63737dc65174a281)

To update to a new version of Skia:

- Clone Skia from upstream using the instructions here:
- Copy the entire source tree from a Skia clone to mozilla-central/gfx/skia/skia
- cd gfx/skia && ./gyp_mozbuild

Once that's done, use git status to view the files that have changed. Keep an eye on GrUserConfig.h
and SkUserConfig.h as those probably don't want to be overwritten by upstream versions.

This process will be made more automatic in the future.