1 files changed, 16 insertions, 6 deletions
diff --git a/WebKit/chromium/src/WebBindings.cpp b/WebKit/chromium/src/WebBindings.cpp
index 04f2f85..3aaebfd 100644
--- a/WebKit/chromium/src/WebBindings.cpp
+++ b/WebKit/chromium/src/WebBindings.cpp
@@ -34,9 +34,6 @@
 #include "npruntime_impl.h"
 #include "npruntime_priv.h"
 
-#include "../public/WebDragData.h"
-#include "../public/WebRange.h"
-
 #if USE(V8)
 #include "ChromiumDataObject.h"
 #include "ClipboardChromium.h"
@@ -48,11 +45,15 @@
 #include "V8DOMWrapper.h"
 #include "V8Event.h"
 #include "V8Helpers.h"
+#include "V8HiddenPropertyName.h"
+#include "V8NPUtils.h"
 #include "V8Proxy.h"
 #include "V8Range.h"
 #elif USE(JSC)
 #include "bridge/c/c_utility.h"
 #endif
+#include "WebDragData.h"
+#include "WebRange.h"
 
 #if USE(JAVASCRIPTCORE_BINDINGS)
 using JSC::Bindings::PrivateIdentifier;
@@ -208,8 +209,7 @@ void WebBindings::extractIdentifierData(const NPIdentifier& identifier, const NP
 
 static v8::Local<v8::Value> getEvent(const v8::Handle<v8::Context>& context)
 {
-    static v8::Persistent<v8::String> eventSymbol(v8::Persistent<v8::String>::New(v8::String::NewSymbol("event")));
-    return context->Global()->GetHiddenValue(eventSymbol);
+    return context->Global()->GetHiddenValue(V8HiddenPropertyName::event());
 }
 
 static bool getDragDataImpl(NPObject* npobj, int* eventId, WebDragData* data)
@@ -284,7 +284,7 @@ static bool getRangeImpl(NPObject* npobj, WebRange* range)
 {
     V8NPObject* v8npobject = reinterpret_cast<V8NPObject*>(npobj);
     v8::Handle<v8::Object> v8object(v8npobject->v8Object);
-    if (V8ClassIndex::RANGE != V8DOMWrapper::domWrapperType(v8object))
+    if (!V8Range::info.equals(V8DOMWrapper::domWrapperType(v8object)))
         return false;
 
     Range* native = V8Range::toNative(v8object);
@@ -323,4 +323,14 @@ bool WebBindings::getRange(NPObject* range, WebRange* webrange)
 #endif
 }
 
+void WebBindings::pushExceptionHandler(ExceptionHandler handler, void* data)
+{
+    WebCore::pushExceptionHandler(handler, data);
+}
+
+void WebBindings::popExceptionHandler()
+{
+    WebCore::popExceptionHandler();
+}
+
 } // namespace WebKit