| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 14 matching lines...) Expand all Loading... |
| 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 MessageLoopInterruptor_h | 31 #ifndef MessageLoopInterruptor_h |
| 32 #define MessageLoopInterruptor_h | 32 #define MessageLoopInterruptor_h |
| 33 | 33 |
| 34 #include "platform/heap/ThreadState.h" | 34 #include "platform/heap/ThreadState.h" |
| 35 #include "public/platform/WebThread.h" | 35 #include "public/platform/WebTaskRunner.h" |
| 36 #include "public/platform/WebTraceLocation.h" | 36 #include "public/platform/WebTraceLocation.h" |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 class MessageLoopInterruptor : public ThreadState::Interruptor { | 40 class MessageLoopInterruptor : public ThreadState::Interruptor { |
| 41 public: | 41 public: |
| 42 explicit MessageLoopInterruptor(WebThread* thread) : m_thread(thread) { } | 42 explicit MessageLoopInterruptor(WebTaskRunner* taskRunner) : m_taskRunner(ta
skRunner) { } |
| 43 | 43 |
| 44 void requestInterrupt() override | 44 void requestInterrupt() override |
| 45 { | 45 { |
| 46 // GCTask has an empty run() method. Its only purpose is to guarantee | 46 // GCTask has an empty run() method. Its only purpose is to guarantee |
| 47 // that MessageLoop will have a task to process which will result | 47 // that MessageLoop will have a task to process which will result |
| 48 // in PendingGCRunner::didProcessTask being executed. | 48 // in PendingGCRunner::didProcessTask being executed. |
| 49 m_thread->postTask(FROM_HERE, new GCTask); | 49 m_taskRunner->postTask(FROM_HERE, new GCTask); |
| 50 } | 50 } |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 class GCTask : public WebThread::Task { | 53 class GCTask : public WebTaskRunner::Task { |
| 54 public: | 54 public: |
| 55 virtual ~GCTask() { } | 55 virtual ~GCTask() { } |
| 56 | 56 |
| 57 void run() override | 57 void run() override |
| 58 { | 58 { |
| 59 // Don't do anything here because we don't know if this is | 59 // Don't do anything here because we don't know if this is |
| 60 // a nested event loop or not. PendingGCRunner::didProcessTask | 60 // a nested event loop or not. PendingGCRunner::didProcessTask |
| 61 // will enter correct safepoint for us. | 61 // will enter correct safepoint for us. |
| 62 // We are not calling onInterrupted() because that always | 62 // We are not calling onInterrupted() because that always |
| 63 // conservatively enters safepoint with pointers on stack. | 63 // conservatively enters safepoint with pointers on stack. |
| 64 } | 64 } |
| 65 }; | 65 }; |
| 66 | 66 |
| 67 WebThread* m_thread; | 67 WebTaskRunner* m_taskRunner; |
| 68 }; | 68 }; |
| 69 | 69 |
| 70 } // namespace blink | 70 } // namespace blink |
| 71 | 71 |
| 72 #endif | 72 #endif |
| OLD | NEW |