diff options
| author | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 15:31:53 +0000 |
|---|---|---|
| committer | japhet@chromium.org <japhet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-29 15:31:53 +0000 |
| commit | 162daa054276523dcbab30cb6c227f16abfd9c3b (patch) | |
| tree | fee6a2aef24156a90f3918d36e052a525321dde1 /webkit/glue/npruntime_util.cc | |
| parent | d5d7ebfc24f9a90183cc8bfd16243d604b35730f (diff) | |
| download | chromium_src-162daa054276523dcbab30cb6c227f16abfd9c3b.zip chromium_src-162daa054276523dcbab30cb6c227f16abfd9c3b.tar.gz chromium_src-162daa054276523dcbab30cb6c227f16abfd9c3b.tar.bz2 | |
Use upstream V8Proxy and V8Utilities
BUG=15459
TEST=none
Review URL: http://codereview.chromium.org/149086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19488 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/npruntime_util.cc')
| -rw-r--r-- | webkit/glue/npruntime_util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/glue/npruntime_util.cc b/webkit/glue/npruntime_util.cc index f1c23eb..687afb1 100644 --- a/webkit/glue/npruntime_util.cc +++ b/webkit/glue/npruntime_util.cc @@ -13,7 +13,7 @@ #include "MouseEvent.h" #include "NPV8Object.h" // for PrivateIdentifier #include "V8Helpers.h" -#include "v8_proxy.h" +#include "V8Proxy.h" #elif USE(JAVASCRIPTCORE_BINDINGS) #include "bridge/c/c_utility.h" #endif @@ -102,20 +102,20 @@ 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::ToNativeEvent(current_event); + WebCore::Event* event = V8Proxy::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::ToNativeEvent(object->v8Object); + WebCore::Event* given = V8Proxy::convertToNativeEvent(object->v8Object); if (given != event) return false; // Check the execution frames are same origin. V8Proxy* current = V8Proxy::retrieve(V8Proxy::retrieveFrame()); WebCore::Frame* frame = V8Proxy::retrieveFrame(context); - if (!current || !current->CanAccessFrame(frame, false)) + if (!current || !current->canAccessFrame(frame, false)) return false; const WebCore::EventNames& event_names(WebCore::eventNames()); |