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

Side by Side Diff: third_party/WebKit/Source/web/WebSharedWorkerImpl.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 30 matching lines...) Expand all
41 #include "public/web/WebContentSecurityPolicy.h" 41 #include "public/web/WebContentSecurityPolicy.h"
42 #include "public/web/WebDevToolsAgentClient.h" 42 #include "public/web/WebDevToolsAgentClient.h"
43 #include "public/web/WebFrameClient.h" 43 #include "public/web/WebFrameClient.h"
44 #include "public/web/WebSharedWorkerClient.h" 44 #include "public/web/WebSharedWorkerClient.h"
45 #include "wtf/RefPtr.h" 45 #include "wtf/RefPtr.h"
46 #include <memory> 46 #include <memory>
47 47
48 namespace blink { 48 namespace blink {
49 49
50 class ConsoleMessage; 50 class ConsoleMessage;
51 class ParentFrameTaskRunners;
52 class WebApplicationCacheHost; 51 class WebApplicationCacheHost;
53 class WebApplicationCacheHostClient; 52 class WebApplicationCacheHostClient;
54 class WebLocalFrameImpl; 53 class WebLocalFrameImpl;
55 class WebServiceWorkerNetworkProvider; 54 class WebServiceWorkerNetworkProvider;
56 class WebSharedWorkerClient; 55 class WebSharedWorkerClient;
57 class WebString; 56 class WebString;
58 class WebURL; 57 class WebURL;
59 class WebView; 58 class WebView;
60 class WorkerInspectorProxy; 59 class WorkerInspectorProxy;
61 class WorkerScriptLoader; 60 class WorkerScriptLoader;
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 Persistent<ExecutionContext> m_loadingDocument; 137 Persistent<ExecutionContext> m_loadingDocument;
139 WebView* m_webView; 138 WebView* m_webView;
140 Persistent<WebLocalFrameImpl> m_mainFrame; 139 Persistent<WebLocalFrameImpl> m_mainFrame;
141 bool m_askedToTerminate; 140 bool m_askedToTerminate;
142 141
143 // This one is bound to and used only on the main thread. 142 // This one is bound to and used only on the main thread.
144 std::unique_ptr<WebServiceWorkerNetworkProvider> m_networkProvider; 143 std::unique_ptr<WebServiceWorkerNetworkProvider> m_networkProvider;
145 144
146 Persistent<WorkerInspectorProxy> m_workerInspectorProxy; 145 Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
147 146
148 std::unique_ptr<ParentFrameTaskRunners> m_mainThreadTaskRunners;
149
150 std::unique_ptr<WorkerThread> m_workerThread; 147 std::unique_ptr<WorkerThread> m_workerThread;
151 148
152 WebSharedWorkerClient* m_client; 149 WebSharedWorkerClient* m_client;
153 150
154 bool m_pauseWorkerContextOnStart; 151 bool m_pauseWorkerContextOnStart;
155 bool m_isPausedOnStart; 152 bool m_isPausedOnStart;
156 153
157 // Kept around only while main script loading is ongoing. 154 // Kept around only while main script loading is ongoing.
158 RefPtr<WorkerScriptLoader> m_mainScriptLoader; 155 RefPtr<WorkerScriptLoader> m_mainScriptLoader;
159 156
160 RefPtr<WorkerLoaderProxy> m_loaderProxy; 157 RefPtr<WorkerLoaderProxy> m_loaderProxy;
161 158
162 WebURL m_url; 159 WebURL m_url;
163 WebString m_name; 160 WebString m_name;
164 WebAddressSpace m_creationAddressSpace; 161 WebAddressSpace m_creationAddressSpace;
165 }; 162 };
166 163
167 } // namespace blink 164 } // namespace blink
168 165
169 #endif // WebSharedWorkerImpl_h 166 #endif // WebSharedWorkerImpl_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp ('k') | third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698