diff options
author | 2015-06-08 10:22:22 -0700 | |
---|---|---|
committer | 2015-06-08 10:22:22 -0700 | |
commit | 7aefe0321122d92393d30ddc44fb76e4744f34bf (patch) | |
tree | 58996cbf56f33ec3654b44f78eff3ea09163c575 /include/core/SkBitmap.h | |
parent | cca9b3ac908cf3e9a0c5774a5ffd118d8429e08a (diff) |
Revert "Revert of move erase into SkPixmap (patchset #1 id:1 of https://codereview.chromium.org/1161033005/)"
This reverts commit cca9b3ac908cf3e9a0c5774a5ffd118d8429e08a.
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1153473012
Diffstat (limited to 'include/core/SkBitmap.h')
-rw-r--r-- | include/core/SkBitmap.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index c070203d04..b13b6f7451 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -473,10 +473,7 @@ public: * of the color is ignored (treated as opaque). If the colortype only supports * alpha (e.g. A1 or A8) then the color's r,g,b components are ignored. */ - void eraseColor(SkColor c) const { - this->eraseARGB(SkColorGetA(c), SkColorGetR(c), SkColorGetG(c), - SkColorGetB(c)); - } + void eraseColor(SkColor c) const; /** * Fill the entire bitmap with the specified color. @@ -484,7 +481,9 @@ public: * of the color is ignored (treated as opaque). If the colortype only supports * alpha (e.g. A1 or A8) then the color's r,g,b components are ignored. */ - void eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const; + void eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) const { + this->eraseColor(SkColorSetARGB(a, r, g, b)); + } SK_ATTR_DEPRECATED("use eraseARGB or eraseColor") void eraseRGB(U8CPU r, U8CPU g, U8CPU b) const { @@ -497,7 +496,12 @@ public: * of the color is ignored (treated as opaque). If the colortype only supports * alpha (e.g. A1 or A8) then the color's r,g,b components are ignored. */ - void eraseArea(const SkIRect& area, SkColor c) const; + void erase(SkColor c, const SkIRect& area) const; + + // DEPRECATED + void eraseArea(const SkIRect& area, SkColor c) const { + this->erase(c, area); + } /** * Return the SkColor of the specified pixel. In most cases this will @@ -736,13 +740,9 @@ private: }; SkImageInfo fInfo; - uint32_t fRowBytes; - uint8_t fFlags; - void internalErase(const SkIRect&, U8CPU a, U8CPU r, U8CPU g, U8CPU b)const; - /* Unreference any pixelrefs or colortables */ void freePixels(); |