OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2006 The Android Open Source Project | 2 * Copyright 2006 The Android Open Source Project |
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 "SkPaint.h" | 8 #include "SkPaint.h" |
9 #include "SkAnnotation.h" | 9 #include "SkAnnotation.h" |
10 #include "SkAutoKern.h" | 10 #include "SkAutoKern.h" |
(...skipping 2095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2106 str->appendScalar(this->getTextScaleX()); | 2106 str->appendScalar(this->getTextScaleX()); |
2107 str->append("</dd>"); | 2107 str->append("</dd>"); |
2108 | 2108 |
2109 str->append("<dt>TextSkewX:</dt><dd>"); | 2109 str->append("<dt>TextSkewX:</dt><dd>"); |
2110 str->appendScalar(this->getTextSkewX()); | 2110 str->appendScalar(this->getTextSkewX()); |
2111 str->append("</dd>"); | 2111 str->append("</dd>"); |
2112 | 2112 |
2113 SkPathEffect* pathEffect = this->getPathEffect(); | 2113 SkPathEffect* pathEffect = this->getPathEffect(); |
2114 if (pathEffect) { | 2114 if (pathEffect) { |
2115 str->append("<dt>PathEffect:</dt><dd>"); | 2115 str->append("<dt>PathEffect:</dt><dd>"); |
| 2116 pathEffect->toString(str); |
2116 str->append("</dd>"); | 2117 str->append("</dd>"); |
2117 } | 2118 } |
2118 | 2119 |
2119 SkShader* shader = this->getShader(); | 2120 SkShader* shader = this->getShader(); |
2120 if (shader) { | 2121 if (shader) { |
2121 str->append("<dt>Shader:</dt><dd>"); | 2122 str->append("<dt>Shader:</dt><dd>"); |
2122 shader->toString(str); | 2123 shader->toString(str); |
2123 str->append("</dd>"); | 2124 str->append("</dd>"); |
2124 } | 2125 } |
2125 | 2126 |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2383 } | 2384 } |
2384 | 2385 |
2385 uint32_t SkPaint::getHash() const { | 2386 uint32_t SkPaint::getHash() const { |
2386 // We're going to hash 10 pointers and 7 32-bit values, finishing up with fB
itfields, | 2387 // We're going to hash 10 pointers and 7 32-bit values, finishing up with fB
itfields, |
2387 // so fBitfields should be 10 pointers and 6 32-bit values from the start. | 2388 // so fBitfields should be 10 pointers and 6 32-bit values from the start. |
2388 SK_COMPILE_ASSERT(offsetof(SkPaint, fBitfields) == 10 * sizeof(void*) + 6 *
sizeof(uint32_t), | 2389 SK_COMPILE_ASSERT(offsetof(SkPaint, fBitfields) == 10 * sizeof(void*) + 6 *
sizeof(uint32_t), |
2389 SkPaint_notPackedTightly); | 2390 SkPaint_notPackedTightly); |
2390 return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(this), | 2391 return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(this), |
2391 offsetof(SkPaint, fBitfields) + sizeof(fBitfields
)); | 2392 offsetof(SkPaint, fBitfields) + sizeof(fBitfields
)); |
2392 } | 2393 } |
OLD | NEW |