SkXPS: compile under clang on win

BUG=chromium:616763
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2408133006

Review-Url: https://codereview.chromium.org/2408133006

diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp
index 5db644c..946566c 100644 (file)
--- a/src/xps/SkXPSDevice.cpp
+++ b/src/xps/SkXPSDevice.cpp
@@ -644,11 +644,11 @@ static const XPS_TILE_MODE XTM_XY = XPS_TILE_MODE_FLIPXY;
 //None is currently an internal hack so masks don't repeat (None+None only).
 static XPS_TILE_MODE SkToXpsTileMode[SkShader::kTileModeCount+1]
                                     [SkShader::kTileModeCount+1] = {
-           //Clamp //Repeat //Mirror //None
-/*Clamp */ XTM_N,  XTM_T,   XTM_Y,   XTM_N,
-/*Repeat*/ XTM_T,  XTM_T,   XTM_Y,   XTM_N,
-/*Mirror*/ XTM_X,  XTM_X,   XTM_XY,  XTM_X,
-/*None  */ XTM_N,  XTM_N,   XTM_Y,   XTM_N,
+               //Clamp  //Repeat //Mirror //None
+    /*Clamp */ {XTM_N,  XTM_T,   XTM_Y,   XTM_N},
+    /*Repeat*/ {XTM_T,  XTM_T,   XTM_Y,   XTM_N},
+    /*Mirror*/ {XTM_X,  XTM_X,   XTM_XY,  XTM_X},
+    /*None  */ {XTM_N,  XTM_N,   XTM_Y,   XTM_N},
 };
 
 HRESULT SkXPSDevice::createXpsImageBrush(

diff --git a/src/xps/SkXPSDevice.h b/src/xps/SkXPSDevice.h
index 57f3148..9f660a7 100644 (file)
--- a/src/xps/SkXPSDevice.h
+++ b/src/xps/SkXPSDevice.h
@@ -149,7 +149,7 @@ private:
         explicit TypefaceUse();
         ~TypefaceUse();
     };
-    friend static HRESULT subset_typeface(TypefaceUse* current);
+    friend HRESULT subset_typeface(TypefaceUse* current);
 
     SkXPSDevice(IXpsOMObjectFactory* xpsFactory);