Revert of make drawText calls non-virtual, to ease SkFont and TextBlob

src/core/SkBBoxRecord.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBBoxRecord.h"
 
@@ skipping 66 matching lines @@
     }
 }
 
 void SkBBoxRecord::clear(SkColor color) {
     SkISize size = this->getDeviceSize();
     SkRect bbox = {0, 0, SkIntToScalar(size.width()), SkIntToScalar(size.height())};
     this->handleBBox(bbox);
     INHERITED::clear(color);
 }
 
-void SkBBoxRecord::onDrawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
-                              const SkPaint& paint) {
+void SkBBoxRecord::drawText(const void* text, size_t byteLength, SkScalar x, SkScalar y,
+                            const SkPaint& paint) {
     SkRect bbox;
     paint.measureText(text, byteLength, &bbox);
     SkPaint::FontMetrics metrics;
     paint.getFontMetrics(&metrics);
 
     // Vertical and aligned text need to be offset
     if (paint.isVerticalText()) {
         SkScalar h = bbox.fBottom - bbox.fTop;
         if (paint.getTextAlign() == SkPaint::kCenter_Align) {
             bbox.fTop    -= h / 2;
@@ skipping 22 matching lines @@
     // incorrect on most platforms (too small in Linux, never even set in Windows).
     SkScalar pad = (metrics.fBottom - metrics.fTop) / 2;
     bbox.fLeft  -= pad;
     bbox.fRight += pad;
 
     bbox.fLeft += x;
     bbox.fRight += x;
     bbox.fTop += y;
     bbox.fBottom += y;
     if (this->transformBounds(bbox, &paint)) {
-        INHERITED::onDrawText(text, byteLength, x, y, paint);
+        INHERITED::drawText(text, byteLength, x, y, paint);
     }
 }
 
 void SkBBoxRecord::drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
                               const SkPaint* paint) {
     SkRect bbox = {left, top, left + bitmap.width(), top + bitmap.height()};
     if (this->transformBounds(bbox, paint)) {
         INHERITED::drawBitmap(bitmap, left, top, paint);
     }
 }
@@ skipping 16 matching lines @@
     }
 }
 
 void SkBBoxRecord::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
                                   const SkRect& dst, const SkPaint* paint) {
     if (this->transformBounds(dst, paint)) {
         INHERITED::drawBitmapNine(bitmap, center, dst, paint);
     }
 }
 
-void SkBBoxRecord::onDrawPosText(const void* text, size_t byteLength, const SkPoint pos[],
-                                 const SkPaint& paint) {
+void SkBBoxRecord::drawPosText(const void* text, size_t byteLength,
+                               const SkPoint pos[], const SkPaint& paint) {
     SkRect bbox;
     bbox.set(pos, paint.countText(text, byteLength));
     SkPaint::FontMetrics metrics;
     paint.getFontMetrics(&metrics);
     bbox.fTop += metrics.fTop;
     bbox.fBottom += metrics.fBottom;
 
     // pad on left and right by half of max vertical glyph extents
     SkScalar pad = (metrics.fTop - metrics.fBottom) / 2;
     bbox.fLeft += pad;
     bbox.fRight -= pad;
 
     if (this->transformBounds(bbox, &paint)) {
-        INHERITED::onDrawPosText(text, byteLength, pos, paint);
+        INHERITED::drawPosText(text, byteLength, pos, paint);
     }
 }
 
-void SkBBoxRecord::onDrawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
-                                  SkScalar constY, const SkPaint& paint) {
+void SkBBoxRecord::drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[],
+                                SkScalar constY, const SkPaint& paint) {
     size_t numChars = paint.countText(text, byteLength);
     if (numChars == 0) {
         return;
     }
 
     const SkFlatData* flatPaintData = this->getFlatPaintData(paint);
     WriteTopBot(paint, *flatPaintData);
 
     SkScalar top = flatPaintData->topBot()[0];
     SkScalar bottom = flatPaintData->topBot()[1];
@@ skipping 29 matching lines @@
 }
 
 void SkBBoxRecord::drawSprite(const SkBitmap& bitmap, int left, int top,
                               const SkPaint* paint) {
     SkRect bbox;
     bbox.set(SkIRect::MakeXYWH(left, top, bitmap.width(), bitmap.height()));
     this->handleBBox(bbox); // directly call handleBBox, matrix is ignored
     INHERITED::drawSprite(bitmap, left, top, paint);
 }
 
-void SkBBoxRecord::onDrawTextOnPath(const void* text, size_t byteLength, const SkPath& path,
-                                    const SkMatrix* matrix, const SkPaint& paint) {
+void SkBBoxRecord::drawTextOnPath(const void* text, size_t byteLength,
+                                  const SkPath& path, const SkMatrix* matrix,
+                                  const SkPaint& paint) {
     SkRect bbox = path.getBounds();
     SkPaint::FontMetrics metrics;
     paint.getFontMetrics(&metrics);
 
     // pad out all sides by the max glyph height above baseline
     SkScalar pad = metrics.fTop;
     bbox.fLeft += pad;
     bbox.fRight -= pad;
     bbox.fTop += pad;
     bbox.fBottom -= pad;
 
     if (this->transformBounds(bbox, &paint)) {
-        INHERITED::onDrawTextOnPath(text, byteLength, path, matrix, paint);
+        INHERITED::drawTextOnPath(text, byteLength, path, matrix, paint);
     }
 }
 
 void SkBBoxRecord::drawVertices(VertexMode mode, int vertexCount,
                                 const SkPoint vertices[], const SkPoint texs[],
                                 const SkColor colors[], SkXfermode* xfer,
                                 const uint16_t indices[], int indexCount,
                                 const SkPaint& paint) {
     SkRect bbox;
     bbox.set(vertices, vertexCount);
@@ skipping 29 matching lines @@
     }
 
     if (!outBounds.isEmpty() && !this->quickReject(outBounds)) {
         this->getTotalMatrix().mapRect(&outBounds);
         this->handleBBox(outBounds);
         return true;
     }
 
     return false;
 }