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

Side by Side Diff: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h

Issue 2199633002: Revert of Pass per-frame task runners to Workers (when possible) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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 24 matching lines...) Expand all
35 35
36 #include "public/web/WebContentSecurityPolicy.h" 36 #include "public/web/WebContentSecurityPolicy.h"
37 #include "public/web/WebDevToolsAgentClient.h" 37 #include "public/web/WebDevToolsAgentClient.h"
38 #include "public/web/WebEmbeddedWorker.h" 38 #include "public/web/WebEmbeddedWorker.h"
39 #include "public/web/WebEmbeddedWorkerStartData.h" 39 #include "public/web/WebEmbeddedWorkerStartData.h"
40 #include "public/web/WebFrameClient.h" 40 #include "public/web/WebFrameClient.h"
41 #include <memory> 41 #include <memory>
42 42
43 namespace blink { 43 namespace blink {
44 44
45 class ParentFrameTaskRunners;
46 class ServiceWorkerGlobalScopeProxy; 45 class ServiceWorkerGlobalScopeProxy;
47 class WebLocalFrameImpl; 46 class WebLocalFrameImpl;
48 class WebServiceWorkerNetworkProvider; 47 class WebServiceWorkerNetworkProvider;
49 class WebView; 48 class WebView;
50 class WorkerInspectorProxy; 49 class WorkerInspectorProxy;
51 class WorkerScriptLoader; 50 class WorkerScriptLoader;
52 class WorkerThread; 51 class WorkerThread;
53 52
54 class WebEmbeddedWorkerImpl final 53 class WebEmbeddedWorkerImpl final
55 : public WebEmbeddedWorker 54 : public WebEmbeddedWorker
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 // to WorkerContext. 102 // to WorkerContext.
104 std::unique_ptr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient ; 103 std::unique_ptr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient ;
105 104
106 // We retain ownership of this one which is for use on the 105 // We retain ownership of this one which is for use on the
107 // main thread only. 106 // main thread only.
108 std::unique_ptr<WebServiceWorkerNetworkProvider> m_networkProvider; 107 std::unique_ptr<WebServiceWorkerNetworkProvider> m_networkProvider;
109 108
110 // Kept around only while main script loading is ongoing. 109 // Kept around only while main script loading is ongoing.
111 RefPtr<WorkerScriptLoader> m_mainScriptLoader; 110 RefPtr<WorkerScriptLoader> m_mainScriptLoader;
112 111
113 std::unique_ptr<ParentFrameTaskRunners> m_mainThreadTaskRunners;
114
115 std::unique_ptr<WorkerThread> m_workerThread; 112 std::unique_ptr<WorkerThread> m_workerThread;
116 RefPtr<WorkerLoaderProxy> m_loaderProxy; 113 RefPtr<WorkerLoaderProxy> m_loaderProxy;
117 Persistent<ServiceWorkerGlobalScopeProxy> m_workerGlobalScopeProxy; 114 Persistent<ServiceWorkerGlobalScopeProxy> m_workerGlobalScopeProxy;
118 Persistent<WorkerInspectorProxy> m_workerInspectorProxy; 115 Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
119 116
120 // 'shadow page' - created to proxy loading requests from the worker. 117 // 'shadow page' - created to proxy loading requests from the worker.
121 // Both WebView and WebFrame objects are close()'ed (where they're 118 // Both WebView and WebFrame objects are close()'ed (where they're
122 // deref'ed) when this EmbeddedWorkerImpl is destructed, therefore they 119 // deref'ed) when this EmbeddedWorkerImpl is destructed, therefore they
123 // are guaranteed to exist while this object is around. 120 // are guaranteed to exist while this object is around.
124 WebView* m_webView; 121 WebView* m_webView;
(...skipping 12 matching lines...) Expand all
137 DoPauseAfterDownload, 134 DoPauseAfterDownload,
138 IsPausedAfterDownload 135 IsPausedAfterDownload
139 } m_pauseAfterDownloadState; 136 } m_pauseAfterDownloadState;
140 137
141 WaitingForDebuggerState m_waitingForDebuggerState; 138 WaitingForDebuggerState m_waitingForDebuggerState;
142 }; 139 };
143 140
144 } // namespace blink 141 } // namespace blink
145 142
146 #endif // WebEmbeddedWorkerImpl_h 143 #endif // WebEmbeddedWorkerImpl_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698