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

Unified Diff: third_party/WebKit/Source/platform/TaskSynchronizer.cpp

Issue 2288973002: Merge TaskSynchronizer into WaitableEvent. (Closed)
Patch Set: Created 4 years, 4 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
Index: third_party/WebKit/Source/platform/TaskSynchronizer.cpp
diff --git a/third_party/WebKit/Source/platform/TaskSynchronizer.cpp b/third_party/WebKit/Source/platform/TaskSynchronizer.cpp
deleted file mode 100644
index 3e019dc8fe2407ad2d02c975d947805a7590914a..0000000000000000000000000000000000000000
--- a/third_party/WebKit/Source/platform/TaskSynchronizer.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2007, 2008, 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "platform/TaskSynchronizer.h"
-
-#include "platform/heap/SafePoint.h"
-#include "platform/heap/ThreadState.h"
-
-namespace blink {
-
-TaskSynchronizer::TaskSynchronizer()
- : m_taskCompleted(false)
-{
-}
-
-void TaskSynchronizer::waitForTaskCompletion()
-{
- if (ThreadState::current()) {
- // Prevent the deadlock between park request by other threads and blocking
- // by m_synchronousCondition.
- SafePointScope scope(BlinkGC::HeapPointersOnStack);
- waitForTaskCompletionInternal();
- } else {
- // If this thread is already detached, we no longer need to enter a safe point scope.
- waitForTaskCompletionInternal();
- }
-}
-
-void TaskSynchronizer::waitForTaskCompletionInternal()
-{
- m_synchronousMutex.lock();
- while (!m_taskCompleted)
- m_synchronousCondition.wait(m_synchronousMutex);
- m_synchronousMutex.unlock();
-}
-
-void TaskSynchronizer::taskCompleted()
-{
- m_synchronousMutex.lock();
- m_taskCompleted = true;
- m_synchronousCondition.signal();
- m_synchronousMutex.unlock();
-}
-
-} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/platform/TaskSynchronizer.h ('k') | third_party/WebKit/Source/platform/WaitableEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698