Fix straggling SK_VIRTUAL_CONSTRAINT_TYPEs

src/utils/android/SkAndroidSDKCanvas.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAndroidSDKCanvas.h"
 
 #include "SkColorFilter.h"
@@ skipping 125 matching lines @@
                                                SkScalar left,
                                                SkScalar top,
                                                const SkPaint* paint) {
     FILTER_PTR(paint);
     fProxyTarget->drawBitmap(bitmap, left, top, filteredPaint);
 }
 void SkAndroidSDKCanvas::onDrawBitmapRect(const SkBitmap& bitmap,
                                                    const SkRect* src,
                                                    const SkRect& dst,
                                                    const SkPaint* paint,
-                                                   SK_VIRTUAL_CONSTRAINT_TYPE constraint) {
+                                                   SkCanvas::SrcRectConstraint constraint) {
     FILTER_PTR(paint);
-    fProxyTarget->drawBitmapRect(bitmap, src, dst, filteredPaint,
-                                 (SrcRectConstraint)constraint);
+    fProxyTarget->drawBitmapRect(bitmap, src, dst, filteredPaint, constraint);
 }
 void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap,
                                                    const SkIRect& center,
                                                    const SkRect& dst,
                                                    const SkPaint* paint) {
     FILTER_PTR(paint);
     fProxyTarget->drawBitmapNine(bitmap, center, dst, filteredPaint);
 }
 void SkAndroidSDKCanvas::onDrawSprite(const SkBitmap& bitmap,
                                                int left,
@@ skipping 181 matching lines @@
     fProxyTarget->clipPath(path, op, style);
 }
 
 void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) {
     fProxyTarget->clipRegion(region, op);
 }
 
 void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); }