Remove the call to getFontMetrics from SkBBoxRecord

src/core/SkPictureRecord.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPictureRecord_DEFINED
 #define SkPictureRecord_DEFINED
 
@@ skipping 147 matching lines @@
     }
     void addScalar(SkScalar scalar) {
         fWriter.writeScalar(scalar);
     }
 
     void addBitmap(const SkBitmap& bitmap);
     void addMatrix(const SkMatrix& matrix);
     void addMatrixPtr(const SkMatrix* matrix);
     const SkFlatData* addPaint(const SkPaint& paint) { return this->addPaintPtr(&paint); }
     const SkFlatData* addPaintPtr(const SkPaint* paint);
+    void addFlatPaint(const SkFlatData* flatPaint);

[caryclark, 2013/08/20 20:11:34]

looks like the surrounding calls are alphabetized -- this one might as well be
too

[sglez, 2013/08/21 16:09:35]

I would prefer for the sake of clarity to have all the add*Paint* functions
together, see addIRect below. 
If you think the other way is better, I will change it.

     void addPath(const SkPath& path);
     void addPicture(SkPicture& picture);
     void addPoint(const SkPoint& point);
     void addPoints(const SkPoint pts[], int count);
     void addRect(const SkRect& rect);
     void addRectPtr(const SkRect* rect);
     void addIRect(const SkIRect& rect);
     void addIRectPtr(const SkIRect* rect);
     void addRRect(const SkRRect&);
     void addRegion(const SkRegion& region);
@@ skipping 31 matching lines @@
     void validatePaths() const;
     void validateRegions() const;
 #else
 public:
     void validate(uint32_t initialOffset, uint32_t size) const {
         SkASSERT(fWriter.size() == initialOffset + size);
     }
 #endif
 
 protected:
+    // Will return a cached version when possible.
+    const SkFlatData* getFlatPaintData(const SkPaint& paint);
+    /**
+     * SkBBoxRecord::drawPosTextH gets a flat paint and uses it,
+     * then it calls this, using the extra parameter, to avoid duplication.
+     */
+    void drawPosTextHImpl(const void* text, size_t byteLength,
+                          const SkScalar xpos[], SkScalar constY,
+                          const SkPaint& paint, const SkFlatData* flatPaintData);
 
     // These are set to NULL in our constructor, but may be changed by
     // subclasses, in which case they will be SkSafeUnref'd in our destructor.
     SkBBoxHierarchy* fBoundingHierarchy;
     SkPictureStateTree* fStateTree;
 
     // Allocated in the constructor and managed by this class.
     SkBitmapHeap* fBitmapHeap;
 
 private:
@@ skipping 12 matching lines @@
     uint32_t fRecordFlags;
     int fInitialSaveCount;
 
     friend class SkPicturePlayback;
     friend class SkPictureTester; // for unit testing
 
     typedef SkCanvas INHERITED;
 };
 
 #endif