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

Unified Diff: Source/core/dom/ExecutionContext.cpp

Issue 808563003: Revert of Remove WindowFocusAllowedIndicator and associated code. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@window_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ExecutionContext.cpp
diff --git a/Source/core/dom/ExecutionContext.cpp b/Source/core/dom/ExecutionContext.cpp
index 1335b0caeadcf2b9772ba76988e848be9a984401..240a99d3fe3675b87db24d68d3a251f68b9a4435 100644
--- a/Source/core/dom/ExecutionContext.cpp
+++ b/Source/core/dom/ExecutionContext.cpp
@@ -36,6 +36,7 @@
#include "core/html/PublicURLManager.h"
#include "core/inspector/InspectorInstrumentation.h"
#include "core/inspector/ScriptCallStack.h"
+#include "core/page/WindowFocusAllowedIndicator.h"
#include "core/workers/WorkerGlobalScope.h"
#include "core/workers/WorkerThread.h"
#include "wtf/MainThread.h"
@@ -286,7 +287,10 @@
bool ExecutionContext::isWindowFocusAllowed() const
{
- return m_windowFocusTokens > 0;
+ // FIXME: WindowFocusAllowedIndicator::windowFocusAllowed() is temporary,
+ // it will be removed as soon as WebScopedWindowFocusAllowedIndicator will
+ // be updated to not use WindowFocusAllowedIndicator.
+ return m_windowFocusTokens > 0 || WindowFocusAllowedIndicator::windowFocusAllowed();
}
void ExecutionContext::trace(Visitor* visitor)
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/frame/LocalDOMWindow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698