Merge third_party/skia/src from https://chromium.googlesource.com/external/skia/src.git at d8fd8c7718508a11547505b00b1dbb324d461767

This commit was generated by merge_from_chromium.py.

Change-Id: Ic22099cdcd61a332e1eb91b60b20eed2e6261ca3

1 files changed, 5 insertions, 1 deletions

diff --git a/core/SkScan_Path.cpp b/core/SkScan_Path.cpp
index 66e95076..b32d68e7 100644
--- a/core/SkScan_Path.cpp
+++ b/core/SkScan_Path.cpp
@@ -602,7 +602,11 @@ void SkScan::FillPath(const SkPath& path, const SkRegion& origClip,
         // don't reference "origClip" any more, just use clipPtr
 
     SkIRect ir;
-    path.getBounds().round(&ir);
+    // We deliberately call dround() instead of round(), since we can't afford to generate a
+    // bounds that is tighter than the corresponding SkEdges. The edge code basically converts
+    // the floats to fixed, and then "rounds". If we called round() instead of dround() here,
+    // we could generate the wrong ir for values like 0.4999997.
+    path.getBounds().dround(&ir);
     if (ir.isEmpty()) {
         if (path.isInverseFillType()) {
             blitter->blitRegion(*clipPtr);