From 0f6dc21e324a0829ed7f4ff4c4238f75f62683b5 Mon Sep 17 00:00:00 2001 From: "mtklein@google.com" Date: Mon, 18 Nov 2013 20:55:29 +0000 Subject: [PATCH] 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 --- include/core/SkBitmap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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