Revert of XPS, DM: add SkDocument::CreateXPS

gyp/xps.gyp

Index: gyp/xps.gyp
diff --git a/gyp/xps.gyp b/gyp/xps.gyp
index 4a301b6a597f48414406bb43d4abe50b4e91fe6e..080dc62b6c345e5fa9a0e8408ce0ae8a9d30edc3 100644
--- a/gyp/xps.gyp
+++ b/gyp/xps.gyp
@@ -5,43 +5,56 @@
       'product_name': 'skia_xps',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+        'sfnt.gyp:sfnt',
+      ],
+      'include_dirs': [
+        '../include/device/xps',
+        '../include/utils/win',
+        '../src/core', # needed to get SkGlyphCache.h
+        '../src/utils', # needed to get SkBitSet.h
+      ],
+      'sources': [
+        '../include/device/xps/SkConstexprMath.h',
+        '../include/device/xps/SkXPSDevice.h',
+
+        '../src/device/xps/SkXPSDevice.cpp',
+      ],
       'conditions': [
         [ 'skia_os == "win"', {
-          'defines': [ 'SK_XPS_USE_DETERMINISTIC_IDS', ],
-          'dependencies': [
-            'skia_lib.gyp:skia_lib',
-            'sfnt.gyp:sfnt',
-          ],
-          'include_dirs': [
-            '../include/device/xps',
-            '../include/utils/win',
-            '../src/core', # needed to get SkGlyphCache.h
-            '../src/utils', # needed to get SkBitSet.h
-          ],
-          'sources': [
-            '../include/device/xps/SkConstexprMath.h',
-            '../include/device/xps/SkXPSDevice.h',
-            '../src/device/xps/SkXPSDevice.cpp',
-            '../src/doc/SkDocument_XPS.cpp',
-          ],
           'link_settings': {
             'libraries': [
               '-lt2embed.lib',
               '-lfontsub.lib',
             ],
           },
-          'direct_dependent_settings': {
-            'defines': [ 'SK_XPS_USE_DETERMINISTIC_IDS', ],
-            'include_dirs': [
-              '../include/device/xps',
-              '../src/utils', # needed to get SkBitSet.h
-            ],
-          },
         },{ #else if 'skia_os != "win"'
-          'sources': [ '../src/doc/SkDocument_XPS_None.cpp', ],
-          'dependencies': [ 'skia_lib.gyp:skia_lib', ],
+          'include_dirs!': [
+            '../include/utils/win',
+          ],
+          'sources!': [
+            '../include/device/xps/SkXPSDevice.h',
+
+            '../src/device/xps/SkXPSDevice.cpp',
+          ],
         }],
       ],
+      # This section makes all targets that depend on this target
+      # #define SK_SUPPORT_XPS and have access to the xps header files.
+      'direct_dependent_settings': {
+        'conditions': [
+          [ 'skia_os == "win"', {
+            'defines': [
+              'SK_SUPPORT_XPS',
+            ],
+          }],
+        ],
+        'include_dirs': [
+          '../include/device/xps',
+          '../src/utils', # needed to get SkBitSet.h
+        ],
+      },
     },
   ],
 }