diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /JavaScriptCore/wtf/MainThread.h | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'JavaScriptCore/wtf/MainThread.h')
| -rw-r--r-- | JavaScriptCore/wtf/MainThread.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/JavaScriptCore/wtf/MainThread.h b/JavaScriptCore/wtf/MainThread.h index d037d0b..7703f3e 100644 --- a/JavaScriptCore/wtf/MainThread.h +++ b/JavaScriptCore/wtf/MainThread.h @@ -42,6 +42,8 @@ void initializeMainThread(); void callOnMainThread(MainThreadFunction*, void* context); void callOnMainThreadAndWait(MainThreadFunction*, void* context); +void cancelCallOnMainThread(MainThreadFunction*, void* context); + void setMainThreadCallbacksPaused(bool paused); bool isMainThread(); @@ -63,7 +65,7 @@ void initializeMainThreadToProcessMainThreadPlatform(); using WTF::callOnMainThread; using WTF::callOnMainThreadAndWait; +using WTF::cancelCallOnMainThread; using WTF::setMainThreadCallbacksPaused; using WTF::isMainThread; - #endif // MainThread_h |