OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "core/workers/ThreadedObjectProxyBase.h" | 5 #include "core/workers/ThreadedObjectProxyBase.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include "core/dom/ExecutionContext.h" | 8 #include "core/dom/ExecutionContext.h" |
9 #include "core/inspector/ConsoleMessage.h" | 9 #include "core/inspector/ConsoleMessage.h" |
10 #include "core/workers/ParentFrameTaskRunners.h" | 10 #include "core/workers/ParentFrameTaskRunners.h" |
(...skipping 28 matching lines...) Expand all Loading... |
39 GetParentFrameTaskRunners() | 39 GetParentFrameTaskRunners() |
40 ->Get(TaskType::kUnspecedTimer) | 40 ->Get(TaskType::kUnspecedTimer) |
41 ->PostTask( | 41 ->PostTask( |
42 BLINK_FROM_HERE, | 42 BLINK_FROM_HERE, |
43 CrossThreadBind(&ThreadedMessagingProxyBase::ReportConsoleMessage, | 43 CrossThreadBind(&ThreadedMessagingProxyBase::ReportConsoleMessage, |
44 MessagingProxyWeakPtr(), source, level, message, | 44 MessagingProxyWeakPtr(), source, level, message, |
45 WTF::Passed(location->Clone()))); | 45 WTF::Passed(location->Clone()))); |
46 } | 46 } |
47 | 47 |
48 void ThreadedObjectProxyBase::PostMessageToPageInspector( | 48 void ThreadedObjectProxyBase::PostMessageToPageInspector( |
| 49 int session_id, |
49 const String& message) { | 50 const String& message) { |
50 // The TaskType of Inspector tasks need to be Unthrottled because they need to | 51 // The TaskType of Inspector tasks need to be Unthrottled because they need to |
51 // run even on a suspended page. | 52 // run even on a suspended page. |
52 GetParentFrameTaskRunners() | 53 GetParentFrameTaskRunners() |
53 ->Get(TaskType::kUnthrottled) | 54 ->Get(TaskType::kUnthrottled) |
54 ->PostTask(BLINK_FROM_HERE, | 55 ->PostTask(BLINK_FROM_HERE, |
55 CrossThreadBind( | 56 CrossThreadBind( |
56 &ThreadedMessagingProxyBase::PostMessageToPageInspector, | 57 &ThreadedMessagingProxyBase::PostMessageToPageInspector, |
57 MessagingProxyWeakPtr(), message)); | 58 MessagingProxyWeakPtr(), session_id, message)); |
58 } | 59 } |
59 | 60 |
60 void ThreadedObjectProxyBase::DidCloseWorkerGlobalScope() { | 61 void ThreadedObjectProxyBase::DidCloseWorkerGlobalScope() { |
61 GetParentFrameTaskRunners() | 62 GetParentFrameTaskRunners() |
62 ->Get(TaskType::kUnspecedTimer) | 63 ->Get(TaskType::kUnspecedTimer) |
63 ->PostTask( | 64 ->PostTask( |
64 BLINK_FROM_HERE, | 65 BLINK_FROM_HERE, |
65 CrossThreadBind(&ThreadedMessagingProxyBase::TerminateGlobalScope, | 66 CrossThreadBind(&ThreadedMessagingProxyBase::TerminateGlobalScope, |
66 MessagingProxyWeakPtr())); | 67 MessagingProxyWeakPtr())); |
67 } | 68 } |
(...skipping 10 matching lines...) Expand all Loading... |
78 | 79 |
79 ParentFrameTaskRunners* ThreadedObjectProxyBase::GetParentFrameTaskRunners() { | 80 ParentFrameTaskRunners* ThreadedObjectProxyBase::GetParentFrameTaskRunners() { |
80 return parent_frame_task_runners_.Get(); | 81 return parent_frame_task_runners_.Get(); |
81 } | 82 } |
82 | 83 |
83 ThreadedObjectProxyBase::ThreadedObjectProxyBase( | 84 ThreadedObjectProxyBase::ThreadedObjectProxyBase( |
84 ParentFrameTaskRunners* parent_frame_task_runners) | 85 ParentFrameTaskRunners* parent_frame_task_runners) |
85 : parent_frame_task_runners_(parent_frame_task_runners) {} | 86 : parent_frame_task_runners_(parent_frame_task_runners) {} |
86 | 87 |
87 } // namespace blink | 88 } // namespace blink |
OLD | NEW |