Guard against most unintentionally ephemeral SkAutoFoo instantiations.

include/core/SkBitmap.h

 
 /*
  * Copyright 2006 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.
  */
 
 
 #ifndef SkBitmap_DEFINED
@@ skipping 712 matching lines @@
     ~SkAutoLockPixels() {
         if (fDidLock) {
             fBitmap.unlockPixels();
         }
     }
 
 private:
     const SkBitmap& fBitmap;
     bool            fDidLock;
 };
+#define SkAutoLockPixels(...) SK_REQUIRE_LOCAL_VAR(SkAutoLockPixels)
 
 /** Helper class that performs the lock/unlockColors calls on a colortable.
     The destructor will call unlockColors(false) if it has a bitmap's colortable
 */
 class SkAutoLockColors : public SkNoncopyable {
 public:
     /** Initialize with no bitmap. Call lockColors(bitmap) to lock bitmap's
         colortable
      */
     SkAutoLockColors() : fCTable(NULL), fColors(NULL) {}
@@ skipping 33 matching lines @@
     }
 
     const SkPMColor* lockColors(const SkBitmap& bm) {
         return this->lockColors(bm.getColorTable());
     }
 
 private:
     SkColorTable*    fCTable;
     const SkPMColor* fColors;
 };
+#define SkAutoLockColors(...) SK_REQUIRE_LOCAL_VAR(SkAutoLockColors)
 
 ///////////////////////////////////////////////////////////////////////////////
 
 inline uint32_t* SkBitmap::getAddr32(int x, int y) const {
     SkASSERT(fPixels);
     SkASSERT(fConfig == kARGB_8888_Config);
     SkASSERT((unsigned)x < fWidth && (unsigned)y < fHeight);
     return (uint32_t*)((char*)fPixels + y * fRowBytes + (x << 2));
 }
 
@@ skipping 21 matching lines @@
 
 // returns the address of the byte that contains the x coordinate
 inline uint8_t* SkBitmap::getAddr1(int x, int y) const {
     SkASSERT(fPixels);
     SkASSERT(fConfig == kA1_Config);
     SkASSERT((unsigned)x < fWidth && (unsigned)y < fHeight);
     return (uint8_t*)fPixels + y * fRowBytes + (x >> 3);
 }
 
 #endif