Use upstream V8Proxy and V8Utilities

webkit/glue/npruntime_util.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "webkit/glue/npruntime_util.h"
 
 #if USE(V8_BINDING)
 #include "ChromiumDataObject.h"
 #include "ClipboardChromium.h"
 #include "EventNames.h"
 #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
 
 #undef LOG
 
 #include "base/pickle.h"
 #if USE(V8_BINDING)
 #include "webkit/api/public/WebDragData.h"
 #include "webkit/glue/glue_util.h"
@@ skipping 68 matching lines @@
   if (npobj->_class != npScriptObjectClass)
     return false;
 
   v8::HandleScope handle_scope;
   v8::Handle<v8::Context> context = v8::Context::GetEntered();
   if (context.IsEmpty())
     return false;
 
   // 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());
   const WebCore::AtomicString& event_type(event->type());
 
   enum DragTargetMouseEventId {
     DragEnterId = 1, DragOverId = 2, DragLeaveId = 3, DropId = 4
   };
 
   // The event type should be a drag event.
@@ skipping 44 matching lines @@
 #if USE(V8)
   int event_id;
   return DragEventData(event, &event_id, NULL);  // Check the event only.
 #else
   // Not supported on other ports (JSC, etc).
   return false;
 #endif
 }
 
 }  // namespace webkit_glue