Merge branch 'chrome/m57' into update-m57

# Conflicts:
#	gm/imagealphathreshold.cpp
#	include/c/sk_data.h
#	include/c/sk_paint.h
#	include/c/sk_path.h
#	include/c/sk_picture.h
#	include/c/sk_types.h
#	include/core/SkMilestone.h
#	src/core/SkColorLookUpTable.cpp
#	src/core/SkColorSpacePriv.h
#	src/core/SkColorSpaceXform_A2B.cpp
#	src/core/SkColorSpace_ICC.cpp
#	src/core/SkSpecialImage.cpp
#	src/gpu/GrClipStackClip.cpp
#	src/gpu/GrPipeline.cpp
#	src/gpu/GrRenderTargetContext.cpp
#	src/gpu/GrRenderTargetOpList.cpp
#	src/gpu/ops/GrAADistanceFieldPathRenderer.cpp
#	src/gpu/ops/GrAADistanceFieldPathRenderer.h
#	src/image/SkImage_Gpu.cpp
#	src/image/SkSurface_Gpu.cpp
#	src/opts/SkRasterPipeline_opts.h

diff --cc gn/core.gni
Simple merge

diff --cc gyp/sksl.gyp
index ecd063d,da0cdff..3f84b20
--- 1/gyp/sksl.gyp
--- 2/gyp/sksl.gyp
+++ b/gyp/sksl.gyp
@@@ -8,16 -8,17 +8,18 @@@
        'target_name': 'sksl',
        'type': 'static_library',
        'standalone_static_library': 1,
 +      'msvs_disabled_warnings': [ 4267 ],
        'sources': [ '<!@(python read_gni.py ../gn/sksl.gni skia_sksl_sources)' ],
        'include_dirs': [
-          '../include/config',
-          '../include/core',
-          '../include/gpu',
-          '../include/private',
-          '../include/utils',
-          '../src/gpu',
-          '../src/sksl',
+         '../include/config',
+         '../include/core',
+         '../include/gpu',
+         '../include/private',
+         '../include/utils',
+         '../src/core',
+         '../src/gpu',
+         '../src/sksl',
+         '../src/utils',
        ],
        'defines': [
          'SKIA'

diff --cc include/private/GrSwizzle.h
index ff10b5a,4acf7e4..f07b09a
--- 1/src/gpu/GrSwizzle.h
--- 2/include/private/GrSwizzle.h
+++ b/include/private/GrSwizzle.h
@@@ -64,28 -90,16 +90,14 @@@ public
          return GrColorPackRGBA(outR, outG, outB, outA);
      }
  
-     static const GrSwizzle& RGBA() {
-         static GrSwizzle gRGBA("rgba");
-         return gRGBA;
-     }
- 
-     static const GrSwizzle& AAAA() {
-         static GrSwizzle gAAAA("aaaa");
-         return gAAAA;
-     }
- 
-     static const GrSwizzle& RRRR() {
-         static GrSwizzle gRRRR("rrrr");
-         return gRRRR;
-     }
- 
-     static const GrSwizzle& BGRA() {
-         static GrSwizzle gBGRA("bgra");
-         return gBGRA;
-     }
+     static GrSwizzle RGBA() { return GrSwizzle("rgba"); }
+     static GrSwizzle AAAA() { return GrSwizzle("aaaa"); }
+     static GrSwizzle RRRR() { return GrSwizzle("rrrr"); }
+     static GrSwizzle RRRA() { return GrSwizzle("rrra"); }
+     static GrSwizzle BGRA() { return GrSwizzle("bgra"); }
  
-     static const GrSwizzle& CreateRandom(SkRandom* random) {
+     static GrSwizzle CreateRandom(SkRandom* random) {
          switch (random->nextU() % 4) {
 -            case 0:
 -                return RGBA();
              case 1:
                  return BGRA();
              case 2:

diff --cc src/image/SkSurface.cpp
Simple merge

diff --cc src/ports/SkFontMgr_win_dw.cpp
Simple merge