| 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 "SkDisplayType.h" | 10 #include "SkDisplayType.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "SkDrawLine.h" | 35 #include "SkDrawLine.h" |
| 36 #include "SkDrawMatrix.h" | 36 #include "SkDrawMatrix.h" |
| 37 #include "SkDrawOval.h" | 37 #include "SkDrawOval.h" |
| 38 #include "SkDrawPaint.h" | 38 #include "SkDrawPaint.h" |
| 39 #include "SkDrawPath.h" | 39 #include "SkDrawPath.h" |
| 40 #include "SkDrawPoint.h" | 40 #include "SkDrawPoint.h" |
| 41 #include "SkDrawSaveLayer.h" | 41 #include "SkDrawSaveLayer.h" |
| 42 #include "SkDrawText.h" | 42 #include "SkDrawText.h" |
| 43 #include "SkDrawTextBox.h" | 43 #include "SkDrawTextBox.h" |
| 44 #include "SkDrawTo.h" | 44 #include "SkDrawTo.h" |
| 45 #include "SkDrawTransparentShader.h" | |
| 46 #include "SkDump.h" | 45 #include "SkDump.h" |
| 47 #include "SkExtras.h" | 46 #include "SkExtras.h" |
| 48 #include "SkHitClear.h" | 47 #include "SkHitClear.h" |
| 49 #include "SkHitTest.h" | 48 #include "SkHitTest.h" |
| 50 #include "SkMatrixParts.h" | 49 #include "SkMatrixParts.h" |
| 51 #include "SkPathParts.h" | 50 #include "SkPathParts.h" |
| 52 #include "SkPostParts.h" | 51 #include "SkPostParts.h" |
| 53 #include "SkSnapshot.h" | 52 #include "SkSnapshot.h" |
| 54 #include "SkTextOnPath.h" | 53 #include "SkTextOnPath.h" |
| 55 #include "SkTextToPath.h" | 54 #include "SkTextToPath.h" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 CASE_DISPLAY_NEW(String); | 188 CASE_DISPLAY_NEW(String); |
| 190 // style | 189 // style |
| 191 CASE_NEW(Text); | 190 CASE_NEW(Text); |
| 192 CASE_DRAW_NEW(TextBox); | 191 CASE_DRAW_NEW(TextBox); |
| 193 // textboxalign | 192 // textboxalign |
| 194 // textboxmode | 193 // textboxmode |
| 195 CASE_NEW(TextOnPath); | 194 CASE_NEW(TextOnPath); |
| 196 CASE_NEW(TextToPath); | 195 CASE_NEW(TextToPath); |
| 197 CASE_DEBUG_RETURN_NIL(TileMode); | 196 CASE_DEBUG_RETURN_NIL(TileMode); |
| 198 CASE_NEW(Translate); | 197 CASE_NEW(Translate); |
| 199 CASE_DRAW_NEW(TransparentShader); | |
| 200 CASE_DRAW_NEW(Typeface); | 198 CASE_DRAW_NEW(Typeface); |
| 201 CASE_DEBUG_RETURN_NIL(Xfermode); | 199 CASE_DEBUG_RETURN_NIL(Xfermode); |
| 202 default: | 200 default: |
| 203 SkExtras** end = maker->fExtras.end(); | 201 SkExtras** end = maker->fExtras.end(); |
| 204 for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < end; e
xtraPtr++) { | 202 for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < end; e
xtraPtr++) { |
| 205 if ((result = (*extraPtr)->createInstance(type)) != NULL) | 203 if ((result = (*extraPtr)->createInstance(type)) != NULL) |
| 206 return result; | 204 return result; |
| 207 } | 205 } |
| 208 SkASSERT(0); | 206 SkASSERT(0); |
| 209 } | 207 } |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 CASE_GET_DISPLAY_INFO(String); | 342 CASE_GET_DISPLAY_INFO(String); |
| 345 // style | 343 // style |
| 346 CASE_GET_INFO(Text); | 344 CASE_GET_INFO(Text); |
| 347 CASE_GET_DRAW_INFO(TextBox); | 345 CASE_GET_DRAW_INFO(TextBox); |
| 348 // textboxalign | 346 // textboxalign |
| 349 // textboxmode | 347 // textboxmode |
| 350 CASE_GET_INFO(TextOnPath); | 348 CASE_GET_INFO(TextOnPath); |
| 351 CASE_GET_INFO(TextToPath); | 349 CASE_GET_INFO(TextToPath); |
| 352 // tilemode | 350 // tilemode |
| 353 CASE_GET_INFO(Translate); | 351 CASE_GET_INFO(Translate); |
| 354 // transparentshader | |
| 355 CASE_GET_DRAW_INFO(Typeface); | 352 CASE_GET_DRAW_INFO(Typeface); |
| 356 // xfermode | 353 // xfermode |
| 357 // knumberoftypes | 354 // knumberoftypes |
| 358 default: | 355 default: |
| 359 if (maker) { | 356 if (maker) { |
| 360 SkExtras** end = maker->fExtras.end(); | 357 SkExtras** end = maker->fExtras.end(); |
| 361 for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < en
d; extraPtr++) { | 358 for (SkExtras** extraPtr = maker->fExtras.begin(); extraPtr < en
d; extraPtr++) { |
| 362 if ((info = (*extraPtr)->getMembers(type, infoCountPtr)) !=
NULL) | 359 if ((info = (*extraPtr)->getMembers(type, infoCountPtr)) !=
NULL) |
| 363 return info; | 360 return info; |
| 364 } | 361 } |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 { "string", SkType_String INIT_BOOL_FIELDS }, | 508 { "string", SkType_String INIT_BOOL_FIELDS }, |
| 512 // style | 509 // style |
| 513 { "text", SkType_Text INIT_BOOL_FIELDS }, | 510 { "text", SkType_Text INIT_BOOL_FIELDS }, |
| 514 { "textBox", SkType_TextBox INIT_BOOL_FIELDS }, | 511 { "textBox", SkType_TextBox INIT_BOOL_FIELDS }, |
| 515 // textboxalign | 512 // textboxalign |
| 516 // textboxmode | 513 // textboxmode |
| 517 { "textOnPath", SkType_TextOnPath INIT_BOOL_FIELDS }, | 514 { "textOnPath", SkType_TextOnPath INIT_BOOL_FIELDS }, |
| 518 { "textToPath", SkType_TextToPath INIT_BOOL_FIELDS }, | 515 { "textToPath", SkType_TextToPath INIT_BOOL_FIELDS }, |
| 519 // tilemode | 516 // tilemode |
| 520 { "translate", SkType_Translate INIT_BOOL_FIELDS }, | 517 { "translate", SkType_Translate INIT_BOOL_FIELDS }, |
| 521 DRAW_NAME("transparentShader", SkType_TransparentShader), | |
| 522 { "typeface", SkType_Typeface INIT_BOOL_FIELDS } | 518 { "typeface", SkType_Typeface INIT_BOOL_FIELDS } |
| 523 // xfermode | 519 // xfermode |
| 524 // knumberoftypes | 520 // knumberoftypes |
| 525 }; | 521 }; |
| 526 | 522 |
| 527 const int kTypeNamesSize = SK_ARRAY_COUNT(gTypeNames); | 523 const int kTypeNamesSize = SK_ARRAY_COUNT(gTypeNames); |
| 528 | 524 |
| 529 SkDisplayTypes SkDisplayType::Find(SkAnimateMaker* maker, const SkMemberInfo* ma
tch) { | 525 SkDisplayTypes SkDisplayType::Find(SkAnimateMaker* maker, const SkMemberInfo* ma
tch) { |
| 530 for (int index = 0; index < kTypeNamesSize; index++) { | 526 for (int index = 0; index < kTypeNamesSize; index++) { |
| 531 SkDisplayTypes type = gTypeNames[index].fType; | 527 SkDisplayTypes type = gTypeNames[index].fType; |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 672 case SkType_Shader: | 668 case SkType_Shader: |
| 673 case SkType_Skew: | 669 case SkType_Skew: |
| 674 case SkType_3D_Camera: | 670 case SkType_3D_Camera: |
| 675 case SkType_3D_Patch: | 671 case SkType_3D_Patch: |
| 676 case SkType_Snapshot: | 672 case SkType_Snapshot: |
| 677 case SkType_Text: | 673 case SkType_Text: |
| 678 case SkType_TextBox: | 674 case SkType_TextBox: |
| 679 case SkType_TextOnPath: | 675 case SkType_TextOnPath: |
| 680 case SkType_TextToPath: | 676 case SkType_TextToPath: |
| 681 case SkType_Translate: | 677 case SkType_Translate: |
| 682 case SkType_TransparentShader: | |
| 683 return true; | 678 return true; |
| 684 default: // to avoid warnings | 679 default: // to avoid warnings |
| 685 break; | 680 break; |
| 686 } | 681 } |
| 687 return false; | 682 return false; |
| 688 } | 683 } |
| 689 | 684 |
| 690 bool SkDisplayType::IsStruct(SkAnimateMaker* , SkDisplayTypes type) { | 685 bool SkDisplayType::IsStruct(SkAnimateMaker* , SkDisplayTypes type) { |
| 691 switch (type) { | 686 switch (type) { |
| 692 case SkType_Point: | 687 case SkType_Point: |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 757 continue; | 752 continue; |
| 758 SkASSERT(strcmp(info[inner].fName, info[inner + 1].fName) < 0); | 753 SkASSERT(strcmp(info[inner].fName, info[inner + 1].fName) < 0); |
| 759 } | 754 } |
| 760 #endif | 755 #endif |
| 761 } | 756 } |
| 762 #if defined SK_DEBUG || defined SK_BUILD_CONDENSED | 757 #if defined SK_DEBUG || defined SK_BUILD_CONDENSED |
| 763 BuildCondensedInfo(maker); | 758 BuildCondensedInfo(maker); |
| 764 #endif | 759 #endif |
| 765 } | 760 } |
| 766 #endif | 761 #endif |
| OLD | NEW |