Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm - Issue 7734002: Merge 93732

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/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

Issue 7734002: Merge 93732 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 4 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:

Index: Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

===================================================================

--- Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (revision 93738)

+++ Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm (working copy)

@@ -691,7 +691,9 @@

NSURL *URL = [pluginRequest->request() URL];

NSString *JSString = [URL _webkit_scriptIfJavaScriptURL];

ASSERT(JSString);

+ RefPtr<NetscapePluginInstanceProxy> protect(this); // Executing arbitrary JavaScript can destroy the proxy.

NSString *result = [[m_pluginView webFrame] _stringByEvaluatingJavaScriptFromString:JSString forceUserGesture:pluginRequest->allowPopups()];

// Don't continue if stringByEvaluatingJavaScriptFromString caused the plug-in to stop.

« no previous file with comments | « LayoutTests/platform/wk2/Skipped ('k') | Source/WebKit/mac/WebView/WebFrame.mm » ('j') | no next file with comments »