| 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, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights |
| 4 * reserved. |
| 4 * | 5 * |
| 5 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 9 * | 10 * |
| 10 * This library is distributed in the hope that it will be useful, | 11 * This library is distributed in the hope that it will be useful, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 14 * Library General Public License for more details. |
| (...skipping 21 matching lines...) Expand all Loading... |
| 35 const Color& currentColor) const { | 36 const Color& currentColor) const { |
| 36 ASSERT(style() == from.style()); | 37 ASSERT(style() == from.style()); |
| 37 return ShadowData(blink::blend(from.location(), location(), progress), | 38 return ShadowData(blink::blend(from.location(), location(), progress), |
| 38 clampTo(blink::blend(from.blur(), blur(), progress), 0.0f), | 39 clampTo(blink::blend(from.blur(), blur(), progress), 0.0f), |
| 39 blink::blend(from.spread(), spread(), progress), style(), | 40 blink::blend(from.spread(), spread(), progress), style(), |
| 40 blink::blend(from.color().resolve(currentColor), | 41 blink::blend(from.color().resolve(currentColor), |
| 41 color().resolve(currentColor), progress)); | 42 color().resolve(currentColor), progress)); |
| 42 } | 43 } |
| 43 | 44 |
| 44 } // namespace blink | 45 } // namespace blink |
| OLD | NEW |