Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: third_party/WebKit/Source/core/style/ShadowData.cpp

Issue 1538363002: Remove config.h inclusion from third_party/WebKit/Source/core/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 reserv ed.
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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "config.h"
23 #include "core/style/ShadowData.h" 22 #include "core/style/ShadowData.h"
24 23
25 #include "platform/animation/AnimationUtilities.h" 24 #include "platform/animation/AnimationUtilities.h"
26 25
27 namespace blink { 26 namespace blink {
28 27
29 bool ShadowData::operator==(const ShadowData& o) const 28 bool ShadowData::operator==(const ShadowData& o) const
30 { 29 {
31 return m_location == o.m_location 30 return m_location == o.m_location
32 && m_blur == o.m_blur 31 && m_blur == o.m_blur
33 && m_spread == o.m_spread 32 && m_spread == o.m_spread
34 && m_style == o.m_style 33 && m_style == o.m_style
35 && m_color == o.m_color; 34 && m_color == o.m_color;
36 } 35 }
37 36
38 ShadowData ShadowData::blend(const ShadowData& from, double progress, const Colo r& currentColor) const 37 ShadowData ShadowData::blend(const ShadowData& from, double progress, const Colo r& currentColor) const
39 { 38 {
40 ASSERT(style() == from.style()); 39 ASSERT(style() == from.style());
41 return ShadowData(blink::blend(from.location(), location(), progress), 40 return ShadowData(blink::blend(from.location(), location(), progress),
42 clampTo(blink::blend(from.blur(), blur(), progress), 0.0f), 41 clampTo(blink::blend(from.blur(), blur(), progress), 0.0f),
43 blink::blend(from.spread(), spread(), progress), 42 blink::blend(from.spread(), spread(), progress),
44 style(), 43 style(),
45 blink::blend(from.color().resolve(currentColor), color().resolve(current Color), progress)); 44 blink::blend(from.color().resolve(currentColor), color().resolve(current Color), progress));
46 } 45 }
47 46
48 } // namespace blink 47 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/style/SVGComputedStyleTest.cpp ('k') | third_party/WebKit/Source/core/style/ShadowList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698