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

Unified Diff: Source/WebCore/bindings/v8/PageScriptDebugServer.cpp

Issue 9340005: Merge 106846 - Before accessing a frame's script controller in V8 bindings, first check that the ... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 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 | « no previous file | Source/WebCore/bindings/v8/ScheduledAction.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/bindings/v8/PageScriptDebugServer.cpp
===================================================================
--- Source/WebCore/bindings/v8/PageScriptDebugServer.cpp (revision 106847)
+++ Source/WebCore/bindings/v8/PageScriptDebugServer.cpp (working copy)
@@ -76,10 +76,12 @@
void PageScriptDebugServer::addListener(ScriptDebugListener* listener, Page* page)
{
+ V8Proxy* proxy = V8Proxy::retrieve(page->mainFrame());
+ if (!proxy)
+ return;
ScriptController* scriptController = page->mainFrame()->script();
if (!scriptController->canExecuteScripts(NotAboutToExecuteScript))
return;
- V8Proxy* proxy = V8Proxy::retrieve(page->mainFrame());
v8::HandleScope scope;
v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
« no previous file with comments | « no previous file | Source/WebCore/bindings/v8/ScheduledAction.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698