| OLD | NEW | 
|    1  |    1  | 
|    2 /* |    2 /* | 
|    3  * Copyright 2011 Google Inc. |    3  * Copyright 2011 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 #ifndef GrTexture_DEFINED |    9 #ifndef GrTexture_DEFINED | 
|   10 #define GrTexture_DEFINED |   10 #define GrTexture_DEFINED | 
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  112  |  112  | 
|  113     virtual ~GrTexture(); |  113     virtual ~GrTexture(); | 
|  114  |  114  | 
|  115     // GrResource overrides |  115     // GrResource overrides | 
|  116     virtual void onRelease() SK_OVERRIDE; |  116     virtual void onRelease() SK_OVERRIDE; | 
|  117     virtual void onAbandon() SK_OVERRIDE; |  117     virtual void onAbandon() SK_OVERRIDE; | 
|  118  |  118  | 
|  119     void validateDesc() const; |  119     void validateDesc() const; | 
|  120  |  120  | 
|  121 private: |  121 private: | 
 |  122     void abandonReleaseCommon(); | 
|  122     virtual void internal_dispose() const SK_OVERRIDE; |  123     virtual void internal_dispose() const SK_OVERRIDE; | 
|  123  |  124  | 
|  124     // these two shift a fixed-point value into normalized coordinates |  125     // these two shift a fixed-point value into normalized coordinates | 
|  125     // for this texture if the texture is power of two sized. |  126     // for this texture if the texture is power of two sized. | 
|  126     int                 fShiftFixedX; |  127     int                 fShiftFixedX; | 
|  127     int                 fShiftFixedY; |  128     int                 fShiftFixedY; | 
|  128  |  129  | 
|  129     typedef GrSurface INHERITED; |  130     typedef GrSurface INHERITED; | 
|  130 }; |  131 }; | 
|  131  |  132  | 
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  212         fTexture.reset(SkSafeRef(texture)); |  213         fTexture.reset(SkSafeRef(texture)); | 
|  213         return texture; |  214         return texture; | 
|  214     } |  215     } | 
|  215  |  216  | 
|  216 private: |  217 private: | 
|  217     SkAutoTUnref<GrTexture> fTexture; |  218     SkAutoTUnref<GrTexture> fTexture; | 
|  218     SkIPoint                fOffset; |  219     SkIPoint                fOffset; | 
|  219 }; |  220 }; | 
|  220  |  221  | 
|  221 #endif |  222 #endif | 
| OLD | NEW |