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

Unified Diff: chrome/renderer/extensions/event_bindings.cc

Issue 7650027: Update Chromium to use new signature for (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more stuff 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/extensions/event_bindings.h ('k') | content/renderer/content_renderer_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/extensions/event_bindings.cc
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index 0d2c344a07bc1504412d06d8c29ebdd6529f612c..1145a521ce8f3927d9538b50f998b515ac3b2b49 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -287,17 +287,18 @@ static void ContextWeakReferenceCallback(v8::Persistent<v8::Value> context,
void EventBindings::HandleContextCreated(
WebFrame* frame,
- bool content_script,
- ExtensionDispatcher* extension_dispatcher) {
+ v8::Handle<v8::Context> context,
+ ExtensionDispatcher* extension_dispatcher,
+ int isolated_world_id) {
if (!bindings_registered)
return;
+ bool content_script = isolated_world_id == 0;
+
v8::HandleScope handle_scope;
ContextList& contexts = GetContexts();
- v8::Local<v8::Context> frame_context = frame->mainWorldScriptContext();
- v8::Local<v8::Context> context = v8::Context::GetCurrent();
- DCHECK(!context.IsEmpty());
- DCHECK(bindings_utils::FindContext(context) == contexts.end());
+ // v8::Local<v8::Context> frame_context = frame->mainWorldScriptContext();
+ // v8::Local<v8::Context> context = v8::Context::GetCurrent();
Matt Perry 2011/08/15 22:22:18 kill dead code
// Figure out the frame's URL. If the frame is loading, use its provisional
// URL, since we get this notification before commit.
@@ -315,7 +316,6 @@ void EventBindings::HandleContextCreated(
// frames.
// (Unless we're in unit tests, in which case we don't care what the URL
// is).
- DCHECK(frame_context.IsEmpty() || frame_context == context);
if (!in_unit_tests)
return;
@@ -329,7 +329,6 @@ void EventBindings::HandleContextCreated(
WebFrame* parent_frame = NULL;
if (content_script) {
- DCHECK(frame_context != context);
parent_frame = frame;
// Content script contexts can get GCed before their frame goes away, so
// set up a GC callback.
« no previous file with comments | « chrome/renderer/extensions/event_bindings.h ('k') | content/renderer/content_renderer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698