Make SkSpecialSurfaces always use kUnknown for their pixel geometry

src/core/SkSpecialSurface.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #include "SkCanvas.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"
@@ skipping 26 matching lines @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 static SkSpecialSurface_Base* as_SB(SkSpecialSurface* surface) {
     return static_cast<SkSpecialSurface_Base*>(surface);
 }
 
 SkSpecialSurface::SkSpecialSurface(SkImageFilter::Proxy* proxy,
                                    const SkIRect& subset,
                                    const SkSurfaceProps* props)
-    : fProps(SkSurfacePropsCopyOrDefault(props))
+    : fProps(SkSurfacePropsCopyOrDefault(props).flags(), kUnknown_SkPixelGeometry)
     , fSubset(subset)
     , fProxy(proxy) {
     SkASSERT(fSubset.width() > 0);
     SkASSERT(fSubset.height() > 0);
 }
 
 SkCanvas* SkSpecialSurface::getCanvas() {
     return as_SB(this)->onGetCanvas();
 }
 
@@ skipping 11 matching lines @@
     SkSpecialSurface_Raster(SkImageFilter::Proxy* proxy,
                             SkPixelRef* pr,
                             const SkIRect& subset,
                             const SkSurfaceProps* props)
         : INHERITED(proxy, subset, props) {
         const SkImageInfo& info = pr->info();
 
         fBitmap.setInfo(info, info.minRowBytes());
         fBitmap.setPixelRef(pr);
 
-        fCanvas.reset(new SkCanvas(fBitmap));
+        fCanvas.reset(new SkCanvas(fBitmap, this->props()));
     }
 
     ~SkSpecialSurface_Raster() override { }
 
     sk_sp<SkSpecialImage> onMakeImageSnapshot() override {
         return SkSpecialImage::MakeFromRaster(this->proxy(), this->subset(), fBitmap,
                                               &this->props());
     }
 
 private:
@@ skipping 99 matching lines @@
 }
 
 sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRenderTarget(SkImageFilter::Proxy* proxy,
                                                            GrContext* context,
                                                            const GrSurfaceDesc& desc,
                                                            const SkSurfaceProps* props) {
     return nullptr;
 }
 
 #endif