From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 5 May 2011 14:36:32 +0100
Subject: Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
---
 WebCore/svg/ColorDistance.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'WebCore/svg/ColorDistance.cpp')

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
-- 
cgit v1.1