Changeset 160009 in webkit

Timestamp:

Dec 3, 2013 9:26:36 AM (10 years ago)

Author:

rwlbuis@webkit.org

Message:

Fix build break after r160007.

• rendering/style/BasicShapes.cpp:

(WebCore::BasicShape::canBlend):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/style/BasicShapes.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-03  Rob Buis  <rob.buis@samsung.com>
+
+        Fix build break after r160007.
+
+        * rendering/style/BasicShapes.cpp:
+        (WebCore::BasicShape::canBlend):
+
 2013-12-03  Rob Buis  <rob.buis@samsung.com>
 

trunk/Source/WebCore/rendering/style/BasicShapes.cpp

@@ -66 +66 @@
     const BasicShapeEllipse* thisEllipse = static_cast<const BasicShapeEllipse*>(this);
     const BasicShapeEllipse* otherEllipse = static_cast<const BasicShapeEllipse*>(other);
-    if (!thisEllipse->radiusX().canBlend(otherEllipse->radiusX())
-        || !thisEllipse->radiusY().canBlend(otherEllipse->radiusY())
-        || !thisEllipse->centerX().canBlend(otherEllipse->centerX())
-        || !thisEllipse->centerY().canBlend(otherEllipse->centerY()))
-        return false;
+    return (thisEllipse->radiusX().canBlend(otherEllipse->radiusX())
+        && thisEllipse->radiusY().canBlend(otherEllipse->radiusY())
+        && thisEllipse->centerX().canBlend(otherEllipse->centerX())
+        && thisEllipse->centerY().canBlend(otherEllipse->centerY()));
 }