Revert of Souped-up SkTextBlob.

tests/TextBlobTest.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 "SkPaint.h"
 #include "SkPoint.h"
 #include "SkTextBlob.h"
@@ skipping 157 matching lines @@
         unsigned glyphCount = 0;
         unsigned posCount = 0;
 
         for (unsigned i = 0; i < inCount; ++i) {
             AddRun(font, in[i].count, in[i].pos, SkPoint::Make(in[i].x, in[i].y), builder);
             glyphCount += in[i].count;
             posCount += in[i].count * in[i].pos;
         }
 
         SkAutoTUnref<const SkTextBlob> blob(builder.build());
+        REPORTER_ASSERT(reporter, SkToBool(blob->fGlyphBuffer) == (glyphCount > 0));
+        REPORTER_ASSERT(reporter, SkToBool(blob->fPosBuffer) == (posCount > 0));
+        REPORTER_ASSERT(reporter, SkToBool(blob->fRuns.get()) == (inCount > 0));
 
         SkTextBlob::RunIterator it(blob);
         for (unsigned i = 0; i < outCount; ++i) {
             REPORTER_ASSERT(reporter, !it.done());
             REPORTER_ASSERT(reporter, out[i].pos == it.positioning());
             REPORTER_ASSERT(reporter, out[i].count == it.glyphCount());
             if (SkTextBlob::kDefault_Positioning == out[i].pos) {
                 REPORTER_ASSERT(reporter, out[i].x == it.offset().x());
                 REPORTER_ASSERT(reporter, out[i].y == it.offset().y());
             } else if (SkTextBlob::kHorizontal_Positioning == out[i].pos) {
@@ skipping 46 matching lines @@
         default:
             SkFAIL("unhandled positioning value");
         }
     }
 };
 
 DEF_TEST(TextBlob_builder, reporter) {
     TextBlobTester::TestBuilder(reporter);
     TextBlobTester::TestBounds(reporter);
 }