Changeset 40969 in webkit for trunk/JavaScriptCore/wtf/MainThread.cpp

Timestamp:

Feb 13, 2009, 1:29:21 AM (16 years ago)

Author:

[email protected]

Message:

2009-02-13 David Levin <​[email protected]>

Reviewed by Darin Adler.

Bug 23926: Race condition in callOnMainThreadAndWait
<​https://bugs.webkit.org/show_bug.cgi?id=23926>

• wtf/MainThread.cpp: Removed callOnMainThreadAndWait since it isn't used.

File:

• trunk/JavaScriptCore/wtf/MainThread.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wtf/MainThread.cpp

@@ -40 +40 @@
     MainThreadFunction* function;
     void* context;
-    ThreadCondition* syncFlag;
 
-    FunctionWithContext(MainThreadFunction* function = 0, void* context = 0, ThreadCondition* syncFlag = 0)
+    FunctionWithContext(MainThreadFunction* function = 0, void* context = 0)
         : function(function)
         , context(context)
-        , syncFlag(syncFlag)
     { 
     }
@@ -95 +93 @@
 
         invocation.function(invocation.context);
-        if (invocation.syncFlag)
-            invocation.syncFlag->signal();
-        
+
         // If we are running accumulated functions for too long so UI may become unresponsive, we need to
         // yield so the user input can be processed. Otherwise user may not be able to even close the window.
@@ -122 +118 @@
 }
 
-void callOnMainThreadAndWait(MainThreadFunction* function, void* context)
-{
-    ASSERT(function);
-
-    if (isMainThread()) {
-        function(context);
-        return;
-    }
-
-    ThreadCondition syncFlag;
-    Mutex conditionMutex;
-    bool needToSchedule = false;
-    {
-        MutexLocker locker(mainThreadFunctionQueueMutex());
-        needToSchedule = functionQueue().size() == 0;
-        functionQueue().append(FunctionWithContext(function, context, &syncFlag));
-        conditionMutex.lock();
-    }
-
-    if (needToSchedule)
-        scheduleDispatchFunctionsOnMainThread();
-    syncFlag.wait(conditionMutex);
-}
-
 void setMainThreadCallbacksPaused(bool paused)
 {