Compute exact bounds for SVGPathElement::getBBox()

third_party/WebKit/Source/platform/graphics/Path.cpp

 /*
  * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  *                     2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013 Intel Corporation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 97 matching lines @@
     paint.getFillPath(m_path, &strokePath, nullptr, kResScale);
 
     return strokePath;
 }
 
 bool Path::strokeContains(const FloatPoint& point, const StrokeData& strokeData) const
 {
     return strokePath(strokeData).contains(WebCoreFloatToSkScalar(point.x()), WebCoreFloatToSkScalar(point.y()));
 }
 
-FloatRect Path::boundingRect() const
+namespace {
+
+FloatRect pathBounds(const SkPath& path, Path::BoundsType boundsType)
 {
-    return m_path.getBounds();
+    SkRect bounds;
+    if (boundsType == Path::BoundsType::Conservative
+        || !TightBounds(path, &bounds)
+        || bounds.isEmpty()) // workaround for https://bugs.chromium.org/p/skia/issues/detail?id=5555
+        return path.getBounds();
+
+    DCHECK(boundsType == Path::BoundsType::Exact);

[fs, 2016/07/21 19:21:40]

(DCHECK_EQ? Or maybe that doesn't for enum class, not sure...)

[f(malita), 2016/07/22 18:40:01]

Done.

+    return bounds;
 }
 
-FloatRect Path::strokeBoundingRect(const StrokeData& strokeData) const
+} // anonymous ns
+
+// TODO(fmalita): evaluate returning exact bounds in all cases.
+FloatRect Path::boundingRect(BoundsType boundsType) const
 {
-    return strokePath(strokeData).getBounds();
+    return pathBounds(m_path, boundsType);
+}
+
+FloatRect Path::strokeBoundingRect(const StrokeData& strokeData, BoundsType boundsType) const
+{
+    return pathBounds(strokePath(strokeData), boundsType);
 }
 
 static FloatPoint* convertPathPoints(FloatPoint dst[], const SkPoint src[], int count)
 {
     for (int i = 0; i < count; i++) {
         dst[i].setX(SkScalarToFloat(src[i].fX));
         dst[i].setY(SkScalarToFloat(src[i].fY));
     }
     return dst;
 }
@@ skipping 384 matching lines @@
 
 #if ENABLE(ASSERT)
 bool ellipseIsRenderable(float startAngle, float endAngle)
 {
     return (std::abs(endAngle - startAngle) < twoPiFloat)
         || WebCoreFloatNearlyEqual(std::abs(endAngle - startAngle), twoPiFloat);
 }
 #endif
 
 } // namespace blink