diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 01:09:12 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 01:09:12 +0000 |
| commit | 46fc912073cc67de0e21ac4e3bc7db33980d2376 (patch) | |
| tree | 2207a5ba24fe5c3e9612e0cb6971e21df5cb53c2 /webkit | |
| parent | ef5c339e3ef0b1e3dc53e1b33fd19ac57fec4486 (diff) | |
| download | chromium_src-46fc912073cc67de0e21ac4e3bc7db33980d2376.zip chromium_src-46fc912073cc67de0e21ac4e3bc7db33980d2376.tar.gz chromium_src-46fc912073cc67de0e21ac4e3bc7db33980d2376.tar.bz2 | |
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
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/devtools/debugger_agent_impl.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webdevtoolsfrontend_impl.cc | 7 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc index dcac55a..2f2864a 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 0eb9399..cce10b53 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 da50da7..a361f5b 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 |