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

Side by Side Diff: Source/core/dom/ExecutionContext.cpp

Issue 777483004: Bind Window focus ability to the ExecutionContext instead of the process. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@sw_client_focus
Patch Set: Created 6 years 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) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2012 Google Inc. All Rights Reserved. 3 * Copyright (C) 2012 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 18 matching lines...) Expand all
29 #include "core/dom/ExecutionContext.h" 29 #include "core/dom/ExecutionContext.h"
30 30
31 #include "core/dom/AddConsoleMessageTask.h" 31 #include "core/dom/AddConsoleMessageTask.h"
32 #include "core/dom/ContextLifecycleNotifier.h" 32 #include "core/dom/ContextLifecycleNotifier.h"
33 #include "core/dom/ExecutionContextTask.h" 33 #include "core/dom/ExecutionContextTask.h"
34 #include "core/events/ErrorEvent.h" 34 #include "core/events/ErrorEvent.h"
35 #include "core/events/EventTarget.h" 35 #include "core/events/EventTarget.h"
36 #include "core/html/PublicURLManager.h" 36 #include "core/html/PublicURLManager.h"
37 #include "core/inspector/InspectorInstrumentation.h" 37 #include "core/inspector/InspectorInstrumentation.h"
38 #include "core/inspector/ScriptCallStack.h" 38 #include "core/inspector/ScriptCallStack.h"
39 #include "core/page/WindowFocusAllowedIndicator.h"
39 #include "core/workers/WorkerGlobalScope.h" 40 #include "core/workers/WorkerGlobalScope.h"
40 #include "core/workers/WorkerThread.h" 41 #include "core/workers/WorkerThread.h"
41 #include "wtf/MainThread.h" 42 #include "wtf/MainThread.h"
42 43
43 namespace blink { 44 namespace blink {
44 45
45 class ExecutionContext::PendingException : public NoBaseWillBeGarbageCollectedFi nalized<ExecutionContext::PendingException> { 46 class ExecutionContext::PendingException : public NoBaseWillBeGarbageCollectedFi nalized<ExecutionContext::PendingException> {
46 WTF_MAKE_NONCOPYABLE(PendingException); 47 WTF_MAKE_NONCOPYABLE(PendingException);
47 public: 48 public:
48 PendingException(const String& errorMessage, int lineNumber, int columnNumbe r, int scriptId, const String& sourceURL, PassRefPtrWillBeRawPtr<ScriptCallStack > callStack) 49 PendingException(const String& errorMessage, int lineNumber, int columnNumbe r, int scriptId, const String& sourceURL, PassRefPtrWillBeRawPtr<ScriptCallStack > callStack)
(...skipping 17 matching lines...) Expand all
66 RefPtrWillBeMember<ScriptCallStack> m_callStack; 67 RefPtrWillBeMember<ScriptCallStack> m_callStack;
67 }; 68 };
68 69
69 ExecutionContext::ExecutionContext() 70 ExecutionContext::ExecutionContext()
70 : m_sandboxFlags(SandboxNone) 71 : m_sandboxFlags(SandboxNone)
71 , m_circularSequentialID(0) 72 , m_circularSequentialID(0)
72 , m_timerNestingLevel(0) 73 , m_timerNestingLevel(0)
73 , m_inDispatchErrorEvent(false) 74 , m_inDispatchErrorEvent(false)
74 , m_activeDOMObjectsAreSuspended(false) 75 , m_activeDOMObjectsAreSuspended(false)
75 , m_activeDOMObjectsAreStopped(false) 76 , m_activeDOMObjectsAreStopped(false)
77 , m_windowFocusTokens(0)
76 { 78 {
77 } 79 }
78 80
79 ExecutionContext::~ExecutionContext() 81 ExecutionContext::~ExecutionContext()
80 { 82 {
81 } 83 }
82 84
83 bool ExecutionContext::hasPendingActivity() 85 bool ExecutionContext::hasPendingActivity()
84 { 86 {
85 return lifecycleNotifier().hasPendingActivity(); 87 return lifecycleNotifier().hasPendingActivity();
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 { 266 {
265 m_sandboxFlags |= mask; 267 m_sandboxFlags |= mask;
266 268
267 // The SandboxOrigin is stored redundantly in the security origin. 269 // The SandboxOrigin is stored redundantly in the security origin.
268 if (isSandboxed(SandboxOrigin) && securityContext().securityOrigin() && !sec urityContext().securityOrigin()->isUnique()) { 270 if (isSandboxed(SandboxOrigin) && securityContext().securityOrigin() && !sec urityContext().securityOrigin()->isUnique()) {
269 securityContext().setSecurityOrigin(SecurityOrigin::createUnique()); 271 securityContext().setSecurityOrigin(SecurityOrigin::createUnique());
270 didUpdateSecurityOrigin(); 272 didUpdateSecurityOrigin();
271 } 273 }
272 } 274 }
273 275
276 void ExecutionContext::allowWindowFocus()
277 {
278 ++m_windowFocusTokens;
279 }
280
281 void ExecutionContext::consumeWindowFocus()
282 {
283 if (m_windowFocusTokens == 0)
284 return;
285 --m_windowFocusTokens;
286 }
287
288 bool ExecutionContext::isWindowFocusAllowed() const
289 {
290 // FIXME: WindowFocusAllowedIndicator::windowFocusAllowed() is temporary,
291 // it will be removed as soon as WebScopedWindowFocusAllowedIndicator will
292 // be updated to not use WindowFocusAllowedIndicator.
293 return m_windowFocusTokens > 0 || WindowFocusAllowedIndicator::windowFocusAl lowed();
294 }
295
274 void ExecutionContext::trace(Visitor* visitor) 296 void ExecutionContext::trace(Visitor* visitor)
275 { 297 {
276 #if ENABLE(OILPAN) 298 #if ENABLE(OILPAN)
277 visitor->trace(m_pendingExceptions); 299 visitor->trace(m_pendingExceptions);
278 visitor->trace(m_publicURLManager); 300 visitor->trace(m_publicURLManager);
279 visitor->trace(m_timeouts); 301 visitor->trace(m_timeouts);
280 HeapSupplementable<ExecutionContext>::trace(visitor); 302 HeapSupplementable<ExecutionContext>::trace(visitor);
281 #endif 303 #endif
282 LifecycleContext<ExecutionContext>::trace(visitor); 304 LifecycleContext<ExecutionContext>::trace(visitor);
283 } 305 }
284 306
285 } // namespace blink 307 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698