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

Side by Side Diff: Source/bindings/v8/V8WorkerGlobalScopeEventListener.cpp

Issue 23788005: Remove calls to HandleScope default ctor. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: code review (pfeldman) Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/bindings/v8/V8PerContextData.cpp ('k') | Source/bindings/v8/WorkerScriptController.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 void V8WorkerGlobalScopeEventListener::handleEvent(ScriptExecutionContext* conte xt, Event* event) 52 void V8WorkerGlobalScopeEventListener::handleEvent(ScriptExecutionContext* conte xt, Event* event)
53 { 53 {
54 if (!context) 54 if (!context)
55 return; 55 return;
56 56
57 // The callback function on XMLHttpRequest can clear the event listener and destroys 'this' object. Keep a local reference to it. 57 // The callback function on XMLHttpRequest can clear the event listener and destroys 'this' object. Keep a local reference to it.
58 // See issue 889829. 58 // See issue 889829.
59 RefPtr<V8AbstractEventListener> protect(this); 59 RefPtr<V8AbstractEventListener> protect(this);
60 60
61 v8::HandleScope handleScope; 61 v8::Isolate* isolate = getIsolateFromScriptExecutionContext(context);
62 v8::HandleScope handleScope(isolate);
62 63
63 WorkerScriptController* script = toWorkerGlobalScope(context)->script(); 64 WorkerScriptController* script = toWorkerGlobalScope(context)->script();
64 if (!script) 65 if (!script)
65 return; 66 return;
66 67
67 v8::Handle<v8::Context> v8Context = script->context(); 68 v8::Handle<v8::Context> v8Context = script->context();
68 if (v8Context.IsEmpty()) 69 if (v8Context.IsEmpty())
69 return; 70 return;
70 71
71 // Enter the V8 context in which to perform the event handling. 72 // Enter the V8 context in which to perform the event handling.
72 v8::Context::Scope scope(v8Context); 73 v8::Context::Scope scope(v8Context);
73 74
74 // Get the V8 wrapper for the event object. 75 // Get the V8 wrapper for the event object.
75 v8::Isolate* isolate = v8Context->GetIsolate();
76 v8::Handle<v8::Value> jsEvent = toV8(event, v8::Handle<v8::Object>(), isolat e); 76 v8::Handle<v8::Value> jsEvent = toV8(event, v8::Handle<v8::Object>(), isolat e);
77 77
78 invokeEventHandler(context, event, v8::Local<v8::Value>::New(isolate, jsEven t)); 78 invokeEventHandler(context, event, v8::Local<v8::Value>::New(isolate, jsEven t));
79 } 79 }
80 80
81 v8::Local<v8::Value> V8WorkerGlobalScopeEventListener::callListenerFunction(Scri ptExecutionContext* context, v8::Handle<v8::Value> jsEvent, Event* event) 81 v8::Local<v8::Value> V8WorkerGlobalScopeEventListener::callListenerFunction(Scri ptExecutionContext* context, v8::Handle<v8::Value> jsEvent, Event* event)
82 { 82 {
83 v8::Local<v8::Function> handlerFunction = getListenerFunction(context); 83 v8::Local<v8::Function> handlerFunction = getListenerFunction(context);
84 v8::Local<v8::Object> receiver = getReceiverObject(context, event); 84 v8::Local<v8::Object> receiver = getReceiverObject(context, event);
85 if (handlerFunction.IsEmpty() || receiver.IsEmpty()) 85 if (handlerFunction.IsEmpty() || receiver.IsEmpty())
(...skipping 27 matching lines...) Expand all
113 return listener; 113 return listener;
114 114
115 EventTarget* target = event->currentTarget(); 115 EventTarget* target = event->currentTarget();
116 v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>(), toV8Con text(context, world())->GetIsolate()); 116 v8::Handle<v8::Value> value = toV8(target, v8::Handle<v8::Object>(), toV8Con text(context, world())->GetIsolate());
117 if (value.IsEmpty()) 117 if (value.IsEmpty())
118 return v8::Local<v8::Object>(); 118 return v8::Local<v8::Object>();
119 return v8::Local<v8::Object>::New(v8::Handle<v8::Object>::Cast(value)); 119 return v8::Local<v8::Object>::New(v8::Handle<v8::Object>::Cast(value));
120 } 120 }
121 121
122 } // namespace WebCore 122 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/bindings/v8/V8PerContextData.cpp ('k') | Source/bindings/v8/WorkerScriptController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698