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

Side by Side Diff: Source/bindings/v8/ActiveDOMCallback.cpp

Issue 17648006: Rename WorkerContext to WorkerGlobalScope (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 6 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/bindings/scripts/preprocess_idls.py ('k') | Source/bindings/v8/ScheduledAction.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) 2010. 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2010. 2012 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 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "bindings/v8/ActiveDOMCallback.h" 32 #include "bindings/v8/ActiveDOMCallback.h"
33 33
34 #include "core/dom/ActiveDOMObject.h" 34 #include "core/dom/ActiveDOMObject.h"
35 #include "core/dom/ScriptExecutionContext.h" 35 #include "core/dom/ScriptExecutionContext.h"
36 #include "core/workers/WorkerContext.h" 36 #include "core/workers/WorkerGlobalScope.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 ActiveDOMCallback::ActiveDOMCallback(ScriptExecutionContext* context) 40 ActiveDOMCallback::ActiveDOMCallback(ScriptExecutionContext* context)
41 : ContextLifecycleObserver(context) 41 : ContextLifecycleObserver(context)
42 { 42 {
43 } 43 }
44 44
45 ActiveDOMCallback::~ActiveDOMCallback() 45 ActiveDOMCallback::~ActiveDOMCallback()
46 { 46 {
47 } 47 }
48 48
49 bool ActiveDOMCallback::canInvokeCallback() const 49 bool ActiveDOMCallback::canInvokeCallback() const
50 { 50 {
51 ScriptExecutionContext* context = scriptExecutionContext(); 51 ScriptExecutionContext* context = scriptExecutionContext();
52 return context && !context->activeDOMObjectsAreSuspended() && !context->acti veDOMObjectsAreStopped(); 52 return context && !context->activeDOMObjectsAreSuspended() && !context->acti veDOMObjectsAreStopped();
53 } 53 }
54 54
55 bool ActiveDOMCallback::isScriptControllerTerminating() const 55 bool ActiveDOMCallback::isScriptControllerTerminating() const
56 { 56 {
57 ScriptExecutionContext* context = scriptExecutionContext(); 57 ScriptExecutionContext* context = scriptExecutionContext();
58 if (context && context->isWorkerContext()) { 58 if (context && context->isWorkerGlobalScope()) {
59 WorkerScriptController* scriptController = static_cast<WorkerContext*>(c ontext)->script(); 59 WorkerScriptController* scriptController = static_cast<WorkerGlobalScope *>(context)->script();
60 if (!scriptController || scriptController->isExecutionForbidden() || scr iptController->isExecutionTerminating()) 60 if (!scriptController || scriptController->isExecutionForbidden() || scr iptController->isExecutionTerminating())
61 return true; 61 return true;
62 } 62 }
63 return false; 63 return false;
64 } 64 }
65 65
66 } // namespace WebCore 66 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/scripts/preprocess_idls.py ('k') | Source/bindings/v8/ScheduledAction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698