Run content scripts in their own isolated world.

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 113 matching lines @@
 #include "SkiaUtils.h"
 #include "SubstituteData.h"
 #include "TextIterator.h"
 #include "TextAffinity.h"
 #include "XPathResult.h"
 
 MSVC_POP_WARNING();
 
 #undef LOG
 
+#include "base/base_switches.h"
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/bitmap_platform_device.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/api/public/WebConsoleMessage.h"
 #include "webkit/api/public/WebFindOptions.h"
@@ skipping 1543 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));
   }
 
-  frame_->script()->evaluateInNewContext(sources);
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kIsolatedWorld))
+    frame_->script()->evaluateInNewWorld(sources);
+  else
+    frame_->script()->evaluateInNewContext(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 210 matching lines @@
   return password_listeners_.get(input_element);
 }
 
 void WebFrameImpl::ClearPasswordListeners() {
   for (PasswordListenerMap::iterator iter = password_listeners_.begin();
        iter != password_listeners_.end(); ++iter) {
     delete iter->second;
   }
   password_listeners_.clear();
 }