Bug 910754 - Update Skia to r13424 r=upstream
Bug 910754 - Add a bunch more required OpenGL functions for SkiaGL when using desktop OpenGL r=vlad
Bug 910754 - skia-npapi's anp_getFontPath() function doesn't work with upstream Skia anymore, and it looks like we don't need it to be implemented anyway r=snorp
Bug 910754 - Update gfx/2d's Skia code to use the new Skia APIs r=snorp
Bug 910754 - Stub out CreateTypeface*() for Mac r=snorp
Bug 910754 - Update include paths for gonk's build as Skia's directory structure has changed r=snorp
Bug 910754 - Mark linear-gradient-1a and linear-gradient-1b as fails-if with Skia r=snorp
Bug 910754 - [Skia] Defer deletion of our shader objects until after linking the program r=upstream(bsalomon)
Bug 910754 - Update SkFontHost_cairo for the new Skia APIs r=snorp
Bug 910754 - Update SkUserConfig to cater for SkMutex/SkAtomics header locations r=snorp
Bug 910754 - Update include location for skia-npapi to look in skia/trunk r=snorp
Bug 910754 - As we never build Skia statically, disable Skia's instance counting as it requires being built as a static library. r=snorp
Bug 910754 - Re-apply bug 921670 - Import the old Android FontHost to provide fonts for skia-npapi r=snorp
Back out changesets from bug 910754 due to build bustage
Bug 910754 - Update Skia to r13424 r=upstream
Bug 910754 - Add a bunch more required OpenGL functions for SkiaGL when using desktop OpenGL r=vlad
Merge m-c to inbound
Bug 974216 - Set LIBXUL_LIBRARY for LIBRARY_NAME==xul; r=glandium
bug 826481 - mark PrepareAndDispatch() as __attribute__((used)) when building with gcc or clang r=froydnj
bug 961287 - don't lto files that are only compiled to assembly to get offsets r=glandium