Merge branch 'chrome/m68' into dev/update-m68

diff --cc BUILD.gn
Simple merge

diff --cc gn/BUILD.gn
index bbd924a92abfc84a778a7ad3c58aed620a92248d,7a6a8211d5bee92a9c580e16a37fad952361940b..e081a47ab7dba724c006ba25fe6c0c64eae2639b
--- 1/gn/BUILD.gn
--- 2/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@@ -179,34 -169,12 +179,36 @@@ config("default") 
      libs += [
        "c++_static",
        "c++abi",
-       "android_support",
      ]
+     if (ndk_api < 21) {
+       libs += [ "android_support" ]
+     }
    }
  
 +  if (is_tizen) {
 +    asmflags += [
 +      "--target=$ncli_target",
 +      "-B$ncli/tools/$ncli_gccdir/$ncli_target/bin",
 +    ]
 +    cflags += [
 +      "--sysroot=$ncli/platforms/$ncli_platform",
 +      "--target=$ncli_target",
 +      "-B$ncli/tools/$ncli_gccdir/$ncli_target/bin",
 +    ]
 +    cflags_cc += [
 +      "-isystem$ncli/tools/$ncli_gccdir/$ncli_target/include/c++/6.2.1",
 +      "-isystem$ncli/tools/$ncli_gccdir/$ncli_target/include/c++/6.2.1/$ncli_target",
 +    ]
 +    ldflags += [
 +      "--sysroot=$ncli/platforms/$ncli_platform",
 +      "--target=$ncli_target",
 +      "-B$ncli/tools/$ncli_gccdir/$ncli_target/bin",
 +    ]
 +    lib_dirs = [
 +      "$ncli/platforms/$ncli_platform/usr/lib",
 +    ]
 +  }
 +
    if (is_ios) {
      _target = target_cpu
      if (target_cpu == "arm") {

diff --cc gn/BUILDCONFIG.gn
index ba119fef118752874e6df1451086289a6e27f7a1,e5440b9b7666518c5ca4a84a788fa953bcc5bb07..6b7d6bd7178f38b1834816dff843f8a22cbe7093
--- 1/gn/BUILDCONFIG.gn
--- 2/gn/BUILDCONFIG.gn
+++ b/gn/BUILDCONFIG.gn
@@@ -35,8 -34,8 +35,11 @@@ declare_args() 
  
    clang_win = ""
  
+   skia_vulkan_sdk = getenv("VULKAN_SDK")
+   skia_moltenvk_path = ""
++
 +  ncli = ""
 +  ncli_version = "4.0"
  }
  declare_args() {
    is_debug = !is_official_build

diff --cc gn/core.gni
Simple merge

diff --cc gn/effects.gni
Simple merge

diff --cc gn/toolchain/BUILD.gn
Simple merge

diff --cc include/gpu/GrContext.h
index 71a0b8d7f119c6ee37febcf42fe80f754f7a09e2,525e5d77b8a69ca4d33cf730ac667b08232ecc99..9ed54edd305a94540c9f63253ed4906949343da7
--- 1/include/gpu/GrContext.h
--- 2/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@@ -281,8 -282,8 +282,10 @@@ public
      // Chrome is using this!
      void dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) const;
  
+     bool supportsDistanceFieldText() const;
+ 
 +    GrBackend backend() { return fBackend; }
 +
  protected:
      GrContext(GrBackend, int32_t id = SK_InvalidGenID);
  

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

diff --cc src/xps/SkXPSDevice.cpp
Simple merge

diff --cc src/xps/SkXPSDocument.cpp
Simple merge

diff --cc tests/CTest.cpp
index 121b2c469212b87bc4f85126fa36037780bc3032,425b264718edcef67161f967600a725029898f9d..d7fe5b3f2847fc13bd12c46c6c32725de3d878db
--- 1/tests/CTest.cpp
--- 2/tests/CTest.cpp
+++ b/tests/CTest.cpp
@@@ -6,20 -6,18 +6,22 @@@
   */
  
  #include "Test.h"
- 
  #include "sk_canvas.h"
  #include "sk_paint.h"
- #include "sk_surface.h"
  #include "sk_shader.h"
+ #include "sk_surface.h"
+ #include "sk_types.h"
+ 
+ #include <stdint.h>
  
  static void shader_test(skiatest::Reporter* reporter) {
 -    sk_imageinfo_t info =
 -        {64, 64, sk_colortype_get_default_8888(), PREMUL_SK_ALPHATYPE};
 -    sk_surface_t* surface  = sk_surface_new_raster(&info, nullptr);
 +    sk_imageinfo_t info;
 +    info.width = 64;
 +    info.height = 64;
 +    info.colorType = sk_colortype_get_default_8888();
 +    info.alphaType = PREMUL_SK_ALPHATYPE;
 +
 +    sk_surface_t* surface  = sk_surface_new_raster(&info, 0, nullptr);
      sk_canvas_t* canvas = sk_surface_get_canvas(surface);
      sk_paint_t* paint = sk_paint_new();