Revert of Use SkPaint::getFontBounds() for text bounding boxes in pictures.

tests/RecordDrawTest.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Test.h"
 #include "RecordTestUtils.h"
 
@@ skipping 173 matching lines @@
     const SkScalar xpos[] = { 10, 20 };
     recorder.drawPosTextH(text, bytes, xpos, 30, SkPaint());
 
     const SkPoint pos[] = { {40, 50}, {60, 70} };
     recorder.drawPosText(text, bytes, pos, SkPaint());
 
     TestBBH bbh;
     SkRecordFillBounds(SkRect::MakeWH(SkIntToScalar(W), SkIntToScalar(H)), record, &bbh);
     REPORTER_ASSERT(r, bbh.fEntries.count() == 2);
 
-    // Font metrics are somewhat platform dependent, so these assertions may need to be adjusted.
-    // But these particular numbers are left over from the days when we used to wildly overestimate
-    // font metrics, so these assertions should actually be pretty safe.
-    REPORTER_ASSERT(r, SkRect::MakeLTRB(0, 0,140, 60).contains(bbh.fEntries[0].bounds));
-    REPORTER_ASSERT(r, SkRect::MakeLTRB(0,20,180,100).contains(bbh.fEntries[1].bounds));
+    // We can make these next assertions confidently because SkRecordFillBounds
+    // builds its bounds by overestimating font metrics in a platform-independent way.
+    // If that changes, these tests will need to be more flexible.
+    REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[0].bounds, SkRect::MakeLTRB(0,  0, 140, 60)));
+    REPORTER_ASSERT(r, sloppy_rect_eq(bbh.fEntries[1].bounds, SkRect::MakeLTRB(0, 20, 180, 100)));
 }
 
 // Base test to ensure start/stop range is respected
 DEF_TEST(RecordDraw_PartialStartStop, r) {
     static const int kWidth = 10, kHeight = 10;
 
     SkRect r1 = { 0, 0, kWidth,   kHeight };
     SkRect r2 = { 0, 0, kWidth,   kHeight/2 };
     SkRect r3 = { 0, 0, kWidth/2, kHeight };
     SkPaint p;
@@ skipping 115 matching lines @@
 
     {
         SkRecord record;
         SkRecorder recorder(&record, 10, 10);
         recorder.drawImageRect(image, 0, SkRect::MakeWH(10, 10));
         SkRecordDraw(record, &canvas, NULL, NULL, 0, NULL, 0);
     }
     REPORTER_ASSERT(r, canvas.fDrawImageRectCalled);
 
 }