Make all the codecs default profiles based on gDefaultProfileIsSRGB.

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 729 matching lines @@
     srcRect.set(0, 0, this->width(), this->height());
     if (!r.intersect(srcRect, subset)) {
         return false;   // r is empty (i.e. no intersection)
     }
 
     if (fPixelRef->getTexture() != nullptr) {
         // Do a deep copy
         SkPixelRef* pixelRef = fPixelRef->deepCopy(this->colorType(), this->profileType(), &subset);
         if (pixelRef != nullptr) {
             SkBitmap dst;
-            dst.setInfo(this->info().makeWH(subset.width(), subset.height()));
+            dst.setInfo(SkImageInfo::Make(subset.width(), subset.height(),

[Brian Osman, 2016/04/21 13:33:37]

Sorry, I just went back and looked at this change more carefully. Does this do
anything different? (The rest of the review makes sense - just wasn't sure why
this file was modified like this).

[herb_g, 2016/04/21 15:09:54]

No This is a regression probably from one of the may rebases I did. I will put
it back.

+                                          this->colorType(), this->alphaType(),
+                                          this->profileType()));
             dst.setIsVolatile(this->isVolatile());
             dst.setPixelRef(pixelRef)->unref();
             SkDEBUGCODE(dst.validate());
             result->swap(dst);
             return true;
         }
     }
 
     // If the upper left of the rectangle was outside the bounds of this SkBitmap, we should have
     // exited above.
     SkASSERT(static_cast<unsigned>(r.fLeft) < static_cast<unsigned>(this->width()));
     SkASSERT(static_cast<unsigned>(r.fTop) < static_cast<unsigned>(this->height()));
 
     SkBitmap dst;
-    dst.setInfo(this->info().makeWH(r.width(), r.height()), this->rowBytes());
+    dst.setInfo(SkImageInfo::Make(r.width(), r.height(),
+                                  this->colorType(), this->alphaType(), this->profileType()),
+                this->rowBytes());
     dst.setIsVolatile(this->isVolatile());
 
     if (fPixelRef) {
         SkIPoint origin = fPixelRefOrigin;
         origin.fX += r.fLeft;
         origin.fY += r.fTop;
         // share the pixelref with a custom offset
         dst.setPixelRef(fPixelRef, origin);
     }
     SkDEBUGCODE(dst.validate();)
@@ skipping 573 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif