| 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 "SkDrawColor.h" | 10 #include "SkDrawColor.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 } | 126 } |
| 127 | 127 |
| 128 bool SkDrawColor::add() { | 128 bool SkDrawColor::add() { |
| 129 if (fPaint->color != NULL) | 129 if (fPaint->color != NULL) |
| 130 return true; // error (probably color in paint as attribute as well) | 130 return true; // error (probably color in paint as attribute as well) |
| 131 fPaint->color = this; | 131 fPaint->color = this; |
| 132 fPaint->fOwnsColor = true; | 132 fPaint->fOwnsColor = true; |
| 133 return false; | 133 return false; |
| 134 } | 134 } |
| 135 | 135 |
| 136 SkDisplayable* SkDrawColor::deepCopy(SkAnimateMaker* maker) { | 136 SkDisplayable* SkDrawColor::deepCopy(SkAnimateMaker*) { |
| 137 SkDrawColor* copy = new SkDrawColor(); | 137 SkDrawColor* copy = new SkDrawColor(); |
| 138 copy->color = color; | 138 copy->color = color; |
| 139 copy->fHue = fHue; | 139 copy->fHue = fHue; |
| 140 copy->fSaturation = fSaturation; | 140 copy->fSaturation = fSaturation; |
| 141 copy->fValue = fValue; | 141 copy->fValue = fValue; |
| 142 copy->fDirty = fDirty; | 142 copy->fDirty = fDirty; |
| 143 return copy; | 143 return copy; |
| 144 } | 144 } |
| 145 | 145 |
| 146 void SkDrawColor::dirty(){ | 146 void SkDrawColor::dirty(){ |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 result = RGB_to_HSV(color, kGetValue); | 199 result = RGB_to_HSV(color, kGetValue); |
| 200 break; | 200 break; |
| 201 default: | 201 default: |
| 202 SkASSERT(0); | 202 SkASSERT(0); |
| 203 return false; | 203 return false; |
| 204 } | 204 } |
| 205 value->fOperand.fScalar = result; | 205 value->fOperand.fScalar = result; |
| 206 return true; | 206 return true; |
| 207 } | 207 } |
| 208 | 208 |
| 209 void SkDrawColor::onEndElement(SkAnimateMaker& maker){ | 209 void SkDrawColor::onEndElement(SkAnimateMaker&) { |
| 210 fDirty = true; | 210 fDirty = true; |
| 211 } | 211 } |
| 212 | 212 |
| 213 bool SkDrawColor::setParent(SkDisplayable* parent) { | 213 bool SkDrawColor::setParent(SkDisplayable* parent) { |
| 214 SkASSERT(parent != NULL); | 214 SkASSERT(parent != NULL); |
| 215 if (parent->getType() == SkType_DrawLinearGradient || parent->getType() == S
kType_DrawRadialGradient) | 215 if (parent->getType() == SkType_DrawLinearGradient || parent->getType() == S
kType_DrawRadialGradient) |
| 216 return false; | 216 return false; |
| 217 if (parent->isPaint() == false) | 217 if (parent->isPaint() == false) |
| 218 return true; | 218 return true; |
| 219 fPaint = (SkDrawPaint*) parent; | 219 fPaint = (SkDrawPaint*) parent; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 case SK_PROPERTY(value): | 260 case SK_PROPERTY(value): |
| 261 fValue = scalar;//RGB_to_HSV(color, kGetValue); | 261 fValue = scalar;//RGB_to_HSV(color, kGetValue); |
| 262 fDirty = true; | 262 fDirty = true; |
| 263 break; | 263 break; |
| 264 default: | 264 default: |
| 265 SkASSERT(0); | 265 SkASSERT(0); |
| 266 return false; | 266 return false; |
| 267 } | 267 } |
| 268 return true; | 268 return true; |
| 269 } | 269 } |
| OLD | NEW |