introduce Props to surface

include/core/SkCanvas.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCanvas_DEFINED
 #define SkCanvas_DEFINED
 
 #include "SkTypes.h"
 #include "SkBitmap.h"
 #include "SkDeque.h"
 #include "SkClipStack.h"
 #include "SkPaint.h"
 #include "SkRefCnt.h"
 #include "SkPath.h"
 #include "SkRegion.h"
+#include "SkSurfaceProps.h"
 #include "SkXfermode.h"
 
 #ifdef SK_SUPPORT_LEGACY_DRAWTEXT_VIRTUAL
     #define SK_LEGACY_DRAWTEXT_VIRTUAL  virtual
 #else
     #define SK_LEGACY_DRAWTEXT_VIRTUAL
 #endif
 
 class SkCanvasClipVisitor;
 class SkBaseDevice;
@@ skipping 99 matching lines @@
     /** Construct a canvas with the specified device to draw into.
 
         @param device   Specifies a device for the canvas to draw into.
     */
     explicit SkCanvas(SkBaseDevice* device);
 
     /** Construct a canvas with the specified bitmap to draw into.
         @param bitmap   Specifies a bitmap for the canvas to draw into. Its
                         structure are copied to the canvas.
     */
-    explicit SkCanvas(const SkBitmap& bitmap);
+    SkCanvas(const SkBitmap& bitmap, const SkSurfaceProps* = NULL);

[bungeman-skia, 2014/09/16 19:18:54]

This should still be explicit.

12.3.1 Conversion by constructor [class.conv.ctor]
A constructor declared without the function-specifier explicit specifies a
conversion from the types of its parameters to the type of its class. Such a
constructor is called a converting constructor. 

Example:
struct X {
  X(int);
  X(const char*, int =0);
};
void f(X arg) {
  X a = 1; // a = X(1)
  X b = "Jessie"; // b = X("Jessie",0)
  a = 2; // a = X(2)
  f(3); // f(X(3))
}

[reed1, 2014/09/16 19:38:46]

Done.

     virtual ~SkCanvas();
 
     SkMetaData& getMetaData();
 
     /**
      *  Return ImageInfo for this canvas. If the canvas is not backed by pixels
      *  (cpu or gpu), then the info's ColorType will be kUnknown_SkColorType.
      */
     SkImageInfo imageInfo() const;
 
@@ skipping 1126 matching lines @@
 private:
     class MCRec;
 
     SkClipStack fClipStack;
     SkDeque     fMCStack;
     // points to top of stack
     MCRec*      fMCRec;
     // the first N recs that can fit here mean we won't call malloc
     uint32_t    fMCRecStorage[32];
 
+    const SkSurfaceProps fProps;
+
     int         fSaveLayerCount;    // number of successful saveLayer calls
     int         fCullCount;         // number of active culls
 
     SkMetaData* fMetaData;
 
     SkSurface_Base*  fSurfaceBase;
     SkSurface_Base* getSurfaceBase() const { return fSurfaceBase; }
     void setSurfaceBase(SkSurface_Base* sb) {
         fSurfaceBase = sb;
     }
@@ skipping 224 matching lines @@
 
 class SkCanvasClipVisitor {
 public:
     virtual ~SkCanvasClipVisitor();
     virtual void clipRect(const SkRect&, SkRegion::Op, bool antialias) = 0;
     virtual void clipRRect(const SkRRect&, SkRegion::Op, bool antialias) = 0;
     virtual void clipPath(const SkPath&, SkRegion::Op, bool antialias) = 0;
 };
 
 #endif