diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/svg/ColorDistance.cpp | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/svg/ColorDistance.cpp')
| -rw-r--r-- | WebCore/svg/ColorDistance.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/svg/ColorDistance.cpp b/WebCore/svg/ColorDistance.cpp index c2fd1a6..bb682b9 100644 --- a/WebCore/svg/ColorDistance.cpp +++ b/WebCore/svg/ColorDistance.cpp @@ -20,6 +20,7 @@ #include "config.h" #if ENABLE(SVG) #include "ColorDistance.h" + #include "Color.h" #include <wtf/MathExtras.h> @@ -78,7 +79,7 @@ Color ColorDistance::addToColorAndClamp(const Color& color) const bool ColorDistance::isZero() const { - return (m_redDiff == 0 && m_blueDiff == 0 && m_greenDiff == 0); + return !m_redDiff && !m_blueDiff && !m_greenDiff; } float ColorDistance::distance() const |