| 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 10 matching lines...) Expand all Loading... |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "sky/engine/config.h" | |
| 32 #include "sky/engine/platform/transforms/InterpolatedTransformOperation.h" | 31 #include "sky/engine/platform/transforms/InterpolatedTransformOperation.h" |
| 33 | 32 |
| 34 #include "sky/engine/platform/transforms/IdentityTransformOperation.h" | 33 #include "sky/engine/platform/transforms/IdentityTransformOperation.h" |
| 35 | 34 |
| 36 namespace blink { | 35 namespace blink { |
| 37 | 36 |
| 38 bool InterpolatedTransformOperation::operator==(const TransformOperation& o) con
st | 37 bool InterpolatedTransformOperation::operator==(const TransformOperation& o) con
st |
| 39 { | 38 { |
| 40 if (!isSameType(o)) | 39 if (!isSameType(o)) |
| 41 return false; | 40 return false; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 64 TransformOperations fromOperations; | 63 TransformOperations fromOperations; |
| 65 if (blendToIdentity) | 64 if (blendToIdentity) |
| 66 fromOperations.operations().append(IdentityTransformOperation::create())
; | 65 fromOperations.operations().append(IdentityTransformOperation::create())
; |
| 67 else | 66 else |
| 68 fromOperations.operations().append(const_cast<TransformOperation*>(from)
); | 67 fromOperations.operations().append(const_cast<TransformOperation*>(from)
); |
| 69 return InterpolatedTransformOperation::create(thisOperations, fromOperations
, progress); | 68 return InterpolatedTransformOperation::create(thisOperations, fromOperations
, progress); |
| 70 } | 69 } |
| 71 | 70 |
| 72 } // namespace blink | 71 } // namespace blink |
| 73 | 72 |
| OLD | NEW |