make commonBitmap un-virtual. That was a leftover from previous subclassing
authorreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Thu, 15 Mar 2012 12:10:47 +0000 (12:10 +0000)
committerreed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Thu, 15 Mar 2012 12:10:47 +0000 (12:10 +0000)
I think.

git-svn-id: http://skia.googlecode.com/svn/trunk@3394 2bbb7eff-a529-9590-31e7-b0007b416f81

include/core/SkCanvas.h

index 1b9f055..e5cd8ae 100644 (file)
@@ -942,13 +942,13 @@ protected:
     virtual SkCanvas* canvasForDrawIter();
 
     // all of the drawBitmap variants call this guy
-    virtual void commonDrawBitmap(const SkBitmap&, const SkIRect*,
-                                  const SkMatrix&, const SkPaint& paint);
+    void commonDrawBitmap(const SkBitmap&, const SkIRect*, const SkMatrix&,
+                          const SkPaint& paint);
 
     // Clip rectangle bounds. Called internally by saveLayer.
     // returns false if the entire rectangle is entirely clipped out
     bool clipRectBounds(const SkRect* bounds, SaveFlags flags,
-                         SkIRect* intersection);
+                        SkIRect* intersection);
 
 private:
     class MCRec;