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

include/device/xps/SkXPSDevice.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkXPSDevice_DEFINED
 #define SkXPSDevice_DEFINED
 
@@ skipping 117 matching lines @@
         SkXfermode* xmode,
         const uint16_t indices[], int indexCount,
         const SkPaint& paint) SK_OVERRIDE;
 
     virtual void drawDevice(
         const SkDraw&,
         SkBaseDevice* device,
         int x, int y,
         const SkPaint& paint) SK_OVERRIDE;
 
+    bool allowImageFilter(const SkImageFilter*) SK_OVERRIDE;
+
 private:
     class TypefaceUse : ::SkNoncopyable {
     public:
         SkFontID typefaceId;
         int ttcIndex;
         SkStream* fontData;
         IXpsOMFontResource* xpsFont;
         SkBitSet* glyphsUsed;
 
         explicit TypefaceUse();
@@ skipping 154 matching lines @@
         SkMatrix* matrix,
         SkVector* ppuScale,
         const SkIRect& clip, SkIRect* clipIRect);
 
     HRESULT applyMask(
         const SkDraw& d,
         const SkMask& mask,
         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&);
     void operator=(const SkXPSDevice&);
 
     typedef SkBitmapDevice INHERITED;
 };
 
 #endif