Merge branch 'chrome/m60' into update-m60

diff --cc BUILD.gn
Simple merge

diff --cc gn/BUILD.gn
Simple merge

diff --cc gn/core.gni
Simple merge

diff --cc gn/effects.gni
Simple merge

diff --cc include/core/SkDocument.h
index 1afa20d,9204243..b0a474f
--- 1/include/core/SkDocument.h
--- 2/include/core/SkDocument.h
+++ b/include/core/SkDocument.h
@@@ -170,14 -170,7 +170,12 @@@ public
      static sk_sp<SkDocument> MakeXPS(SkWStream* stream,
                                       IXpsOMObjectFactory* xpsFactory,
                                       SkScalar dpi = SK_ScalarDefaultRasterDPI);
 +    static sk_sp<SkDocument> MakeXPS(SkWStream* stream,
 +                                     SkScalar dpi = SK_ScalarDefaultRasterDPI);
 +#else
 +    // DEPRECATED; TODO(mattleibow): we should remove this function.
 +    static sk_sp<SkDocument> MakeXPS(SkWStream*, SkScalar) { return nullptr; }
  #endif
-     // DEPRECATED; TODO(halcanary): remove this function after Chromium switches to new API.
-     static sk_sp<SkDocument> MakeXPS(SkWStream*) { return nullptr; }
  
      /**
       *  Begin a new page for the document, returning the canvas that will draw

diff --cc src/core/SkConvertPixels.cpp
Simple merge

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

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

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