| OLD | NEW | 
|    1  |    1  | 
|    2 /* |    2 /* | 
|    3  * Copyright 2010 Google Inc. |    3  * Copyright 2010 Google Inc. | 
|    4  * |    4  * | 
|    5  * Use of this source code is governed by a BSD-style license that can be |    5  * Use of this source code is governed by a BSD-style license that can be | 
|    6  * found in the LICENSE file. |    6  * found in the LICENSE file. | 
|    7  */ |    7  */ | 
|    8  |    8  | 
|    9  |    9  | 
|   10  |   10  | 
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  103  *  the pixel-config that should be used, and sets outStartOfDataToUpload to the
      ptr into |  103  *  the pixel-config that should be used, and sets outStartOfDataToUpload to the
      ptr into | 
|  104  *  the data where the actual raw data starts (skipping any header bytes). |  104  *  the data where the actual raw data starts (skipping any header bytes). | 
|  105  * |  105  * | 
|  106  *  If the compressed data is not supported, this returns kUnknown_GrPixelConfig
     , and |  106  *  If the compressed data is not supported, this returns kUnknown_GrPixelConfig
     , and | 
|  107  *  ignores outStartOfDataToUpload. |  107  *  ignores outStartOfDataToUpload. | 
|  108  */ |  108  */ | 
|  109 GrPixelConfig GrIsCompressedTextureDataSupported(GrContext* ctx, SkData* data, |  109 GrPixelConfig GrIsCompressedTextureDataSupported(GrContext* ctx, SkData* data, | 
|  110                                                  int expectedW, int expectedH, |  110                                                  int expectedW, int expectedH, | 
|  111                                                  const void** outStartOfDataToUp
     load); |  111                                                  const void** outStartOfDataToUp
     load); | 
|  112  |  112  | 
|  113 // Helper that calls GrIsImageInCache assuming bitmap is not volatile. |  | 
|  114 bool GrIsBitmapInCache(const GrContext*, const SkBitmap&, const GrTextureParams*
     ); |  | 
|  115 bool GrIsImageInCache(const GrContext* ctx, uint32_t imageID, const SkIRect& sub
     set, |  113 bool GrIsImageInCache(const GrContext* ctx, uint32_t imageID, const SkIRect& sub
     set, | 
|  116                       GrTexture* nativeTexture, const GrTextureParams*); |  114                       GrTexture* nativeTexture, const GrTextureParams*); | 
|  117  |  115  | 
|  118 GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTexture
     Params*); |  116 GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrTexture
     Params*); | 
|  119 GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, SkImageUsageTyp
     e); |  117 GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, SkImageUsageTyp
     e); | 
|  120  |  118  | 
|  121 GrTexture* GrCreateTextureForPixels(GrContext*, const GrUniqueKey& optionalKey, 
     GrSurfaceDesc, |  119 GrTexture* GrCreateTextureForPixels(GrContext*, const GrUniqueKey& optionalKey, 
     GrSurfaceDesc, | 
|  122                                     SkPixelRef* pixelRefForInvalidationNotificat
     ionOrNull, |  120                                     SkPixelRef* pixelRefForInvalidationNotificat
     ionOrNull, | 
|  123                                     const void* pixels, size_t rowBytesOrZero); |  121                                     const void* pixels, size_t rowBytesOrZero); | 
|  124  |  122  | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
|  136                                                             bool* doBicubic); |  134                                                             bool* doBicubic); | 
|  137  |  135  | 
|  138 //////////////////////////////////////////////////////////////////////////////// |  136 //////////////////////////////////////////////////////////////////////////////// | 
|  139 // Classes |  137 // Classes | 
|  140  |  138  | 
|  141 class SkGlyphCache; |  139 class SkGlyphCache; | 
|  142  |  140  | 
|  143 //////////////////////////////////////////////////////////////////////////////// |  141 //////////////////////////////////////////////////////////////////////////////// | 
|  144  |  142  | 
|  145 #endif |  143 #endif | 
| OLD | NEW |