Source/bindings/core/v8/NPV8Object.cpp - Issue 854453003: Revert of Revert of Reland factor out window proxy management portions of ScriptController.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/bindings/core/v8/NPV8Object.cpp

Issue 854453003: Revert of Revert of Reland factor out window proxy management portions of ScriptController. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebase and deflake test Created 5 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/fast/dom/defaultView-on-detached-document-expected.txt ('k') | Source/bindings/core/v8/ScriptController.h » ('j') | Source/bindings/core/v8/WindowProxyManager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/bindings/core/v8/NPV8Object.cpp

diff --git a/Source/bindings/core/v8/NPV8Object.cpp b/Source/bindings/core/v8/NPV8Object.cpp

index 22f5931b11972f514a52372b77c585747a34c360..6db91ed61db76b81029da21c1b54e55dcfe49624 100644

--- a/Source/bindings/core/v8/NPV8Object.cpp

+++ b/Source/bindings/core/v8/NPV8Object.cpp

@@ -40,6 +40,7 @@

#include "bindings/core/v8/npruntime_priv.h"

#include "core/frame/LocalDOMWindow.h"

#include "core/frame/LocalFrame.h"

+#include "platform/ScriptForbiddenScope.h"

#include "platform/UserGestureIndicator.h"

#include "wtf/OwnPtr.h"

#include "wtf/StringExtras.h"

@@ -342,6 +343,9 @@ bool _NPN_Evaluate(NPP npp, NPObject* npObject, NPString* npScript, NPVariant* r

bool _NPN_EvaluateHelper(NPP npp, bool popupsAllowed, NPObject* npObject, NPString* npScript, NPVariant* result)

{

VOID_TO_NPVARIANT(*result);

+ if (ScriptForbiddenScope::isScriptForbidden())

+ return false;

if (!npObject)

return false;