OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 } | 56 } |
57 | 57 |
58 PassRefPtr<TransformOperation> InterpolatedTransformOperation::blend( | 58 PassRefPtr<TransformOperation> InterpolatedTransformOperation::blend( |
59 const TransformOperation* from, | 59 const TransformOperation* from, |
60 double progress, | 60 double progress, |
61 bool blendToIdentity) { | 61 bool blendToIdentity) { |
62 if (from && !from->isSameType(*this)) | 62 if (from && !from->isSameType(*this)) |
63 return this; | 63 return this; |
64 | 64 |
65 TransformOperations thisOperations; | 65 TransformOperations thisOperations; |
66 thisOperations.operations().append(this); | 66 thisOperations.operations().push_back(this); |
67 TransformOperations fromOperations; | 67 TransformOperations fromOperations; |
68 if (blendToIdentity) | 68 if (blendToIdentity) |
69 fromOperations.operations().append(IdentityTransformOperation::create()); | 69 fromOperations.operations().push_back(IdentityTransformOperation::create()); |
70 else | 70 else |
71 fromOperations.operations().append(const_cast<TransformOperation*>(from)); | 71 fromOperations.operations().push_back( |
| 72 const_cast<TransformOperation*>(from)); |
72 return InterpolatedTransformOperation::create(thisOperations, fromOperations, | 73 return InterpolatedTransformOperation::create(thisOperations, fromOperations, |
73 progress); | 74 progress); |
74 } | 75 } |
75 | 76 |
76 } // namespace blink | 77 } // namespace blink |
OLD | NEW |