Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 13 matching lines...) Expand all Loading... | |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef HTMLParserThread_h | 31 #ifndef HTMLParserThread_h |
| 32 #define HTMLParserThread_h | 32 #define HTMLParserThread_h |
| 33 | 33 |
| 34 #include "platform/WebThreadRunner.h" | |
| 34 #include "platform/heap/glue/MessageLoopInterruptor.h" | 35 #include "platform/heap/glue/MessageLoopInterruptor.h" |
|
Mads Ager (chromium)
2014/08/13 07:26:20
You can probably remove these two platform/heap in
haraken
2014/08/13 08:03:08
Done.
| |
| 35 #include "platform/heap/glue/PendingGCRunner.h" | 36 #include "platform/heap/glue/PendingGCRunner.h" |
| 36 #include "public/platform/WebThread.h" | |
| 37 #include "wtf/Functional.h" | 37 #include "wtf/Functional.h" |
| 38 #include "wtf/OwnPtr.h" | 38 #include "wtf/OwnPtr.h" |
| 39 | 39 |
| 40 namespace blink { | 40 namespace blink { |
| 41 | 41 |
| 42 class TaskSynchronizer; | 42 class TaskSynchronizer; |
| 43 | 43 |
| 44 class HTMLParserThread { | 44 class HTMLParserThread { |
| 45 public: | 45 public: |
| 46 static void init(); | 46 static void init(); |
| 47 static void shutdown(); | 47 static void shutdown(); |
| 48 | 48 |
| 49 // It is an error to call shared() before init() or after shutdown(); | 49 // It is an error to call shared() before init() or after shutdown(); |
| 50 static HTMLParserThread* shared(); | 50 static HTMLParserThread* shared(); |
| 51 | 51 |
| 52 void postTask(const Closure&); | 52 void postTask(const Closure&); |
| 53 blink::WebThread& platformThread(); | 53 blink::WebThread& platformThread(); |
| 54 bool isRunning(); | 54 bool isRunning(); |
| 55 | 55 |
| 56 private: | 56 private: |
| 57 HTMLParserThread(); | 57 HTMLParserThread(); |
| 58 ~HTMLParserThread(); | 58 ~HTMLParserThread(); |
| 59 void setupHTMLParserThread(); | 59 void setupHTMLParserThread(); |
| 60 void cleanupHTMLParserThread(TaskSynchronizer*); | 60 void cleanupHTMLParserThread(TaskSynchronizer*); |
| 61 | 61 |
| 62 OwnPtr<blink::WebThread> m_thread; | 62 OwnPtr<WebThreadRunner> m_thread; |
| 63 OwnPtr<PendingGCRunner> m_pendingGCRunner; | |
| 64 OwnPtr<MessageLoopInterruptor> m_messageLoopInterruptor; | |
| 65 }; | 63 }; |
| 66 | 64 |
| 67 } // namespace blink | 65 } // namespace blink |
| 68 | 66 |
| 69 #endif // HTMLParserThread_h | 67 #endif // HTMLParserThread_h |
| OLD | NEW |