Roll src/third_party/skia b5fae93:c13bc57 (manual roll)

skia/ext/pixel_ref_utils.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "skia/ext/pixel_ref_utils.h"
 
 #include <algorithm>
 
 #include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 204 matching lines @@
     bounds.fRight += x;
     bounds.fTop += y;
     bounds.fBottom += y;
 
     GatherPixelRefDevice::drawRect(draw, bounds, paint);
   }
   virtual void drawPosText(const SkDraw& draw,
                            const void* text,
                            size_t len,
                            const SkScalar pos[],
-                           SkScalar const_y,
                            int scalars_per_pos,
+                           const SkPoint& offset,
                            const SkPaint& paint) SK_OVERRIDE {
     SkBitmap bitmap;
     if (!GetBitmapFromPaint(paint, &bitmap))
       return;
 
     if (len == 0)
       return;
 
     // Similar to SkDraw asserts.
     SkASSERT(scalars_per_pos == 1 || scalars_per_pos == 2);
 
-    SkPoint min_point;
-    SkPoint max_point;
-    if (scalars_per_pos == 1) {
-      min_point.set(pos[0], const_y);
-      max_point.set(pos[0], const_y);
-    } else if (scalars_per_pos == 2) {
-      min_point.set(pos[0], const_y + pos[1]);
-      max_point.set(pos[0], const_y + pos[1]);
-    }
+    SkPoint min_point = SkPoint::Make(offset.x() + pos[0],
+                                      offset.y() + (2 == scalars_per_pos ? pos[1] : 0));
+    SkPoint max_point = min_point;
 
     for (size_t i = 0; i < len; ++i) {
-      SkScalar x = pos[i * scalars_per_pos];
-      SkScalar y = const_y;
-      if (scalars_per_pos == 2)
-        y += pos[i * scalars_per_pos + 1];
+      SkScalar x = offset.x() + pos[i * scalars_per_pos];
+      SkScalar y = offset.y() + (2 == scalars_per_pos ? pos[i * scalars_per_pos + 1] : 0);
 
       min_point.set(std::min(x, min_point.x()), std::min(y, min_point.y()));
       max_point.set(std::max(x, max_point.x()), std::max(y, max_point.y()));
     }
 
     SkRect bounds = SkRect::MakeLTRB(
         min_point.x(), min_point.y(), max_point.x(), max_point.y());
 
     // Math is borrowed from SkBBoxRecord
     SkPaint::FontMetrics metrics;
@@ skipping 103 matching lines @@
   GatherPixelRefDevice device(empty_bitmap, &pixel_ref_set);
   SkNoSaveLayerCanvas canvas(&device);
 
   canvas.clipRect(SkRect::MakeWH(picture->width(), picture->height()),
                   SkRegion::kIntersect_Op,
                   false);
   canvas.drawPicture(picture);
 }
 
 }  // namespace skia