Enable isolated worlds for content scripts....

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 1586 matching lines @@
     const WebScriptSource* sources_in, int num_sources) {
   Vector<WebCore::ScriptSourceCode> sources;
 
   for (int 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));
   }
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kIsolatedWorld))
-    frame_->script()->evaluateInNewWorld(sources);
-  else
-    frame_->script()->evaluateInNewContext(sources);
+  frame_->script()->evaluateInNewContext(sources);
+}
+
+void WebFrameImpl::ExecuteScriptInNewWorld(
+    const WebScriptSource* sources_in, int num_sources) {
+  Vector<WebCore::ScriptSourceCode> sources;
+
+  for (int 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);
 }
 
 std::wstring WebFrameImpl::GetName() {
   return webkit_glue::StringToStdWString(frame_->tree()->name());
 }
 
 WebTextInput* WebFrameImpl::GetTextInput() {
   if (!webtextinput_impl_.get()) {
     webtextinput_impl_.reset(new WebTextInputImpl(this));
   }
@@ skipping 197 matching lines @@
 
   SecurityOrigin* security_origin = frame_->document()->securityOrigin();
 
   if (!frame_->loader()->isScheduledLocationChangePending()) {
     frame_->loader()->stopAllLoaders();
     frame_->loader()->begin(frame_->loader()->url(), true, security_origin);
     frame_->loader()->write(script_result);
     frame_->loader()->end();
   }
 }