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

src/gpu/GrClipMaskManager.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrClipMaskManager_DEFINED
 #define GrClipMaskManager_DEFINED
 
@@ skipping 123 matching lines @@
     // Draws a filled clip path into the target alpha mask
     bool drawFilledPath(GrTexture* target, GrPathRenderer* pathRenderer, bool isAA);
 
     // Draws a clip element into the target alpha mask. The caller should have already setup the
     // desired blend operation.
     bool drawElement(GrTexture* target, const SkClipStack::Element* element);
 
     // Determines whether it is possible to draw the element to both the stencil buffer and the
     // alpha mask simultaneously. If so and the element is a path a compatible path renderer is
     // also returned.
-    bool canStencilAndDrawElement(GrTexture* target, const SkClipStack::Element*,
+    bool canStencilAndDrawElement(GrTexture* target, const SkClipStack::Element*, 
                                   GrPathRenderer::AutoClearPath* pr);
 
     void mergeMask(GrTexture* dstMask,
                    GrTexture* srcMask,
                    SkRegion::Op op,
                    const SkIRect& dstBound,
                    const SkIRect& srcBound);
 
     void getTemp(int width, int height, GrAutoScratchTexture* temp);
 
@@ skipping 12 matching lines @@
      * clipping.
      */
     void adjustStencilParams(GrStencilSettings* settings,
                              StencilClipMode mode,
                              int stencilBitCnt);
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif // GrClipMaskManager_DEFINED