Add SkColorSpace to SkImageInfo

src/core/SkBitmap.cpp

 /*
  * Copyright 2008 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.
  */
 
 #include "SkAtomics.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 11 matching lines @@
 #include "SkWriteBuffer.h"
 
 #include <string.h>
 
 static bool reset_return_false(SkBitmap* bm) {
     bm->reset();
     return false;
 }
 
 SkBitmap::SkBitmap() {
+    this->fInfo = SkImageInfo::MakeUnknown();

[msarett, 2016/05/26 13:43:05]

I could also add a reset() function to SkImageInfo...

     sk_bzero(this, sizeof(*this));
 }
 
 SkBitmap::SkBitmap(const SkBitmap& src) {
     SkDEBUGCODE(src.validate();)
+    this->fInfo = SkImageInfo::MakeUnknown();
     sk_bzero(this, sizeof(*this));
     *this = src;
     SkDEBUGCODE(this->validate();)
 }
 
 SkBitmap::SkBitmap(SkBitmap&& other) : SkBitmap() { this->swap(other); }
 
 SkBitmap::~SkBitmap() {
     SkDEBUGCODE(this->validate();)
     this->freePixels();
 }
 
 SkBitmap& SkBitmap::operator=(const SkBitmap& src) {
     if (this != &src) {
         this->freePixels();
+        this->fInfo = src.fInfo;
         memcpy(this, &src, sizeof(src));
 
         // inc src reference counts
         SkSafeRef(src.fPixelRef);
 
         // we reset our locks if we get blown away
         fPixelLockCount = 0;
 
         if (fPixelRef) {
             // ignore the values from the memcpy
@@ skipping 28 matching lines @@
     SkTSwap(fPixels, other.fPixels);
     SkTSwap(fInfo, other.fInfo);
     SkTSwap(fRowBytes, other.fRowBytes);
     SkTSwap(fFlags, other.fFlags);
 
     SkDEBUGCODE(this->validate();)
 }
 
 void SkBitmap::reset() {
     this->freePixels();
+    this->fInfo = SkImageInfo::MakeUnknown();
     sk_bzero(this, sizeof(*this));
 }
 
 void SkBitmap::getBounds(SkRect* bounds) const {
     SkASSERT(bounds);
     bounds->set(0, 0,
                 SkIntToScalar(fInfo.width()), SkIntToScalar(fInfo.height()));
 }
 
 void SkBitmap::getBounds(SkIRect* bounds) const {
@@ skipping 1239 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif