From 46fc912073cc67de0e21ac4e3bc7db33980d2376 Mon Sep 17 00:00:00 2001
From: "japhet@chromium.org"
 <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 15 Jan 2010 01:09:12 +0000
Subject: [PATCH] WebKit DEPS roll to 53290 and canary fix.

BUG=none
TEST=none
TBR=atwilson

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36320 0039d316-1c4b-4281-b951-d872f2087c98
---
 DEPS                                            | 2 +-
 webkit/glue/devtools/debugger_agent_impl.cc     | 3 +--
 webkit/glue/webdevtoolsfrontend_impl.cc         | 7 ++++---
 webkit/tools/layout_tests/test_expectations.txt | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/DEPS b/DEPS
index cc13da893522..6178336241ae 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "53289",
+  "webkit_revision": "53290",
   "ffmpeg_revision": "34297",
   "skia_revision": "470",
   "chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc
index dcac55aa1473..2f2864a31e83 100644
--- a/webkit/glue/devtools/debugger_agent_impl.cc
+++ b/webkit/glue/devtools/debugger_agent_impl.cc
@@ -74,8 +74,7 @@ void DebuggerAgentImpl::CreateUtilityContext(
   v8::Handle<v8::Object> window_wrapper =
       V8DOMWrapper::lookupDOMWrapper(V8ClassIndex::DOMWINDOW, window_global);
 
-  ASSERT(V8DOMWrapper::convertDOMWrapperToNative<DOMWindow>(window_wrapper) ==
-      frame->domWindow());
+  ASSERT(V8DOMWindow::toNative(window_wrapper) == frame->domWindow());
 
   v8::Handle<v8::ObjectTemplate> global_template = v8::ObjectTemplate::New();
 
diff --git a/webkit/glue/webdevtoolsfrontend_impl.cc b/webkit/glue/webdevtoolsfrontend_impl.cc
index 0eb9399d0fb7..cce10b53a4a3 100644
--- a/webkit/glue/webdevtoolsfrontend_impl.cc
+++ b/webkit/glue/webdevtoolsfrontend_impl.cc
@@ -24,6 +24,7 @@
 #include "V8CustomBinding.h"
 #include "V8DOMWrapper.h"
 #include "V8InspectorFrontendHost.h"
+#include "V8Node.h"
 #include "V8Proxy.h"
 #include "V8Utilities.h"
 #include <wtf/OwnPtr.h>
@@ -338,7 +339,7 @@ v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsAddSourceToFrame(
     return v8::Undefined();
   }
   v8::Handle<v8::Object> wrapper = v8::Handle<v8::Object>::Cast(args[2]);
-  Node* node = V8DOMWrapper::convertDOMWrapperToNode<Node>(wrapper);
+  Node* node = V8Node::toNative(wrapper);
   if (!node || !node->attached()) {
     return v8::Undefined();
   }
@@ -358,7 +359,7 @@ v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsAddResourceSourceToFrame(
     return v8::Undefined();
   }
   v8::Handle<v8::Object> wrapper = v8::Handle<v8::Object>::Cast(args[2]);
-  Node* node = V8DOMWrapper::convertDOMWrapperToNode<Node>(wrapper);
+  Node* node = V8Node::toNative(wrapper);
   WebDevToolsFrontendImpl* frontend = static_cast<WebDevToolsFrontendImpl*>(
       v8::External::Cast(*args.Data())->Value());
   frontend->AddResourceSourceToFrame(resource_id, mime_type, node);
@@ -506,7 +507,7 @@ v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsShowContextMenu(
   if (V8DOMWrapper::domWrapperType(event_wrapper) != V8ClassIndex::EVENT)
     return v8::Undefined();
 
-  Event* event = V8DOMWrapper::convertDOMWrapperToNative<Event>(event_wrapper);
+  Event* event = V8Event::toNative(event_wrapper);
   if (!args[1]->IsArray())
     return v8::Undefined();
 
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index da50da72c9d3..a361f5b6bb06 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -3076,6 +3076,7 @@ BUG_ATWILSON MAC : svg/custom/resource-invalidate-on-target-update.svg = IMAGE P
 
 // Bugs from rolling from 53275:53289
 BUG32305 : fast/loader/onload-willSendRequest-null-for-frame.html = TEXT
-BUG32307 : fast/css/non-standard-checkbox-size.html = IMAGE+TEXT
+BUG32307 : fast/css/non-standard-checkbox-size.html = IMAGE+TEXT TEXT
 
 BUG32308 DEBUG : fast/frames/cached-frame-counter.html = TIMEOUT
+BUG_JAPHET DEBUG : fast/events/drag-and-drop.html = CRASH
-- 
2.11.4.GIT