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 #include "SkPaint.h" | 9 #include "SkPaint.h" |
10 #include "SkAnnotation.h" | 10 #include "SkAnnotation.h" |
(...skipping 2290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2301 | 2301 |
2302 SkPathEffect* pathEffect = this->getPathEffect(); | 2302 SkPathEffect* pathEffect = this->getPathEffect(); |
2303 if (NULL != pathEffect) { | 2303 if (NULL != pathEffect) { |
2304 str->append("<dt>PathEffect:</dt><dd>"); | 2304 str->append("<dt>PathEffect:</dt><dd>"); |
2305 str->append("</dd>"); | 2305 str->append("</dd>"); |
2306 } | 2306 } |
2307 | 2307 |
2308 SkShader* shader = this->getShader(); | 2308 SkShader* shader = this->getShader(); |
2309 if (NULL != shader) { | 2309 if (NULL != shader) { |
2310 str->append("<dt>Shader:</dt><dd>"); | 2310 str->append("<dt>Shader:</dt><dd>"); |
2311 SkDEVCODE(shader->toString(str);) | 2311 shader->toString(str); |
2312 str->append("</dd>"); | 2312 str->append("</dd>"); |
2313 } | 2313 } |
2314 | 2314 |
2315 SkXfermode* xfer = this->getXfermode(); | 2315 SkXfermode* xfer = this->getXfermode(); |
2316 if (NULL != xfer) { | 2316 if (NULL != xfer) { |
2317 str->append("<dt>Xfermode:</dt><dd>"); | 2317 str->append("<dt>Xfermode:</dt><dd>"); |
2318 SkDEVCODE(xfer->toString(str);) | 2318 xfer->toString(str); |
2319 str->append("</dd>"); | 2319 str->append("</dd>"); |
2320 } | 2320 } |
2321 | 2321 |
2322 SkMaskFilter* maskFilter = this->getMaskFilter(); | 2322 SkMaskFilter* maskFilter = this->getMaskFilter(); |
2323 if (NULL != maskFilter) { | 2323 if (NULL != maskFilter) { |
2324 str->append("<dt>MaskFilter:</dt><dd>"); | 2324 str->append("<dt>MaskFilter:</dt><dd>"); |
2325 SkDEVCODE(maskFilter->toString(str);) | 2325 maskFilter->toString(str); |
2326 str->append("</dd>"); | 2326 str->append("</dd>"); |
2327 } | 2327 } |
2328 | 2328 |
2329 SkColorFilter* colorFilter = this->getColorFilter(); | 2329 SkColorFilter* colorFilter = this->getColorFilter(); |
2330 if (NULL != colorFilter) { | 2330 if (NULL != colorFilter) { |
2331 str->append("<dt>ColorFilter:</dt><dd>"); | 2331 str->append("<dt>ColorFilter:</dt><dd>"); |
| 2332 colorFilter->toString(str); |
2332 str->append("</dd>"); | 2333 str->append("</dd>"); |
2333 } | 2334 } |
2334 | 2335 |
2335 SkRasterizer* rasterizer = this->getRasterizer(); | 2336 SkRasterizer* rasterizer = this->getRasterizer(); |
2336 if (NULL != rasterizer) { | 2337 if (NULL != rasterizer) { |
2337 str->append("<dt>Rasterizer:</dt><dd>"); | 2338 str->append("<dt>Rasterizer:</dt><dd>"); |
2338 str->append("</dd>"); | 2339 str->append("</dd>"); |
2339 } | 2340 } |
2340 | 2341 |
2341 SkDrawLooper* looper = this->getLooper(); | 2342 SkDrawLooper* looper = this->getLooper(); |
2342 if (NULL != looper) { | 2343 if (NULL != looper) { |
2343 str->append("<dt>DrawLooper:</dt><dd>"); | 2344 str->append("<dt>DrawLooper:</dt><dd>"); |
2344 SkDEVCODE(looper->toString(str);) | 2345 looper->toString(str); |
2345 str->append("</dd>"); | 2346 str->append("</dd>"); |
2346 } | 2347 } |
2347 | 2348 |
2348 SkImageFilter* imageFilter = this->getImageFilter(); | 2349 SkImageFilter* imageFilter = this->getImageFilter(); |
2349 if (NULL != imageFilter) { | 2350 if (NULL != imageFilter) { |
2350 str->append("<dt>ImageFilter:</dt><dd>"); | 2351 str->append("<dt>ImageFilter:</dt><dd>"); |
2351 str->append("</dd>"); | 2352 str->append("</dd>"); |
2352 } | 2353 } |
2353 | 2354 |
2354 SkAnnotation* annotation = this->getAnnotation(); | 2355 SkAnnotation* annotation = this->getAnnotation(); |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2592 if (firstTime) { | 2593 if (firstTime) { |
2593 *dst = r; | 2594 *dst = r; |
2594 } else { | 2595 } else { |
2595 dst->join(r); | 2596 dst->join(r); |
2596 } | 2597 } |
2597 } else { | 2598 } else { |
2598 break; | 2599 break; |
2599 } | 2600 } |
2600 } | 2601 } |
2601 } | 2602 } |
OLD | NEW |