am 2626a123: am c408f5a2: Merge "Rename SkLargeBitmap to SkBitmapRegionDecoder (the previous renaming was reverted)." into gingerbread

Merge commit '2626a12394e8b284ff7d88e0ec0e99beaa31b795'

* commit '2626a12394e8b284ff7d88e0ec0e99beaa31b795':
  Rename SkLargeBitmap to SkBitmapRegionDecoder (the previous renaming was reverted).

1 files changed, 5 insertions, 5 deletions

diff --git a/include/images/SkLargeBitmap.h b/include/images/SkBitmapRegionDecoder.h
index 0d19f32..5b35371 100644
--- a/include/images/SkLargeBitmap.h
+++ b/include/images/SkBitmapRegionDecoder.h
@@ -1,18 +1,18 @@
-#ifndef SkLargeBitmap_DEFINED
-#define SkLargeBitmap_DEFINED
+#ifndef SkBitmapRegionDecoder_DEFINED
+#define SkBitmapRegionDecoder_DEFINED
 
 #include "SkBitmap.h"
 #include "SkRect.h"
 #include "SkImageDecoder.h"
 
-class SkLargeBitmap {
+class SkBitmapRegionDecoder {
 public:
-    SkLargeBitmap(SkImageDecoder *decoder, int width, int height) {
+    SkBitmapRegionDecoder(SkImageDecoder *decoder, int width, int height) {
         fDecoder = decoder;
         fWidth = width;
         fHeight = height;
     }
-    virtual ~SkLargeBitmap() {
+    virtual ~SkBitmapRegionDecoder() {
         delete fDecoder;
     }