Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: include/ports/SkMutex_win.h

Issue 1359733002: Make mutex semaphore based. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix mutex leak Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/ports/SkMutex_pthread.h ('k') | include/private/SkOncePtr.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/ports/SkMutex_win.h
diff --git a/include/ports/SkMutex_win.h b/include/ports/SkMutex_win.h
deleted file mode 100644
index fe06336a90a0c6000e8d38c9e1f906a5750b0258..0000000000000000000000000000000000000000
--- a/include/ports/SkMutex_win.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2013 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkMutex_win_DEFINED
-#define SkMutex_win_DEFINED
-
-/** Windows CriticalSection based mutex. */
-
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# define WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
-#endif
-#ifndef NOMINMAX
-# define NOMINMAX
-# define NOMINMAX_WAS_LOCALLY_DEFINED
-#endif
-#
-#include <windows.h>
-#
-#ifdef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
-# undef WIN32_IS_MEAN_WAS_LOCALLY_DEFINED
-# undef WIN32_LEAN_AND_MEAN
-#endif
-#ifdef NOMINMAX_WAS_LOCALLY_DEFINED
-# undef NOMINMAX_WAS_LOCALLY_DEFINED
-# undef NOMINMAX
-#endif
-
-// On Windows, SkBaseMutex and SkMutex are the same thing,
-// we can't easily get rid of static initializers. However,
-// we preserve the same inheritance pattern as other platforms
-// so that we can forward-declare cleanly.
-struct SkBaseMutex {
-public:
- SkBaseMutex() {
- InitializeCriticalSection(&fStorage);
- SkDEBUGCODE(fOwner = 0;)
- }
-
- ~SkBaseMutex() {
- SkASSERT(0 == fOwner);
- DeleteCriticalSection(&fStorage);
- }
-
- void acquire() {
- EnterCriticalSection(&fStorage);
- SkDEBUGCODE(fOwner = GetCurrentThreadId();)
- }
-
- void release() {
- this->assertHeld();
- SkDEBUGCODE(fOwner = 0;)
- LeaveCriticalSection(&fStorage);
- }
-
- void assertHeld() {
- SkASSERT(GetCurrentThreadId() == fOwner);
- }
-
-protected:
- CRITICAL_SECTION fStorage;
- SkDEBUGCODE(DWORD fOwner;)
-
-private:
- SkBaseMutex(const SkBaseMutex&);
- SkBaseMutex& operator=(const SkBaseMutex&);
-};
-
-class SkMutex : public SkBaseMutex { };
-
-// Windows currently provides no documented means of POD initializing a CRITICAL_SECTION.
-// As a result, it is illegal to SK_DECLARE_STATIC_MUTEX in a function.
-#define SK_DECLARE_STATIC_MUTEX(name) namespace{} static SkBaseMutex name
-
-#endif
« no previous file with comments | « include/ports/SkMutex_pthread.h ('k') | include/private/SkOncePtr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698