Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 22 matching lines...) Expand all Loading... | |
| 33 | 33 |
| 34 if (blendToIdentity) | 34 if (blendToIdentity) |
| 35 return SkewTransformOperation::create(WebCore::blend(m_angleX, 0.0, prog ress), WebCore::blend(m_angleY, 0.0, progress), m_type); | 35 return SkewTransformOperation::create(WebCore::blend(m_angleX, 0.0, prog ress), WebCore::blend(m_angleY, 0.0, progress), m_type); |
| 36 | 36 |
| 37 const SkewTransformOperation* fromOp = static_cast<const SkewTransformOperat ion*>(from); | 37 const SkewTransformOperation* fromOp = static_cast<const SkewTransformOperat ion*>(from); |
| 38 double fromAngleX = fromOp ? fromOp->m_angleX : 0; | 38 double fromAngleX = fromOp ? fromOp->m_angleX : 0; |
| 39 double fromAngleY = fromOp ? fromOp->m_angleY : 0; | 39 double fromAngleY = fromOp ? fromOp->m_angleY : 0; |
| 40 return SkewTransformOperation::create(WebCore::blend(fromAngleX, m_angleX, p rogress), WebCore::blend(fromAngleY, m_angleY, progress), m_type); | 40 return SkewTransformOperation::create(WebCore::blend(fromAngleX, m_angleX, p rogress), WebCore::blend(fromAngleY, m_angleY, progress), m_type); |
| 41 } | 41 } |
| 42 | 42 |
| 43 bool SkewTransformOperation::canBlendWith(const TransformOperation& other) const | |
| 44 { | |
| 45 return(isSameType(other)); | |
|
Ian Vollick
2014/06/18 15:38:06
no braces around return type, pls.
awoloszyn
2014/06/18 18:31:08
Done.
| |
| 46 } | |
| 47 | |
| 43 } // namespace WebCore | 48 } // namespace WebCore |
| OLD | NEW |