Rename right & bottom crop edges to width & height.

src/core/SkImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageFilter.h"
 
 #include "SkBitmap.h"
@@ skipping 32 matching lines @@
     if (fFlags & CropRect::kHasLeft_CropEdge) {
         str->appendf("%.2f, ", fRect.fLeft);
     } else {
         str->appendf("X, ");
     }
     if (fFlags & CropRect::kHasTop_CropEdge) {
         str->appendf("%.2f, ", fRect.fTop);
     } else {
         str->appendf("X, ");
     }
-    if (fFlags & CropRect::kHasRight_CropEdge) {
-        str->appendf("%.2f, ", fRect.fRight);
+    if (fFlags & CropRect::kHasWidth_CropEdge) {
+        str->appendf("%.2f, ", fRect.width());
     } else {
         str->appendf("X, ");
     }
-    if (fFlags & CropRect::kHasBottom_CropEdge) {
-        str->appendf("%.2f", fRect.fBottom);
+    if (fFlags & CropRect::kHasHeight_CropEdge) {
+        str->appendf("%.2f", fRect.height());
     } else {
         str->appendf("X");
     }
     str->appendf(") ");
 }
 #endif
 
 bool SkImageFilter::CropRect::applyTo(const SkIRect& imageBounds, const Context& ctx,
                                       SkIRect* cropped) const {
     *cropped = imageBounds;
     if (fFlags) {
         SkRect devCropR;
         ctx.ctm().mapRect(&devCropR, fRect);
         const SkIRect devICropR = devCropR.roundOut();
 
         // Compute the left/top first, in case we have to read them to compute right/bottom
         if (fFlags & kHasLeft_CropEdge) {
             cropped->fLeft = devICropR.fLeft;
         }
         if (fFlags & kHasTop_CropEdge) {
             cropped->fTop = devICropR.fTop;
         }
-        if (fFlags & kHasRight_CropEdge) {
+        if (fFlags & kHasWidth_CropEdge) {
             cropped->fRight = cropped->fLeft + devICropR.width();
         }
-        if (fFlags & kHasBottom_CropEdge) {
+        if (fFlags & kHasHeight_CropEdge) {
             cropped->fBottom = cropped->fTop + devICropR.height();
         }
     }
     return cropped->intersect(ctx.clipBounds());
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 static int32_t next_image_filter_unique_id() {
     static int32_t gImageFilterUniqueID;
@@ skipping 483 matching lines @@
     }
     return dev;
 }
 
 bool SkImageFilter::Proxy::filterImage(const SkImageFilter* filter, const SkBitmap& src,
                                        const SkImageFilter::Context& ctx,
                                        SkBitmap* result, SkIPoint* offset) {
     return fDevice->filterImage(filter, src, ctx, result, offset);
 }