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

Side by Side Diff: Source/core/workers/Worker.cpp

Issue 26558004: Revert 158219 "Move dom/*Event* to events to match the DOM vs. E..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1651/
Patch Set: Created 7 years, 2 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/core/workers/Worker.h ('k') | Source/core/workers/WorkerEventQueue.h » ('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, 2010 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008, 2010 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2009 Google Inc. All Rights Reserved. 3 * Copyright (C) 2009 Google Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 12 matching lines...) Expand all
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 * 25 *
26 */ 26 */
27 27
28 #include "config.h" 28 #include "config.h"
29 #include "core/workers/Worker.h" 29 #include "core/workers/Worker.h"
30 30
31 #include "bindings/v8/ExceptionState.h" 31 #include "bindings/v8/ExceptionState.h"
32 #include "core/dom/Document.h" 32 #include "core/dom/Document.h"
33 #include "core/events/EventListener.h" 33 #include "core/dom/EventListener.h"
34 #include "core/events/EventNames.h" 34 #include "core/dom/EventNames.h"
35 #include "core/events/MessageEvent.h" 35 #include "core/dom/MessageEvent.h"
36 #include "core/fetch/ResourceFetcher.h" 36 #include "core/fetch/ResourceFetcher.h"
37 #include "core/inspector/InspectorInstrumentation.h" 37 #include "core/inspector/InspectorInstrumentation.h"
38 #include "core/page/DOMWindow.h" 38 #include "core/page/DOMWindow.h"
39 #include "core/page/UseCounter.h" 39 #include "core/page/UseCounter.h"
40 #include "core/workers/WorkerGlobalScopeProxy.h" 40 #include "core/workers/WorkerGlobalScopeProxy.h"
41 #include "core/workers/WorkerScriptLoader.h" 41 #include "core/workers/WorkerScriptLoader.h"
42 #include "core/workers/WorkerThread.h" 42 #include "core/workers/WorkerThread.h"
43 #include "wtf/MainThread.h" 43 #include "wtf/MainThread.h"
44 44
45 namespace WebCore { 45 namespace WebCore {
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 startMode = PauseWorkerGlobalScopeOnStart; 130 startMode = PauseWorkerGlobalScopeOnStart;
131 m_contextProxy->startWorkerGlobalScope(m_scriptLoader->url(), scriptExec utionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), star tMode); 131 m_contextProxy->startWorkerGlobalScope(m_scriptLoader->url(), scriptExec utionContext()->userAgent(m_scriptLoader->url()), m_scriptLoader->script(), star tMode);
132 InspectorInstrumentation::scriptImported(scriptExecutionContext(), m_scr iptLoader->identifier(), m_scriptLoader->script()); 132 InspectorInstrumentation::scriptImported(scriptExecutionContext(), m_scr iptLoader->identifier(), m_scriptLoader->script());
133 } 133 }
134 m_scriptLoader = nullptr; 134 m_scriptLoader = nullptr;
135 135
136 unsetPendingActivity(this); 136 unsetPendingActivity(this);
137 } 137 }
138 138
139 } // namespace WebCore 139 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/workers/Worker.h ('k') | Source/core/workers/WorkerEventQueue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698