Roll WebKit DEPS

TBR=dglazkov

Review URL: http://codereview.chromium.org/155278

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20254 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 15 insertions, 11 deletions

diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc
index ab8eef4..e26f614 100644
--- a/webkit/glue/devtools/debugger_agent_impl.cc
+++ b/webkit/glue/devtools/debugger_agent_impl.cc
@@ -33,6 +33,7 @@ using WebCore::String;
 using WebCore::V8ClassIndex;
 using WebCore::V8Custom;
 using WebCore::V8DOMWindow;
+using WebCore::V8DOMWrapper;;
 using WebCore::V8Proxy;
 
 DebuggerAgentImpl::DebuggerAgentImpl(
@@ -104,9 +105,9 @@ void DebuggerAgentImpl::ResetUtilityContext(
       V8Proxy::context(document->frame());
   v8::Handle<v8::Object> window_global = window_context->Global();
   v8::Handle<v8::Object> window_wrapper =
-      V8Proxy::lookupDOMWrapper(V8ClassIndex::DOMWINDOW, window_global);
+      V8DOMWrapper::lookupDOMWrapper(V8ClassIndex::DOMWINDOW, window_global);
 
-  ASSERT(V8Proxy::convertDOMWrapperToNative<DOMWindow>(window_wrapper) ==
+  ASSERT(V8DOMWrapper::convertDOMWrapperToNative<DOMWindow>(window_wrapper) ==
       document->frame()->domWindow());
 
   // Create a new environment using an empty template for the shadow
diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc
index 687afb1..681f621 100644
--- a/webkit/glue/npruntime_util.cc
+++ b/webkit/glue/npruntime_util.cc
@@ -88,6 +88,7 @@ inline v8::Local<v8::Value> GetEvent(const v8::Handle<v8::Context>& context) {
 }
 
 static bool DragEventData(NPObject* npobj, int* event_id, WebDragData* data) {
+  using WebCore::V8DOMWrapper;
   using WebCore::V8Proxy;
 
   if (npobj == NULL)
@@ -102,13 +103,13 @@ static bool DragEventData(NPObject* npobj, int* event_id, WebDragData* data) {
 
   // Get the current WebCore event.
   v8::Handle<v8::Value> current_event(GetEvent(context));
-  WebCore::Event* event = V8Proxy::convertToNativeEvent(current_event);
+  WebCore::Event* event = V8DOMWrapper::convertToNativeEvent(current_event);
   if (event == NULL)
     return false;
 
   // Check that the given npobj is that event.
   V8NPObject* object = reinterpret_cast<V8NPObject*>(npobj);
-  WebCore::Event* given = V8Proxy::convertToNativeEvent(object->v8Object);
+  WebCore::Event* given = V8DOMWrapper::convertToNativeEvent(object->v8Object);
   if (given != event)
     return false;
 
diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc
index a4fb566..b84884b 100644
--- a/webkit/glue/webdevtoolsagent_impl.cc
+++ b/webkit/glue/webdevtoolsagent_impl.cc
@@ -44,6 +44,7 @@ using WebCore::Page;
 using WebCore::ScriptValue;
 using WebCore::String;
 using WebCore::V8ClassIndex;
+using WebCore::V8DOMWrapper;
 using WebCore::V8Proxy;
 using WebKit::WebDataSource;
 using WebKit::WebURLRequest;
@@ -322,7 +323,7 @@ v8::Handle<v8::Value> WebDevToolsAgentImpl::JsGetNodeForId(
   WebDevToolsAgentImpl* agent = static_cast<WebDevToolsAgentImpl*>(
       v8::External::Cast(*args.Data())->Value());
   Node* node = agent->dom_agent_impl_->GetNodeForId(node_id);
-  return V8Proxy::convertToV8Object(V8ClassIndex::NODE, node);
+  return V8DOMWrapper::convertToV8Object(V8ClassIndex::NODE, node);
 }
 
 // static
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 9f92d53..5bb2883 100644
--- a/webkit/glue/webdevtoolsclient_impl.cc
+++ b/webkit/glue/webdevtoolsclient_impl.cc
@@ -262,7 +262,7 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddSourceToFrame(
   if (source_string.isEmpty() || exception_catcher.HasCaught()) {
     return v8::Undefined();
   }
-  Node* node = V8Proxy::convertDOMWrapperToNode<Node>(args[2]);
+  Node* node = V8DOMWrapper::convertDOMWrapperToNode<Node>(args[2]);
   if (!node || !node->attached()) {
     return v8::Undefined();
   }
@@ -281,7 +281,7 @@ v8::Handle<v8::Value> WebDevToolsClientImpl::JsAddResourceSourceToFrame(
   if (mime_type.isEmpty()) {
     return v8::Undefined();
   }
-  Node* node = V8Proxy::convertDOMWrapperToNode<Node>(args[2]);
+  Node* node = V8DOMWrapper::convertDOMWrapperToNode<Node>(args[2]);
   WebDevToolsClientImpl* client = static_cast<WebDevToolsClientImpl*>(
       v8::External::Cast(*args.Data())->Value());
   client->AddResourceSourceToFrame(resource_id, mime_type, node);
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index c941f91..7ec990a 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1613,10 +1613,11 @@ void WebFrameImpl::ExecuteScriptInNewContext(
         sources_in[i].startLine));
   }
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kIsolatedWorld))
-    frame_->script()->evaluateInNewWorld(sources);
-  else
-    frame_->script()->evaluateInNewContext(sources);
+  // OOPS!  Do not check in.
+  // if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kIsolatedWorld))
+  frame_->script()->evaluateInNewWorld(sources);
+  // else
+  //   frame_->script()->evaluateInNewContext(sources);
 }
 
 std::wstring WebFrameImpl::GetName() {