Updated PDFViewer drawImageRect() overrides

R=reed@google.com

Review URL: https://codereview.chromium.org/1240573008

2 files changed, 36 insertions, 39 deletions

diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h
index 420a673e24..452c58c41d 100644
--- a/experimental/PdfViewer/SkNulCanvas.h
+++ b/experimental/PdfViewer/SkNulCanvas.h
@@ -82,10 +82,10 @@ protected:
     void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
                           const SkRect& dst,
                           const SkPaint* paint,
-                          DrawBitmapRectFlags flags) override {}
+                          SK_VIRTUAL_CONSTRAINT_TYPE) override {}
     void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override {}
-    void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
-                         const SkPaint*) override{}
+    void onDrawImageRect(const SkImage*, const SkRect*, const SkRect&, const SkPaint*
+                         SRC_RECT_CONSTRAINT_PARAM(constraint)) override {}
     void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
                           const SkRect& dst, const SkPaint* paint = NULL) override {}
     void onDrawSprite(const SkBitmap& bitmap, int left, int top,
diff --git a/experimental/PdfViewer/SkTrackDevice.h b/experimental/PdfViewer/SkTrackDevice.h
index 853b3f9cf1..dfa20d1c21 100644
--- a/experimental/PdfViewer/SkTrackDevice.h
+++ b/experimental/PdfViewer/SkTrackDevice.h
@@ -48,109 +48,106 @@ protected:
     }
 #endif
 
-    virtual void drawPaint(const SkDraw& dummy1, const SkPaint& paint) {
+    void drawPaint(const SkDraw& dummy1, const SkPaint& paint) override {
         before();
         INHERITED::drawPaint(dummy1, paint);
         after();
     }
 
-    virtual void drawPoints(const SkDraw& dummy1, SkCanvas::PointMode mode, size_t count,
-                            const SkPoint dummy2[], const SkPaint& paint) {
+    void drawPoints(const SkDraw& dummy1, SkCanvas::PointMode mode, size_t count,
+                    const SkPoint dummy2[], const SkPaint& paint) override {
         before();
         INHERITED::drawPoints(dummy1, mode, count, dummy2, paint);
         after();
     }
 
-    virtual void drawRect(const SkDraw& dummy1, const SkRect& r,
-                          const SkPaint& paint) {
+    void drawRect(const SkDraw& dummy1, const SkRect& r, const SkPaint& paint) override {
         before();
         INHERITED::drawRect(dummy1, r, paint);
         after();
     }
 
 
-    virtual void drawOval(const SkDraw& dummy1, const SkRect& oval,
-                          const SkPaint& paint) {
+    void drawOval(const SkDraw& dummy1, const SkRect& oval, const SkPaint& paint) override {
         before();
         INHERITED::drawOval(dummy1, oval, paint);
         after();
     }
 
-    virtual void drawRRect(const SkDraw& dummy1, const SkRRect& rr,
-                           const SkPaint& paint) {
+    void drawRRect(const SkDraw& dummy1, const SkRRect& rr, const SkPaint& paint) override {
         before();
         INHERITED::drawRRect(dummy1, rr, paint);
         after();
     }
 
-    virtual void drawPath(const SkDraw& dummy1, const SkPath& path,
-                          const SkPaint& paint,
-                          const SkMatrix* prePathMatrix = NULL,
-                          bool pathIsMutable = false) {
+    void drawPath(const SkDraw& dummy1, const SkPath& path,
+                  const SkPaint& paint,
+                  const SkMatrix* prePathMatrix = NULL,
+                  bool pathIsMutable = false) override {
         before();
         INHERITED::drawPath(dummy1, path, paint, prePathMatrix, pathIsMutable);
         after();
     }
 
-    virtual void drawBitmap(const SkDraw& dummy1, const SkBitmap& bitmap,
-                            const SkMatrix& matrix, const SkPaint& paint) {
+    void drawBitmap(const SkDraw& dummy1, const SkBitmap& bitmap,
+                    const SkMatrix& matrix, const SkPaint& paint) override {
         before();
         INHERITED::drawBitmap(dummy1, bitmap, matrix, paint);
         after();
     }
 
-    virtual void drawSprite(const SkDraw& dummy1, const SkBitmap& bitmap,
-                            int x, int y, const SkPaint& paint) {
+    void drawSprite(const SkDraw& dummy1, const SkBitmap& bitmap,
+                    int x, int y, const SkPaint& paint) override {
         before();
         INHERITED::drawSprite(dummy1, bitmap, x, y, paint);
         after();
     }
 
-    virtual void drawBitmapRect(const SkDraw& dummy1, const SkBitmap& dummy2,
-                                const SkRect* srcOrNull, const SkRect& dst,
-                                const SkPaint& paint,
-                                SkCanvas::DrawBitmapRectFlags flags) {
+    void drawBitmapRect(const SkDraw& dummy1, const SkBitmap& dummy2,
+                        const SkRect* srcOrNull, const SkRect& dst,
+                        const SkPaint& paint,
+                        SK_VIRTUAL_CONSTRAINT_TYPE flags) override {
         before();
         INHERITED::drawBitmapRect(dummy1, dummy2, srcOrNull, dst, paint, flags);
         after();
     }
 
-    virtual void drawText(const SkDraw& dummy1, const void* text, size_t len,
-                          SkScalar x, SkScalar y, const SkPaint& paint) {
+    void drawText(const SkDraw& dummy1, const void* text, size_t len,
+                  SkScalar x, SkScalar y, const SkPaint& paint) override {
         before();
         INHERITED::drawText(dummy1, text, len, x, y, paint);
         after();
     }
 
-    virtual void drawPosText(const SkDraw& dummy1, const void* text, size_t len,
-                             const SkScalar pos[], int scalarsPerPos,
-                             const SkPoint& offset, const SkPaint& paint) {
+    void drawPosText(const SkDraw& dummy1, const void* text, size_t len,
+                     const SkScalar pos[], int scalarsPerPos,
+                     const SkPoint& offset, const SkPaint& paint) override {
         before();
         INHERITED::drawPosText(dummy1, text, len, pos, scalarsPerPos, offset, paint);
         after();
     }
 
-    virtual void drawTextOnPath(const SkDraw& dummy1, const void* text, size_t len,
-                                const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint)  {
+    void drawTextOnPath(const SkDraw& dummy1, const void* text, size_t len,
+                        const SkPath& path, const SkMatrix* matrix,
+                        const SkPaint& paint) override {
         before();
         INHERITED::drawTextOnPath(dummy1, text, len, path, matrix, paint);
         after();
     }
 
-    virtual void drawVertices(const SkDraw& dummy1, SkCanvas::VertexMode dummy2, int vertexCount,
-                              const SkPoint verts[], const SkPoint texs[],
-                              const SkColor colors[], SkXfermode* xmode,
-                              const uint16_t indices[], int indexCount,
-                              const SkPaint& paint) {
+    void drawVertices(const SkDraw& dummy1, SkCanvas::VertexMode dummy2, int vertexCount,
+                      const SkPoint verts[], const SkPoint texs[],
+                      const SkColor colors[], SkXfermode* xmode,
+                      const uint16_t indices[], int indexCount,
+                      const SkPaint& paint) override {
         before();
         INHERITED::drawVertices(dummy1, dummy2, vertexCount,verts, texs,colors, xmode, indices,
                                 indexCount, paint);
         after();
     }
 
-    virtual void drawDevice(const SkDraw& dummy1, SkBaseDevice* dummy2, int x, int y,
-                            const SkPaint& dummy3) {
+    void drawDevice(const SkDraw& dummy1, SkBaseDevice* dummy2, int x, int y,
+                    const SkPaint& dummy3) override {
         before();
         INHERITED::drawDevice(dummy1, dummy2, x, y, dummy3);
         after();