| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 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 #include "SkTextToPath.h" | 10 #include "SkTextToPath.h" |
| 11 #include "SkAnimateMaker.h" | 11 #include "SkAnimateMaker.h" |
| 12 #include "SkDrawPaint.h" | 12 #include "SkDrawPaint.h" |
| 13 #include "SkDrawPath.h" | 13 #include "SkDrawPath.h" |
| 14 #include "SkDrawText.h" | 14 #include "SkDrawText.h" |
| 15 #include "SkPaint.h" | 15 #include "SkPaint.h" |
| 16 | 16 |
| 17 #if SK_USE_CONDENSED_INFO == 0 | 17 #if SK_USE_CONDENSED_INFO == 0 |
| 18 | 18 |
| 19 const SkMemberInfo SkTextToPath::fInfo[] = { | 19 const SkMemberInfo SkTextToPath::fInfo[] = { |
| 20 SK_MEMBER(paint, Paint), | 20 SK_MEMBER(paint, Paint), |
| 21 SK_MEMBER(path, Path), | 21 SK_MEMBER(path, Path), |
| 22 SK_MEMBER(text, Text) | 22 SK_MEMBER(text, Text) |
| 23 }; | 23 }; |
| 24 | 24 |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 DEFINE_GET_MEMBER(SkTextToPath); | 27 DEFINE_GET_MEMBER(SkTextToPath); |
| 28 | 28 |
| 29 SkTextToPath::SkTextToPath() : paint(NULL), path(NULL), text(NULL) { | 29 SkTextToPath::SkTextToPath() : paint(nullptr), path(nullptr), text(nullptr) { |
| 30 } | 30 } |
| 31 | 31 |
| 32 bool SkTextToPath::draw(SkAnimateMaker& maker) { | 32 bool SkTextToPath::draw(SkAnimateMaker& maker) { |
| 33 path->draw(maker); | 33 path->draw(maker); |
| 34 return false; | 34 return false; |
| 35 } | 35 } |
| 36 | 36 |
| 37 void SkTextToPath::onEndElement(SkAnimateMaker& maker) { | 37 void SkTextToPath::onEndElement(SkAnimateMaker& maker) { |
| 38 if (paint == NULL || path == NULL || text == NULL) { | 38 if (paint == nullptr || path == nullptr || text == nullptr) { |
| 39 // !!! add error message here | 39 // !!! add error message here |
| 40 maker.setErrorCode(SkDisplayXMLParserError::kErrorInAttributeValue); | 40 maker.setErrorCode(SkDisplayXMLParserError::kErrorInAttributeValue); |
| 41 return; | 41 return; |
| 42 } | 42 } |
| 43 SkPaint realPaint; | 43 SkPaint realPaint; |
| 44 paint->setupPaint(&realPaint); | 44 paint->setupPaint(&realPaint); |
| 45 realPaint.getTextPath(text->getText(), text->getSize(), text->x, | 45 realPaint.getTextPath(text->getText(), text->getSize(), text->x, |
| 46 text->y, &path->getPath()); | 46 text->y, &path->getPath()); |
| 47 } | 47 } |
| OLD | NEW |