| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2010 Google Inc. | 3 * Copyright 2010 Google Inc. |
| 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 | 10 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 return false; | 46 return false; |
| 47 } | 47 } |
| 48 | 48 |
| 49 if (!fCoordChangeMatrixSet) { | 49 if (!fCoordChangeMatrixSet) { |
| 50 return true; | 50 return true; |
| 51 } | 51 } |
| 52 | 52 |
| 53 return fCoordChangeMatrix == other.fCoordChangeMatrix; | 53 return fCoordChangeMatrix == other.fCoordChangeMatrix; |
| 54 } | 54 } |
| 55 | 55 |
| 56 bool operator !=(const GrEffectStage& s) const { return !(*this == s); } | 56 bool operator!= (const GrEffectStage& s) const { return !(*this == s); } |
| 57 | 57 |
| 58 GrEffectStage& operator =(const GrEffectStage& other) { | 58 GrEffectStage& operator= (const GrEffectStage& other) { |
| 59 GrSafeAssign(fEffectRef, other.fEffectRef); | 59 GrSafeAssign(fEffectRef, other.fEffectRef); |
| 60 fCoordChangeMatrixSet = other.fCoordChangeMatrixSet; | 60 fCoordChangeMatrixSet = other.fCoordChangeMatrixSet; |
| 61 if (NULL != fEffectRef && fCoordChangeMatrixSet) { | 61 if (NULL != fEffectRef && fCoordChangeMatrixSet) { |
| 62 fCoordChangeMatrix = other.fCoordChangeMatrix; | 62 fCoordChangeMatrix = other.fCoordChangeMatrix; |
| 63 } | 63 } |
| 64 return *this; | 64 return *this; |
| 65 } | 65 } |
| 66 | 66 |
| 67 /** | 67 /** |
| 68 * This is called when the coordinate system in which the geometry is specif
ied will change. | 68 * This is called when the coordinate system in which the geometry is specif
ied will change. |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 private: | 247 private: |
| 248 bool fCoordChangeMatrixSet; | 248 bool fCoordChangeMatrixSet; |
| 249 SkMatrix fCoordChangeMatrix; | 249 SkMatrix fCoordChangeMatrix; |
| 250 const GrEffectRef* fEffectRef; | 250 const GrEffectRef* fEffectRef; |
| 251 int fVertexAttribIndices[2]; | 251 int fVertexAttribIndices[2]; |
| 252 | 252 |
| 253 GR_DEBUGCODE(mutable int fSavedCoordChangeCnt;) | 253 GR_DEBUGCODE(mutable int fSavedCoordChangeCnt;) |
| 254 }; | 254 }; |
| 255 | 255 |
| 256 #endif | 256 #endif |
| OLD | NEW |