| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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 #include "SkObjectParser.h" | 9 #include "SkObjectParser.h" |
| 10 #include "SkData.h" | 10 #include "SkData.h" |
| 11 #include "SkFontDescriptor.h" | 11 #include "SkFontDescriptor.h" |
| 12 #include "SkPath.h" |
| 12 #include "SkRRect.h" | 13 #include "SkRRect.h" |
| 13 #include "SkShader.h" | 14 #include "SkShader.h" |
| 14 #include "SkStream.h" | 15 #include "SkStream.h" |
| 15 #include "SkStringUtils.h" | 16 #include "SkStringUtils.h" |
| 16 #include "SkTypeface.h" | 17 #include "SkTypeface.h" |
| 17 #include "SkUtils.h" | 18 #include "SkUtils.h" |
| 18 | 19 |
| 19 /* TODO(chudy): Replace all std::strings with char */ | 20 /* TODO(chudy): Replace all std::strings with char */ |
| 20 | 21 |
| 21 SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) { | 22 SkString* SkObjectParser::BitmapToString(const SkBitmap& bitmap) { |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 } | 360 } |
| 360 break; | 361 break; |
| 361 } | 362 } |
| 362 default: | 363 default: |
| 363 decodedText->append("Unknown text encoding."); | 364 decodedText->append("Unknown text encoding."); |
| 364 break; | 365 break; |
| 365 } | 366 } |
| 366 | 367 |
| 367 return decodedText; | 368 return decodedText; |
| 368 } | 369 } |
| OLD | NEW |