SkBitmap now really stores SkImageInfo -- config is just a ruse

SkBitmap now really stores SkImageInfo -- config is just a ruse

BUG=skia:

Committed: http://code.google.com/p/skia/source/detail?r=13411

[reed1, 2014-02-11 16:33:04]

This is the same as the previously named CL, but with warning fixes. ptal

[scroggo, 2014-02-11 16:42:25]

On 2014/02/11 16:33:04, reed1 wrote:
> This is the same as the previously named CL, but with warning fixes. ptal

lgtm

[reed1, 2014-02-11 16:49:26]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2014-02-11 16:49:38]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/reed@google.com/159653004/1

[commit-bot: I haz the power, 2014-02-11 16:49:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-02-11 16:49:49]

Failed to apply patch for src/gpu/GrClipMaskManager.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file src/gpu/GrClipMaskManager.cpp
  Hunk #1 FAILED at 70.
  Hunk #2 FAILED at 310.
  Hunk #3 FAILED at 349.
  Hunk #4 FAILED at 381.
  4 out of 4 hunks FAILED -- saving rejects to file
src/gpu/GrClipMaskManager.cpp.rej

Patch:       src/gpu/GrClipMaskManager.cpp
Index: src/gpu/GrClipMaskManager.cpp
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index
35e0818dd0577d3f41397a26dea3bc2506d9722a..0a36811f4d27c44bd2b27585715647af3fc6a369
100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -70,7 +70,7 @@ static bool path_needs_SW_renderer(GrContext* context,
     SkPath::FillType fillType =
SkPath::ConvertToNonInverseFillType(origPath.getFillType());
 
     // the 'false' parameter disallows use of the SW path renderer
-    GrPathRenderer::AutoClearPath acp(context->getPathRenderer(origPath,
stroke, gpu, 
+    GrPathRenderer::AutoClearPath acp(context->getPathRenderer(origPath,
stroke, gpu,
                                                                false, type,
fillType));
     return NULL == acp.renderer();
 }
@@ -310,7 +310,7 @@ void setup_boolean_blendcoeffs(GrDrawState* drawState,
SkRegion::Op op) {
 

////////////////////////////////////////////////////////////////////////////////
 bool GrClipMaskManager::drawFilledPath(GrTexture* target,
-                                       GrPathRenderer* pathRenderer, 
+                                       GrPathRenderer* pathRenderer,
                                        bool isAA) {
     GrDrawState* drawState = fGpu->drawState();
 
@@ -349,7 +349,7 @@ bool GrClipMaskManager::drawElement(GrTexture* target,
                                      GrPathRendererChain::kColor_DrawType;
             SkPath::FillType fillType = element->getPath().getFillType();
             GrPathRenderer::AutoClearPath
acp(this->getContext()->getPathRenderer(
-                                                  element->getPath(), 
+                                                  element->getPath(),
                                                   stroke, fGpu, false, type,
                                                  
SkPath::ConvertToNonInverseFillType(fillType)));
             if (NULL == acp.renderer()) {
@@ -381,9 +381,9 @@ bool GrClipMaskManager::canStencilAndDrawElement(GrTexture*
target,
                 GrPathRendererChain::kStencilAndColorAntiAlias_DrawType :
                 GrPathRendererChain::kStencilAndColor_DrawType;
             SkPath::FillType fillType = element->getPath().getFillType();
-            acp->set(this->getContext()->getPathRenderer(element->getPath(), 
+            acp->set(this->getContext()->getPathRenderer(element->getPath(),
                                                    stroke, fGpu, false, type,
-                                                  
SkPath::ConvertToNonInverseFillType(fillType)));   
+                                                  
SkPath::ConvertToNonInverseFillType(fillType)));
             return NULL != acp->renderer();
         }
         default:

[reed1, 2014-02-11 17:04:52]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2014-02-11 17:05:03]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/reed@google.com/159653004/120001

[commit-bot: I haz the power, 2014-02-11 18:21:53]

Change committed as 13411