OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 | 47 |
48 if (blendToIdentity) | 48 if (blendToIdentity) |
49 std::swap(fromT, toT); | 49 std::swap(fromT, toT); |
50 | 50 |
51 toT.blend(fromT, progress); | 51 toT.blend(fromT, progress); |
52 return Matrix3DTransformOperation::create(toT); | 52 return Matrix3DTransformOperation::create(toT); |
53 } | 53 } |
54 | 54 |
55 PassRefPtr<TransformOperation> Matrix3DTransformOperation::zoom(double factor) { | 55 PassRefPtr<TransformOperation> Matrix3DTransformOperation::zoom(double factor) { |
56 TransformationMatrix result = m_matrix; | 56 TransformationMatrix result = m_matrix; |
| 57 result.setM14(result.m14() / factor); |
| 58 result.setM24(result.m24() / factor); |
| 59 result.setM34(result.m34() / factor); |
57 result.setM41(result.m41() * factor); | 60 result.setM41(result.m41() * factor); |
58 result.setM42(result.m42() * factor); | 61 result.setM42(result.m42() * factor); |
| 62 result.setM43(result.m43() * factor); |
59 return create(result); | 63 return create(result); |
60 } | 64 } |
61 | 65 |
62 } // namespace blink | 66 } // namespace blink |
OLD | NEW |