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

Side by Side Diff: Source/core/workers/WorkerGlobalScope.h

Issue 203393002: Revert of Explicit notification and removal of lifecycle observers. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 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
« no previous file with comments | « Source/core/dom/ExecutionContext.cpp ('k') | Source/core/workers/WorkerGlobalScope.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) 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 143
144 virtual const KURL& virtualURL() const OVERRIDE FINAL; 144 virtual const KURL& virtualURL() const OVERRIDE FINAL;
145 virtual KURL virtualCompleteURL(const String&) const OVERRIDE FINAL; 145 virtual KURL virtualCompleteURL(const String&) const OVERRIDE FINAL;
146 146
147 virtual void reportBlockedScriptExecutionToInspector(const String& direc tiveText) OVERRIDE FINAL; 147 virtual void reportBlockedScriptExecutionToInspector(const String& direc tiveText) OVERRIDE FINAL;
148 virtual void addMessage(MessageSource, MessageLevel, const String& messa ge, const String& sourceURL, unsigned lineNumber, ScriptState* = 0) OVERRIDE FIN AL; 148 virtual void addMessage(MessageSource, MessageLevel, const String& messa ge, const String& sourceURL, unsigned lineNumber, ScriptState* = 0) OVERRIDE FIN AL;
149 149
150 virtual EventTarget* errorEventTarget() OVERRIDE FINAL; 150 virtual EventTarget* errorEventTarget() OVERRIDE FINAL;
151 virtual void didUpdateSecurityOrigin() OVERRIDE FINAL { } 151 virtual void didUpdateSecurityOrigin() OVERRIDE FINAL { }
152 152
153 void clearThread() { m_thread = 0; }
154
155 KURL m_url; 153 KURL m_url;
156 String m_userAgent; 154 String m_userAgent;
157 155
158 mutable RefPtrWillBeMember<WorkerConsole> m_console; 156 mutable RefPtrWillBeMember<WorkerConsole> m_console;
159 mutable RefPtrWillBeMember<WorkerLocation> m_location; 157 mutable RefPtrWillBeMember<WorkerLocation> m_location;
160 mutable RefPtrWillBeMember<WorkerNavigator> m_navigator; 158 mutable RefPtrWillBeMember<WorkerNavigator> m_navigator;
161 159
162 OwnPtr<WorkerScriptController> m_script; 160 OwnPtr<WorkerScriptController> m_script;
163 WorkerThread* m_thread; 161 WorkerThread* m_thread;
164 162
165 OwnPtr<WorkerInspectorController> m_workerInspectorController; 163 OwnPtr<WorkerInspectorController> m_workerInspectorController;
166 bool m_closing; 164 bool m_closing;
167 165
168 OwnPtr<WorkerEventQueue> m_eventQueue; 166 OwnPtr<WorkerEventQueue> m_eventQueue;
169 167
170 OwnPtr<WorkerClients> m_workerClients; 168 OwnPtr<WorkerClients> m_workerClients;
171 169
172 double m_timeOrigin; 170 double m_timeOrigin;
173 }; 171 };
174 172
175 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorke rGlobalScope(), context.isWorkerGlobalScope()); 173 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorke rGlobalScope(), context.isWorkerGlobalScope());
176 174
177 } // namespace WebCore 175 } // namespace WebCore
178 176
179 #endif // WorkerGlobalScope_h 177 #endif // WorkerGlobalScope_h
OLDNEW
« no previous file with comments | « Source/core/dom/ExecutionContext.cpp ('k') | Source/core/workers/WorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698