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

Side by Side Diff: Source/web/WebSharedWorkerImpl.h

Issue 468883002: Rename workerGlobalScopeDestroyed to workerThreadTerminated (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/ServiceWorkerGlobalScopeProxy.cpp ('k') | Source/web/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 explicit WebSharedWorkerImpl(WebSharedWorkerClient*); 72 explicit WebSharedWorkerImpl(WebSharedWorkerClient*);
73 73
74 // WorkerReportingProxy methods: 74 // WorkerReportingProxy methods:
75 virtual void reportException( 75 virtual void reportException(
76 const WTF::String&, int, int, const WTF::String&) OVERRIDE; 76 const WTF::String&, int, int, const WTF::String&) OVERRIDE;
77 virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OV ERRIDE; 77 virtual void reportConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OV ERRIDE;
78 virtual void postMessageToPageInspector(const WTF::String&) OVERRIDE; 78 virtual void postMessageToPageInspector(const WTF::String&) OVERRIDE;
79 virtual void updateInspectorStateCookie(const WTF::String&) OVERRIDE; 79 virtual void updateInspectorStateCookie(const WTF::String&) OVERRIDE;
80 virtual void workerGlobalScopeStarted(WorkerGlobalScope*) OVERRIDE; 80 virtual void workerGlobalScopeStarted(WorkerGlobalScope*) OVERRIDE;
81 virtual void workerGlobalScopeClosed() OVERRIDE; 81 virtual void workerGlobalScopeClosed() OVERRIDE;
82 virtual void workerGlobalScopeDestroyed() OVERRIDE; 82 virtual void workerThreadTerminated() OVERRIDE;
83 virtual void willDestroyWorkerGlobalScope() OVERRIDE { } 83 virtual void willDestroyWorkerGlobalScope() OVERRIDE { }
84 84
85 // WorkerLoaderProxy methods: 85 // WorkerLoaderProxy methods:
86 virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) OVERRIDE; 86 virtual void postTaskToLoader(PassOwnPtr<ExecutionContextTask>) OVERRIDE;
87 virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) O VERRIDE; 87 virtual bool postTaskToWorkerGlobalScope(PassOwnPtr<ExecutionContextTask>) O VERRIDE;
88 88
89 // WebFrameClient methods to support resource loading thru the 'shadow page' . 89 // WebFrameClient methods to support resource loading thru the 'shadow page' .
90 virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) OVERRIDE; 90 virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) OVERRIDE;
91 virtual void didFinishDocumentLoad(WebLocalFrame*) OVERRIDE; 91 virtual void didFinishDocumentLoad(WebLocalFrame*) OVERRIDE;
92 92
(...skipping 25 matching lines...) Expand all
118 118
119 // Creates the shadow loader used for worker network requests. 119 // Creates the shadow loader used for worker network requests.
120 void initializeLoader(const WebURL&); 120 void initializeLoader(const WebURL&);
121 121
122 void didReceiveScriptLoaderResponse(); 122 void didReceiveScriptLoaderResponse();
123 void onScriptLoaderFinished(); 123 void onScriptLoaderFinished();
124 124
125 static void connectTask(ExecutionContext*, PassOwnPtr<WebMessagePortChannel> ); 125 static void connectTask(ExecutionContext*, PassOwnPtr<WebMessagePortChannel> );
126 // Tasks that are run on the main thread. 126 // Tasks that are run on the main thread.
127 void workerGlobalScopeClosedOnMainThread(); 127 void workerGlobalScopeClosedOnMainThread();
128 void workerGlobalScopeDestroyedOnMainThread(); 128 void workerThreadTerminatedOnMainThread();
129 129
130 // 'shadow page' - created to proxy loading requests from the worker. 130 // 'shadow page' - created to proxy loading requests from the worker.
131 RefPtrWillBePersistent<ExecutionContext> m_loadingDocument; 131 RefPtrWillBePersistent<ExecutionContext> m_loadingDocument;
132 WebView* m_webView; 132 WebView* m_webView;
133 WebFrame* m_mainFrame; 133 WebFrame* m_mainFrame;
134 bool m_askedToTerminate; 134 bool m_askedToTerminate;
135 135
136 RefPtr<WorkerThread> m_workerThread; 136 RefPtr<WorkerThread> m_workerThread;
137 137
138 // This one's initialized and bound to the main thread. 138 // This one's initialized and bound to the main thread.
(...skipping 11 matching lines...) Expand all
150 OwnPtr<Loader> m_mainScriptLoader; 150 OwnPtr<Loader> m_mainScriptLoader;
151 WebURL m_url; 151 WebURL m_url;
152 WebString m_name; 152 WebString m_name;
153 WebString m_contentSecurityPolicy; 153 WebString m_contentSecurityPolicy;
154 WebContentSecurityPolicyType m_policyType; 154 WebContentSecurityPolicyType m_policyType;
155 }; 155 };
156 156
157 } // namespace blink 157 } // namespace blink
158 158
159 #endif 159 #endif
OLDNEW
« no previous file with comments | « Source/web/ServiceWorkerGlobalScopeProxy.cpp ('k') | Source/web/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698