| Index: third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp b/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp
|
| index de5f95d65e5b7b5253c8973d5398cc76ccbb80c5..c7885d4c71598b09d975c0be04bbe9643b60d5d5 100644
|
| --- a/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp
|
| +++ b/third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp
|
| @@ -32,10 +32,10 @@
|
|
|
| #include "platform/Task.h"
|
| #include "platform/ThreadSafeFunctional.h"
|
| +#include "platform/WaitableEvent.h"
|
| #include "platform/heap/SafePoint.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/WebTraceLocation.h"
|
| -#include "public/platform/WebWaitableEvent.h"
|
| #include "wtf/PassOwnPtr.h"
|
|
|
| namespace blink {
|
| @@ -67,7 +67,7 @@ void HTMLParserThread::shutdown()
|
| ASSERT(s_sharedThread);
|
| // currentThread will always be non-null in production, but can be null in Chromium unit tests.
|
| if (Platform::current()->currentThread() && s_sharedThread->isRunning()) {
|
| - OwnPtr<WebWaitableEvent> waitableEvent(adoptPtr(Platform::current()->createWaitableEvent()));
|
| + OwnPtr<WaitableEvent> waitableEvent(adoptPtr(new WaitableEvent()));
|
| s_sharedThread->postTask(threadSafeBind(&HTMLParserThread::cleanupHTMLParserThread, AllowCrossThreadAccess(s_sharedThread), AllowCrossThreadAccess(waitableEvent.get())));
|
| SafePointScope scope(BlinkGC::HeapPointersOnStack);
|
| waitableEvent->wait();
|
| @@ -76,7 +76,7 @@ void HTMLParserThread::shutdown()
|
| s_sharedThread = 0;
|
| }
|
|
|
| -void HTMLParserThread::cleanupHTMLParserThread(WebWaitableEvent* waitableEvent)
|
| +void HTMLParserThread::cleanupHTMLParserThread(WaitableEvent* waitableEvent)
|
| {
|
| m_thread->shutdown();
|
| waitableEvent->signal();
|
|
|