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

Side by Side Diff: third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.cpp

Issue 2716853002: (WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper
Patch Set: WIP Created 3 years, 9 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 // 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 "core/dom/ExecutionContext.h" 8 #include "core/dom/ExecutionContext.h"
9 #include "core/dom/TaskRunnerHelper.h"
8 #include "core/inspector/ConsoleMessage.h" 10 #include "core/inspector/ConsoleMessage.h"
9 #include "core/workers/ParentFrameTaskRunners.h"
10 #include "core/workers/ThreadedMessagingProxyBase.h" 11 #include "core/workers/ThreadedMessagingProxyBase.h"
11 #include "platform/CrossThreadFunctional.h" 12 #include "platform/CrossThreadFunctional.h"
12 #include "platform/WebTaskRunner.h" 13 #include "platform/WebTaskRunner.h"
13 #include "wtf/Functional.h" 14 #include "wtf/Functional.h"
14 #include "wtf/PtrUtil.h" 15 #include "wtf/PtrUtil.h"
15 #include <memory>
16 16
17 namespace blink { 17 namespace blink {
18 18
19 void ThreadedObjectProxyBase::countFeature(UseCounter::Feature feature) { 19 void ThreadedObjectProxyBase::countFeature(UseCounter::Feature feature) {
20 getParentFrameTaskRunners() 20 FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
21 ->get(TaskType::UnspecedTimer)
22 ->postTask(BLINK_FROM_HERE, 21 ->postTask(BLINK_FROM_HERE,
23 crossThreadBind(&ThreadedMessagingProxyBase::countFeature, 22 crossThreadBind(&ThreadedMessagingProxyBase::countFeature,
24 messagingProxyWeakPtr(), feature)); 23 messagingProxyWeakPtr(), feature));
25 } 24 }
26 25
27 void ThreadedObjectProxyBase::countDeprecation(UseCounter::Feature feature) { 26 void ThreadedObjectProxyBase::countDeprecation(UseCounter::Feature feature) {
28 getParentFrameTaskRunners() 27 FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
29 ->get(TaskType::UnspecedTimer)
30 ->postTask(BLINK_FROM_HERE, 28 ->postTask(BLINK_FROM_HERE,
31 crossThreadBind(&ThreadedMessagingProxyBase::countDeprecation, 29 crossThreadBind(&ThreadedMessagingProxyBase::countDeprecation,
32 messagingProxyWeakPtr(), feature)); 30 messagingProxyWeakPtr(), feature));
33 } 31 }
34 32
35 void ThreadedObjectProxyBase::reportConsoleMessage(MessageSource source, 33 void ThreadedObjectProxyBase::reportConsoleMessage(MessageSource source,
36 MessageLevel level, 34 MessageLevel level,
37 const String& message, 35 const String& message,
38 SourceLocation* location) { 36 SourceLocation* location) {
39 getParentFrameTaskRunners() 37 FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
40 ->get(TaskType::UnspecedTimer)
41 ->postTask( 38 ->postTask(
42 BLINK_FROM_HERE, 39 BLINK_FROM_HERE,
43 crossThreadBind(&ThreadedMessagingProxyBase::reportConsoleMessage, 40 crossThreadBind(&ThreadedMessagingProxyBase::reportConsoleMessage,
44 messagingProxyWeakPtr(), source, level, message, 41 messagingProxyWeakPtr(), source, level, message,
45 WTF::passed(location->clone()))); 42 WTF::passed(location->clone())));
46 } 43 }
47 44
48 void ThreadedObjectProxyBase::postMessageToPageInspector( 45 void ThreadedObjectProxyBase::postMessageToPageInspector(
49 const String& message) { 46 const String& message) {
50 // The TaskType of Inspector tasks need to be Unthrottled because they need to 47 // The TaskType of Inspector tasks need to be Unthrottled because they need to
51 // run even on a suspended page. 48 // run even on a suspended page.
52 getParentFrameTaskRunners() 49 FrameTaskRunnerHelper::get(TaskType::Unthrottled, m_globalScope.get())
53 ->get(TaskType::Unthrottled)
54 ->postTask(BLINK_FROM_HERE, 50 ->postTask(BLINK_FROM_HERE,
55 crossThreadBind( 51 crossThreadBind(
56 &ThreadedMessagingProxyBase::postMessageToPageInspector, 52 &ThreadedMessagingProxyBase::postMessageToPageInspector,
57 messagingProxyWeakPtr(), message)); 53 messagingProxyWeakPtr(), message));
58 } 54 }
59 55
56 void ThreadedObjectProxyBase::didCreateWorkerGlobalScope(
57 WorkerOrWorkletGlobalScope* globalScope) {
58 m_globalScope = globalScope;
59 }
60
60 void ThreadedObjectProxyBase::didCloseWorkerGlobalScope() { 61 void ThreadedObjectProxyBase::didCloseWorkerGlobalScope() {
61 getParentFrameTaskRunners() 62 FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
62 ->get(TaskType::UnspecedTimer)
63 ->postTask( 63 ->postTask(
64 BLINK_FROM_HERE, 64 BLINK_FROM_HERE,
65 crossThreadBind(&ThreadedMessagingProxyBase::terminateGlobalScope, 65 crossThreadBind(&ThreadedMessagingProxyBase::terminateGlobalScope,
66 messagingProxyWeakPtr())); 66 messagingProxyWeakPtr()));
67 } 67 }
68 68
69 void ThreadedObjectProxyBase::didTerminateWorkerThread() { 69 void ThreadedObjectProxyBase::didTerminateWorkerThread() {
70 // This will terminate the MessagingProxy. 70 // This will terminate the MessagingProxy.
71 getParentFrameTaskRunners() 71 FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
72 ->get(TaskType::UnspecedTimer)
73 ->postTask( 72 ->postTask(
74 BLINK_FROM_HERE, 73 BLINK_FROM_HERE,
75 crossThreadBind(&ThreadedMessagingProxyBase::workerThreadTerminated, 74 crossThreadBind(&ThreadedMessagingProxyBase::workerThreadTerminated,
76 messagingProxyWeakPtr())); 75 messagingProxyWeakPtr()));
76 // TODO
77 m_globalScope = nullptr;
77 } 78 }
78 79
79 ParentFrameTaskRunners* ThreadedObjectProxyBase::getParentFrameTaskRunners() {
80 return m_parentFrameTaskRunners.get();
81 }
82
83 ThreadedObjectProxyBase::ThreadedObjectProxyBase(
84 ParentFrameTaskRunners* parentFrameTaskRunners)
85 : m_parentFrameTaskRunners(parentFrameTaskRunners) {}
86
87 } // namespace blink 80 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698