From 81e495e82fde9e5cc3f7421ee60329085b67a69c Mon Sep 17 00:00:00 2001 From: "scheib@chromium.org" Date: Fri, 12 Apr 2013 02:04:55 +0000 Subject: Enable WindowsApiProperties on mac by fixing DCHECK. ReleaseFullScreen incorrectly DCHECKed > 0 instead of >= 0. BUG=229700 Review URL: https://chromiumcodereview.appspot.com/13973005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193825 0039d316-1c4b-4281-b951-d872f2087c98 --- base/mac/mac_util.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'base/mac') diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm index a6501a41..f758b52 100644 --- a/base/mac/mac_util.mm +++ b/base/mac/mac_util.mm @@ -180,6 +180,9 @@ void RequestFullScreen(FullScreenMode mode) { return; DCHECK_GE(g_full_screen_requests[mode], 0); + if (mode < 0) + return; + g_full_screen_requests[mode] = std::max(g_full_screen_requests[mode] + 1, 1); SetUIMode(); } @@ -190,7 +193,10 @@ void ReleaseFullScreen(FullScreenMode mode) { if (mode >= kNumFullScreenModes) return; - DCHECK_GT(g_full_screen_requests[mode], 0); + DCHECK_GE(g_full_screen_requests[mode], 0); + if (mode < 0) + return; + g_full_screen_requests[mode] = std::max(g_full_screen_requests[mode] - 1, 0); SetUIMode(); } -- cgit v1.1