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

Side by Side Diff: third_party/WebKit/Source/core/html/parser/HTMLParserThread.cpp

Issue 2288983004: Merge TaskSynchronizer into WaitableEvent. (Closed)
Patch Set: fix Created 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 void HTMLParserThread::shutdown() 63 void HTMLParserThread::shutdown()
64 { 64 {
65 ASSERT(isMainThread()); 65 ASSERT(isMainThread());
66 ASSERT(s_sharedThread); 66 ASSERT(s_sharedThread);
67 // currentThread will always be non-null in production, but can be null in C hromium unit tests. 67 // currentThread will always be non-null in production, but can be null in C hromium unit tests.
68 if (Platform::current()->currentThread() && s_sharedThread->m_thread) { 68 if (Platform::current()->currentThread() && s_sharedThread->m_thread) {
69 WaitableEvent waitableEvent; 69 WaitableEvent waitableEvent;
70 s_sharedThread->postTask(crossThreadBind(&HTMLParserThread::cleanupHTMLP arserThread, crossThreadUnretained(s_sharedThread), crossThreadUnretained(&waita bleEvent))); 70 s_sharedThread->postTask(crossThreadBind(&HTMLParserThread::cleanupHTMLP arserThread, crossThreadUnretained(s_sharedThread), crossThreadUnretained(&waita bleEvent)));
71 SafePointScope scope(BlinkGC::HeapPointersOnStack);
72 waitableEvent.wait(); 71 waitableEvent.wait();
73 } 72 }
74 delete s_sharedThread; 73 delete s_sharedThread;
75 s_sharedThread = nullptr; 74 s_sharedThread = nullptr;
76 } 75 }
77 76
78 void HTMLParserThread::cleanupHTMLParserThread(WaitableEvent* waitableEvent) 77 void HTMLParserThread::cleanupHTMLParserThread(WaitableEvent* waitableEvent)
79 { 78 {
80 m_thread->shutdown(); 79 m_thread->shutdown();
81 waitableEvent->signal(); 80 waitableEvent->signal();
82 } 81 }
83 82
84 HTMLParserThread* HTMLParserThread::shared() 83 HTMLParserThread* HTMLParserThread::shared()
85 { 84 {
86 return s_sharedThread; 85 return s_sharedThread;
87 } 86 }
88 87
89 void HTMLParserThread::postTask(std::unique_ptr<CrossThreadClosure> closure) 88 void HTMLParserThread::postTask(std::unique_ptr<CrossThreadClosure> closure)
90 { 89 {
91 ASSERT(isMainThread()); 90 ASSERT(isMainThread());
92 if (!m_thread) { 91 if (!m_thread) {
93 m_thread = WebThreadSupportingGC::create("HTMLParserThread"); 92 m_thread = WebThreadSupportingGC::create("HTMLParserThread");
94 postTask(crossThreadBind(&HTMLParserThread::setupHTMLParserThread, cross ThreadUnretained(this))); 93 postTask(crossThreadBind(&HTMLParserThread::setupHTMLParserThread, cross ThreadUnretained(this)));
95 } 94 }
96 95
97 m_thread->postTask(BLINK_FROM_HERE, std::move(closure)); 96 m_thread->postTask(BLINK_FROM_HERE, std::move(closure));
98 } 97 }
99 98
100 } // namespace blink 99 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698