Rename right & bottom crop edges to width & height.

include/core/SkImageFilter.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 SkImageFilter_DEFINED
 #define SkImageFilter_DEFINED
 
@@ skipping 46 matching lines @@
         SkMatrix fCTM;
         SkIRect  fClipBounds;
         Cache*   fCache;
     };
 
     class CropRect {
     public:
         enum CropEdge {
             kHasLeft_CropEdge   = 0x01,
             kHasTop_CropEdge    = 0x02,
-            kHasRight_CropEdge  = 0x04,
-            kHasBottom_CropEdge = 0x08,
+            kHasWidth_CropEdge  = 0x04,
+            kHasHeight_CropEdge = 0x08,
+#ifdef SK_LEGACY_IMAGE_FILTER_CROP_RECT_EDGES
+            kHasRight_CropEdge  = kHasWidth_CropEdge,
+            kHasBottom_CropEdge = kHasHeight_CropEdge,
+#endif
             kHasAll_CropEdge    = 0x0F,
         };
         CropRect() {}
         explicit CropRect(const SkRect& rect, uint32_t flags = kHasAll_CropEdge)
             : fRect(rect), fFlags(flags) {}
         uint32_t flags() const { return fFlags; }
         const SkRect& rect() const { return fRect; }
 #ifndef SK_IGNORE_TO_STRING
         void toString(SkString* str) const;
 #endif
@@ skipping 302 matching lines @@
  */
 #define SK_IMAGEFILTER_UNFLATTEN_COMMON(localVar, expectedCount)    \
     Common localVar;                                                \
     do {                                                            \
         if (!localVar.unflatten(buffer, expectedCount)) {           \
             return NULL;                                            \
         }                                                           \
     } while (0)
 
 #endif