| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2014 Google Inc. | 2  * Copyright 2014 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #include "sk_canvas.h" |  | 
| 9 #include "sk_data.h" |  | 
| 10 #include "sk_image.h" |  | 
| 11 #include "sk_paint.h" |  | 
| 12 #include "sk_path.h" |  | 
| 13 #include "sk_surface.h" |  | 
| 14 #include "sk_types_priv.h" |  | 
| 15 |  | 
| 16 #include "SkCanvas.h" | 8 #include "SkCanvas.h" | 
| 17 #include "SkData.h" | 9 #include "SkData.h" | 
| 18 #include "SkImage.h" | 10 #include "SkImage.h" | 
| 19 #include "SkMaskFilter.h" | 11 #include "SkMaskFilter.h" | 
| 20 #include "SkMatrix.h" | 12 #include "SkMatrix.h" | 
| 21 #include "SkPaint.h" | 13 #include "SkPaint.h" | 
| 22 #include "SkPath.h" | 14 #include "SkPath.h" | 
| 23 #include "SkPictureRecorder.h" | 15 #include "SkPictureRecorder.h" | 
| 24 #include "SkSurface.h" | 16 #include "SkSurface.h" | 
| 25 | 17 | 
|  | 18 #include "sk_canvas.h" | 
|  | 19 #include "sk_data.h" | 
|  | 20 #include "sk_image.h" | 
|  | 21 #include "sk_paint.h" | 
|  | 22 #include "sk_path.h" | 
|  | 23 #include "sk_surface.h" | 
|  | 24 #include "sk_types_priv.h" | 
|  | 25 | 
| 26 const struct { | 26 const struct { | 
| 27     sk_colortype_t  fC; | 27     sk_colortype_t  fC; | 
| 28     SkColorType     fSK; | 28     SkColorType     fSK; | 
| 29 } gColorTypeMap[] = { | 29 } gColorTypeMap[] = { | 
| 30     { UNKNOWN_SK_COLORTYPE,     kUnknown_SkColorType    }, | 30     { UNKNOWN_SK_COLORTYPE,     kUnknown_SkColorType    }, | 
| 31     { RGBA_8888_SK_COLORTYPE,   kRGBA_8888_SkColorType  }, | 31     { RGBA_8888_SK_COLORTYPE,   kRGBA_8888_SkColorType  }, | 
| 32     { BGRA_8888_SK_COLORTYPE,   kBGRA_8888_SkColorType  }, | 32     { BGRA_8888_SK_COLORTYPE,   kBGRA_8888_SkColorType  }, | 
| 33     { ALPHA_8_SK_COLORTYPE,     kAlpha_8_SkColorType    }, | 33     { ALPHA_8_SK_COLORTYPE,     kAlpha_8_SkColorType    }, | 
| 34 }; | 34 }; | 
| 35 | 35 | 
| (...skipping 663 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 699 | 699 | 
| 700 size_t sk_data_get_size(const sk_data_t* cdata) { | 700 size_t sk_data_get_size(const sk_data_t* cdata) { | 
| 701     return AsData(cdata)->size(); | 701     return AsData(cdata)->size(); | 
| 702 } | 702 } | 
| 703 | 703 | 
| 704 const void* sk_data_get_data(const sk_data_t* cdata) { | 704 const void* sk_data_get_data(const sk_data_t* cdata) { | 
| 705     return AsData(cdata)->data(); | 705     return AsData(cdata)->data(); | 
| 706 } | 706 } | 
| 707 | 707 | 
| 708 ////////////////////////////////////////////////////////////////////////////////
     /////////// | 708 ////////////////////////////////////////////////////////////////////////////////
     /////////// | 
| OLD | NEW | 
|---|