diff options
| author |  mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-18 20:55:29 +0000 |
|---|---|---|
| committer | mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-18 20:55:29 +0000 |
| commit | 0f6dc21e324a0829ed7f4ff4c4238f75f62683b5 (patch) | |
| tree | 4fa8dea53100e3904b86585dc8620728bebc274c | |
| parent | da4d7cfa589569b386223abd5e255a9a17bca8e8 (diff) | |
Revert SK_REQUIRE_LOCAL_VAR changes for DEPS roll.
BUG=
Review URL: https://codereview.chromium.org/59703012
git-svn-id: http://skia.googlecode.com/svn/trunk@12306 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | include/core/SkBitmap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index d9749f04c4..afce3a7278 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -730,7 +730,8 @@ private: const SkBitmap& fBitmap; bool fDidLock; }; -#define SkAutoLockPixels(...) SK_REQUIRE_LOCAL_VAR(SkAutoLockPixels) +//TODO(mtklein): uncomment when 71713004 lands and Chromium's fixed. +//#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 |