introduce Props to surface

src/image/SkSurface.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSurface_Base.h"
 #include "SkImagePriv.h"
 #include "SkCanvas.h"
 
+SkSurfaceProps::SkSurfaceProps()
+    : fOrigin(SkIPoint::Make(0, 0)), fDisallowFlags(0), fPixelGeometry(kLegacyLCD_SkPixelGeometry)
+{}
+
+SkSurfaceProps::SkSurfaceProps(int x, int y, uint32_t flags, SkPixelGeometry pg)
+    : fOrigin(SkIPoint::Make(x, y)), fDisallowFlags(flags), fPixelGeometry(pg)
+{}
+
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSurface_Base::SkSurface_Base(int width, int height) : INHERITED(width, height) {
+SkSurface_Base::SkSurface_Base(int width, int height, const Props& props)
+    : INHERITED(width, height, props)

[robertphillips, 2014/09/16 14:15:19]

Shouldn't the '{' be on the line above?

[reed1, 2014/09/16 18:16:01]

Actually, I think when we have indented initializers, the curly should be on the
left, otherwise the initializers stack on top of the first line of code.

+{
     fCachedCanvas = NULL;
     fCachedImage = NULL;
 }
 
-SkSurface_Base::SkSurface_Base(const SkImageInfo& info) : INHERITED(info) {
+SkSurface_Base::SkSurface_Base(const SkImageInfo& info, const Props& props)
+    : INHERITED(info, props)

[robertphillips, 2014/09/16 14:15:19]

ditto?

+{
     fCachedCanvas = NULL;
     fCachedImage = NULL;
 }
 
 SkSurface_Base::~SkSurface_Base() {
     // in case the canvas outsurvives us, we null the callback
     if (fCachedCanvas) {
         fCachedCanvas->setSurfaceBase(NULL);
     }
 
@@ skipping 37 matching lines @@
     static int32_t gID;
     return sk_atomic_inc(&gID) + 1;
 }
 
 static SkSurface_Base* asSB(SkSurface* surface) {
     return static_cast<SkSurface_Base*>(surface);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-SkSurface::SkSurface(int width, int height) : fWidth(width), fHeight(height) {
+SkSurface::SkSurface(int width, int height, const Props& props)
+    : fProps(props), fWidth(width), fHeight(height)

[robertphillips, 2014/09/16 14:15:19]

ditto?

+{
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     fGenerationID = 0;
 }
 
-SkSurface::SkSurface(const SkImageInfo& info) : fWidth(info.width()), fHeight(info.height()) {
+SkSurface::SkSurface(const SkImageInfo& info, const Props& props)
+    : fProps(props), fWidth(info.width()), fHeight(info.height())

[robertphillips, 2014/09/16 14:15:19]

ditto?

+{
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     fGenerationID = 0;
 }
 
 uint32_t SkSurface::generationID() {
     if (0 == fGenerationID) {
         fGenerationID = asSB(this)->newGenerationID();
     }
     return fGenerationID;
@@ skipping 18 matching lines @@
 }
 
 void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
                      const SkPaint* paint) {
     return asSB(this)->onDraw(canvas, x, y, paint);
 }
 
 const void* SkSurface::peekPixels(SkImageInfo* info, size_t* rowBytes) {
     return this->getCanvas()->peekPixels(info, rowBytes);
 }