Merge branch 'chrome/m54' into merge-m54

Changes:
 - include/core/SkPreConfig.h: they added (_WIN32) like I did
 - gyp/common_conditions.gypi: they modified a line which I had edited to make DLL
 - used theirs for the rest

# Conflicts:
#	gyp/common_conditions.gypi
#	include/core/SkPreConfig.h
#	infra/bots/assets/skimage/VERSION
#	infra/bots/assets/skp/VERSION
#	infra/bots/assets/skp/create.py
#	infra/bots/assets/win_vulkan_sdk/VERSION
#	infra/bots/perf_skia.isolate
#	infra/bots/test_skia.isolate
#	src/pdf/SkPDFMetadata.cpp
#	src/utils/SkRTConf.cpp
#	tests/DFPathRendererTest.cpp
#	tests/PathTest.cpp

diff --cc gyp/common_conditions.gypi
index 6e47917,c91f46a..dbdb2f4
--- 1/gyp/common_conditions.gypi
--- 2/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@@ -19,11 -19,6 +19,9 @@@
      'SK_HAS_JPEG_LIBRARY',
      'SK_HAS_PNG_LIBRARY',
      'SK_HAS_WEBP_LIBRARY',
- 
-     # Temporarily test against the QCMS library.
-     'SK_TEST_QCMS',
++
 +    'SKIA_DLL',
 +    'SKIA_IMPLEMENTATION=1',
    ],
    'conditions' : [
      [ 'skia_is_bot', {

diff --cc gyp/core.gypi
Simple merge

diff --cc gyp/effects.gyp
Simple merge

diff --cc include/c/sk_types.h
Simple merge

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