Title: [160009] trunk/Source/WebCore
- Revision
- 160009
- Author
- rwlb...@webkit.org
- Date
- 2013-12-03 09:26:36 -0800 (Tue, 03 Dec 2013)
Log Message
Fix build break after r160007.
* rendering/style/BasicShapes.cpp:
(WebCore::BasicShape::canBlend):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160008 => 160009)
--- trunk/Source/WebCore/ChangeLog 2013-12-03 17:25:54 UTC (rev 160008)
+++ trunk/Source/WebCore/ChangeLog 2013-12-03 17:26:36 UTC (rev 160009)
@@ -1,5 +1,12 @@
2013-12-03 Rob Buis <rob.b...@samsung.com>
+ Fix build break after r160007.
+
+ * rendering/style/BasicShapes.cpp:
+ (WebCore::BasicShape::canBlend):
+
+2013-12-03 Rob Buis <rob.b...@samsung.com>
+
[css shapes] layout for new ellipse syntax
https://bugs.webkit.org/show_bug.cgi?id=124621
Modified: trunk/Source/WebCore/rendering/style/BasicShapes.cpp (160008 => 160009)
--- trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2013-12-03 17:25:54 UTC (rev 160008)
+++ trunk/Source/WebCore/rendering/style/BasicShapes.cpp 2013-12-03 17:26:36 UTC (rev 160009)
@@ -65,11 +65,10 @@
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()));
}
void BasicShapeRectangle::path(Path& path, const FloatRect& boundingBox)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
