| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 { | 43 { |
| 44 return adoptRef(new InterpolatedTransformOperation(from, to, progress)); | 44 return adoptRef(new InterpolatedTransformOperation(from, to, progress)); |
| 45 } | 45 } |
| 46 | 46 |
| 47 virtual bool canBlendWith(const TransformOperation& other) const | 47 virtual bool canBlendWith(const TransformOperation& other) const |
| 48 { | 48 { |
| 49 return isSameType(other); | 49 return isSameType(other); |
| 50 } | 50 } |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 virtual bool isIdentity() const OVERRIDE { return false; } | |
| 54 | |
| 55 virtual OperationType type() const OVERRIDE { return Interpolated; } | 53 virtual OperationType type() const OVERRIDE { return Interpolated; } |
| 56 | 54 |
| 57 virtual bool operator==(const TransformOperation&) const OVERRIDE; | 55 virtual bool operator==(const TransformOperation&) const OVERRIDE; |
| 58 virtual void apply(TransformationMatrix&, const FloatSize& borderBoxSize) co
nst OVERRIDE; | 56 virtual void apply(TransformationMatrix&, const FloatSize& borderBoxSize) co
nst OVERRIDE; |
| 59 | 57 |
| 60 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from,
double progress, bool blendToIdentity = false) OVERRIDE; | 58 virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from,
double progress, bool blendToIdentity = false) OVERRIDE; |
| 61 | 59 |
| 62 virtual bool dependsOnBoxSize() const OVERRIDE | 60 virtual bool dependsOnBoxSize() const OVERRIDE |
| 63 { | 61 { |
| 64 return from.dependsOnBoxSize() || to.dependsOnBoxSize(); | 62 return from.dependsOnBoxSize() || to.dependsOnBoxSize(); |
| 65 } | 63 } |
| 66 | 64 |
| 67 InterpolatedTransformOperation(const TransformOperations& from, const Transf
ormOperations& to, double progress) | 65 InterpolatedTransformOperation(const TransformOperations& from, const Transf
ormOperations& to, double progress) |
| 68 : from(from) | 66 : from(from) |
| 69 , to(to) | 67 , to(to) |
| 70 , progress(progress) | 68 , progress(progress) |
| 71 { } | 69 { } |
| 72 | 70 |
| 73 const TransformOperations from; | 71 const TransformOperations from; |
| 74 const TransformOperations to; | 72 const TransformOperations to; |
| 75 double progress; | 73 double progress; |
| 76 }; | 74 }; |
| 77 | 75 |
| 78 } // namespace blink | 76 } // namespace blink |
| 79 | 77 |
| 80 #endif // InterpolatedTransformOperation_h | 78 #endif // InterpolatedTransformOperation_h |
| 81 | 79 |
| OLD | NEW |