| 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 "SkDisplayAdd.h" | 10 #include "SkDisplayAdd.h" |
| 11 #include "SkAnimateMaker.h" | 11 #include "SkAnimateMaker.h" |
| 12 #include "SkDisplayApply.h" | 12 #include "SkDisplayApply.h" |
| 13 #include "SkDisplayList.h" | 13 #include "SkDisplayList.h" |
| 14 #include "SkDrawable.h" | 14 #include "SkADrawable.h" |
| 15 #include "SkDrawGroup.h" | 15 #include "SkDrawGroup.h" |
| 16 | 16 |
| 17 #if SK_USE_CONDENSED_INFO == 0 | 17 #if SK_USE_CONDENSED_INFO == 0 |
| 18 | 18 |
| 19 const SkMemberInfo SkAdd::fInfo[] = { | 19 const SkMemberInfo SkAdd::fInfo[] = { |
| 20 SK_MEMBER(mode, AddMode), | 20 SK_MEMBER(mode, AddMode), |
| 21 SK_MEMBER(offset, Int), | 21 SK_MEMBER(offset, Int), |
| 22 SK_MEMBER(use, Drawable), | 22 SK_MEMBER(use, Drawable), |
| 23 SK_MEMBER(where, Drawable) | 23 SK_MEMBER(where, Drawable) |
| 24 }; | 24 }; |
| 25 | 25 |
| 26 #endif | 26 #endif |
| 27 | 27 |
| 28 // start here; | 28 // start here; |
| 29 // add onEndElement to turn where string into f_Where | 29 // add onEndElement to turn where string into f_Where |
| 30 // probably need new SkAnimateMaker::resolve flavor that takes | 30 // probably need new SkAnimateMaker::resolve flavor that takes |
| 31 // where="id", where="event-target" or not-specified | 31 // where="id", where="event-target" or not-specified |
| 32 // offset="#" (implements before, after, and index if no 'where') | 32 // offset="#" (implements before, after, and index if no 'where') |
| 33 | 33 |
| 34 DEFINE_GET_MEMBER(SkAdd); | 34 DEFINE_GET_MEMBER(SkAdd); |
| 35 | 35 |
| 36 SkAdd::SkAdd() : mode(kMode_indirect), | 36 SkAdd::SkAdd() : mode(kMode_indirect), |
| 37 offset(SK_MaxS32), use(NULL), where(NULL) { | 37 offset(SK_MaxS32), use(NULL), where(NULL) { |
| 38 } | 38 } |
| 39 | 39 |
| 40 SkDisplayable* SkAdd::deepCopy(SkAnimateMaker* maker) { | 40 SkDisplayable* SkAdd::deepCopy(SkAnimateMaker* maker) { |
| 41 SkDrawable* saveUse = use; | 41 SkADrawable* saveUse = use; |
| 42 SkDrawable* saveWhere = where; | 42 SkADrawable* saveWhere = where; |
| 43 use = NULL; | 43 use = NULL; |
| 44 where = NULL; | 44 where = NULL; |
| 45 SkAdd* copy = (SkAdd*) INHERITED::deepCopy(maker); | 45 SkAdd* copy = (SkAdd*) INHERITED::deepCopy(maker); |
| 46 copy->use = use = saveUse; | 46 copy->use = use = saveUse; |
| 47 copy->where = where = saveWhere; | 47 copy->where = where = saveWhere; |
| 48 return copy; | 48 return copy; |
| 49 } | 49 } |
| 50 | 50 |
| 51 bool SkAdd::draw(SkAnimateMaker& maker) { | 51 bool SkAdd::draw(SkAnimateMaker& maker) { |
| 52 SkASSERT(use); | 52 SkASSERT(use); |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 | 236 |
| 237 #if SK_USE_CONDENSED_INFO == 0 | 237 #if SK_USE_CONDENSED_INFO == 0 |
| 238 | 238 |
| 239 const SkMemberInfo SkReplace::fInfo[] = { | 239 const SkMemberInfo SkReplace::fInfo[] = { |
| 240 SK_MEMBER_INHERITED | 240 SK_MEMBER_INHERITED |
| 241 }; | 241 }; |
| 242 | 242 |
| 243 #endif | 243 #endif |
| 244 | 244 |
| 245 DEFINE_GET_MEMBER(SkReplace); | 245 DEFINE_GET_MEMBER(SkReplace); |
| OLD | NEW |