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

9 files changed, 31 insertions, 21 deletions

diff --git a/DEPS b/DEPS
index c0d2e97..e5638f3 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "45652",
+  "webkit_revision": "45659",
 }
 
 
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() {
diff --git a/webkit/port/bindings/v8/NPV8Object.cpp b/webkit/port/bindings/v8/NPV8Object.cpp
index 8b3945e..fa05b4f 100644
--- a/webkit/port/bindings/v8/NPV8Object.cpp
+++ b/webkit/port/bindings/v8/NPV8Object.cpp
@@ -49,6 +49,8 @@ using WebCore::toV8Context;
 using WebCore::toV8Proxy;
 using WebCore::V8ClassIndex;
 using WebCore::V8Custom;
+using WebCore::V8DOMWrapper;
+using WebCore::V8GCController;
 using WebCore::V8Proxy;
 
 // FIXME(mbelshe): comments on why use malloc and free.
@@ -61,7 +63,7 @@ static void FreeV8NPObject(NPObject* npobj)
 {
     V8NPObject *object = reinterpret_cast<V8NPObject*>(npobj);
 #ifndef NDEBUG
-    WebCore::V8GCController::unregisterGlobalHandle(object, object->v8Object);
+    V8GCController::unregisterGlobalHandle(object, object->v8Object);
 #endif
     object->v8Object.Dispose();
     free(object);
@@ -106,7 +108,7 @@ NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, WebCore
         object->GetInternalField(V8Custom::kDOMWrapperTypeIndex)->IsNumber() &&
         object->GetInternalField(V8Custom::kDOMWrapperTypeIndex)->Uint32Value() == V8ClassIndex::NPOBJECT) {
 
-        NPObject* rv = V8Proxy::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, object);
+        NPObject* rv = V8DOMWrapper::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, object);
         NPN_RetainObject(rv);
         return rv;
     }
@@ -114,7 +116,7 @@ NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, WebCore
     V8NPObject* obj = reinterpret_cast<V8NPObject*>(NPN_CreateObject(npp, &V8NPObjectClass));
     obj->v8Object = v8::Persistent<v8::Object>::New(object);
 #ifndef NDEBUG
-    WebCore::V8GCController::registerGlobalHandle(WebCore::NPOBJECT, obj, obj->v8Object);
+    V8GCController::registerGlobalHandle(WebCore::NPOBJECT, obj, obj->v8Object);
 #endif
     obj->rootObject = root;
     return reinterpret_cast<NPObject*>(obj);
diff --git a/webkit/port/bindings/v8/V8NPObject.cpp b/webkit/port/bindings/v8/V8NPObject.cpp
index 09a56d8..572290c 100644
--- a/webkit/port/bindings/v8/V8NPObject.cpp
+++ b/webkit/port/bindings/v8/V8NPObject.cpp
@@ -63,10 +63,10 @@ static v8::Handle<v8::Value> npObjectInvokeImpl(const v8::Arguments& args, Invok
     if (V8HTMLAppletElement::HasInstance(args.Holder()) || V8HTMLEmbedElement::HasInstance(args.Holder())
         || V8HTMLObjectElement::HasInstance(args.Holder())) {
         // The holder object is a subtype of HTMLPlugInElement.
-        HTMLPlugInElement* element = V8Proxy::convertDOMWrapperToNode<HTMLPlugInElement>(args.Holder());
+        HTMLPlugInElement* element = V8DOMWrapper::convertDOMWrapperToNode<HTMLPlugInElement>(args.Holder());
         ScriptInstance scriptInstance = element->getInstance();
         if (scriptInstance)
-            npObject = V8Proxy::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, scriptInstance->instance());
+            npObject = V8DOMWrapper::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, scriptInstance->instance());
         else
             npObject = 0;
     } else {
@@ -75,7 +75,7 @@ static v8::Handle<v8::Value> npObjectInvokeImpl(const v8::Arguments& args, Invok
         if (args.Holder()->InternalFieldCount() != V8Custom::kNPObjectInternalFieldCount)
           return throwError("NPMethod called on non-NPObject", V8Proxy::ReferenceError);
 
-        npObject = V8Proxy::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, args.Holder());
+        npObject = V8DOMWrapper::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, args.Holder());
     }
 
     // Verify that our wrapper wasn't using a NPObject which
@@ -158,7 +158,7 @@ static v8::Handle<v8::Value> npObjectGetProperty(v8::Local<v8::Object> self,
                                                  NPIdentifier identifier,
                                                  v8::Local<v8::Value> key)
 {
-    NPObject* npObject = V8Proxy::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, self);
+    NPObject* npObject = V8DOMWrapper::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, self);
 
     // Verify that our wrapper wasn't using a NPObject which
     // has already been deleted.
@@ -231,7 +231,7 @@ static v8::Handle<v8::Value> npObjectSetProperty(v8::Local<v8::Object> self,
                                                  NPIdentifier identifier,
                                                  v8::Local<v8::Value> value)
 {
-    NPObject* npObject = V8Proxy::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, self);
+    NPObject* npObject = V8DOMWrapper::convertToNativeObject<NPObject>(V8ClassIndex::NPOBJECT, self);
 
     // Verify that our wrapper wasn't using a NPObject which
     // has already been deleted.
@@ -365,7 +365,7 @@ void forgetV8ObjectForNPObject(NPObject* object)
     if (staticNPObjectMap.contains(object)) {
         v8::HandleScope scope;
         v8::Persistent<v8::Object> handle(staticNPObjectMap.get(object));
-        WebCore::V8Proxy::setDOMWrapper(handle, WebCore::V8ClassIndex::NPOBJECT, 0);
+        V8DOMWrapper::setDOMWrapper(handle, WebCore::V8ClassIndex::NPOBJECT, 0);
         staticNPObjectMap.forget(object);
         NPN_ReleaseObject(object);
     }
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 707bfe0..691f430 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2810,3 +2810,7 @@ BUG16237 : LayoutTests/http/tests/security/xssAuditor/object-embed-tag-null-char
 BUG16237 : LayoutTests/http/tests/security/xssAuditor/object-embed-tag.html = FAIL
 BUG16237 : LayoutTests/http/tests/security/xssAuditor/object-tag.html = FAIL
 BUG16237 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-null-char.html = FAIL
+
+// WebKit merge 45652:45659
+BUG16289 : LayoutTests/fast/forms/slider-mouse-events.html = FAIL
+