Revert of Change device creation to see the (optional) layer-paint

include/device/xps/SkXPSDevice.h

Index: include/device/xps/SkXPSDevice.h
diff --git a/include/device/xps/SkXPSDevice.h b/include/device/xps/SkXPSDevice.h
index 10dab8118322f212637fa7f1310accd6fe6293f5..514259dbaa2921daae8cbf72be5d0eee22331f38 100644
--- a/include/device/xps/SkXPSDevice.h
+++ b/include/device/xps/SkXPSDevice.h
@@ -135,6 +135,8 @@
         int x, int y,
         const SkPaint& paint) SK_OVERRIDE;
 
+    bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE;
+
 private:
     class TypefaceUse : ::SkNoncopyable {
     public:
@@ -309,7 +311,7 @@
         const SkVector& ppuScale,
         IXpsOMPath* shadedPath);
 
-    SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) SK_OVERRIDE;
+    SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE;
 
     // Disable the default copy and assign implementation.
     SkXPSDevice(const SkXPSDevice&);