Make all content scripts from an extension run in the same

webkit/glue/webframe_impl.cc

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 610 matching lines @@
   for (unsigned i = 0; i < num_sources; ++i) {
     sources.append(WebCore::ScriptSourceCode(
         webkit_glue::WebStringToString(sources_in[i].code),
         webkit_glue::WebURLToKURL(sources_in[i].url),
         sources_in[i].startLine));
   }
 
   frame_->script()->evaluateInNewContext(sources, extension_group);
 }
 
-void WebFrameImpl::executeScriptInNewWorld(
-    const WebScriptSource* sources_in, unsigned num_sources,
+void WebFrameImpl::executeScriptInIsolatedWorld(
+    int world_id, const WebScriptSource* sources_in, unsigned num_sources,
     int extension_group) {
   Vector<WebCore::ScriptSourceCode> sources;
 
   for (unsigned i = 0; i < num_sources; ++i) {
     sources.append(WebCore::ScriptSourceCode(
         webkit_glue::WebStringToString(sources_in[i].code),
         webkit_glue::WebURLToKURL(sources_in[i].url),
         sources_in[i].startLine));
   }
 
-  frame_->script()->evaluateInNewWorld(sources, extension_group);
+  frame_->script()->evaluateInIsolatedWorld(world_id, sources, extension_group);
 }
 
 void WebFrameImpl::addMessageToConsole(const WebConsoleMessage& message) {
   ASSERT(frame());
 
   WebCore::MessageLevel webcore_message_level;
   switch (message.level) {
     case WebConsoleMessage::LevelTip:
       webcore_message_level = WebCore::TipMessageLevel;
       break;
@@ skipping 1246 matching lines @@
 
   SecurityOrigin* security_origin = frame_->document()->securityOrigin();
 
   if (!frame_->redirectScheduler()->locationChangePending()) {
     frame_->loader()->stopAllLoaders();
     frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
     frame_->loader()->write(script_result);
     frame_->loader()->end();
   }
 }