Index: Source/bindings/core/v8/V8NPObject.cpp |
diff --git a/Source/bindings/v8/V8NPObject.cpp b/Source/bindings/core/v8/V8NPObject.cpp |
similarity index 97% |
rename from Source/bindings/v8/V8NPObject.cpp |
rename to Source/bindings/core/v8/V8NPObject.cpp |
index a16369915c4ed904adee43f53eaf7e68e76f8796..234b75e1723f7c7f0f315791049017887e7c7cc9 100644 |
--- a/Source/bindings/v8/V8NPObject.cpp |
+++ b/Source/bindings/core/v8/V8NPObject.cpp |
@@ -30,18 +30,18 @@ |
#include "config.h" |
-#include "bindings/v8/V8NPObject.h" |
+#include "bindings/core/v8/V8NPObject.h" |
+#include "bindings/core/v8/NPV8Object.h" |
+#include "bindings/core/v8/V8Binding.h" |
#include "bindings/core/v8/V8HTMLAppletElement.h" |
#include "bindings/core/v8/V8HTMLEmbedElement.h" |
#include "bindings/core/v8/V8HTMLObjectElement.h" |
-#include "bindings/v8/NPV8Object.h" |
-#include "bindings/v8/V8Binding.h" |
-#include "bindings/v8/V8NPUtils.h" |
-#include "bindings/v8/V8ObjectConstructor.h" |
-#include "bindings/v8/V8PersistentValueMap.h" |
-#include "bindings/v8/npruntime_impl.h" |
-#include "bindings/v8/npruntime_priv.h" |
+#include "bindings/core/v8/V8NPUtils.h" |
+#include "bindings/core/v8/V8ObjectConstructor.h" |
+#include "bindings/core/v8/V8PersistentValueMap.h" |
+#include "bindings/core/v8/npruntime_impl.h" |
+#include "bindings/core/v8/npruntime_priv.h" |
#include "core/html/HTMLPlugInElement.h" |
#include "v8-util.h" |
#include "wtf/OwnPtr.h" |
@@ -84,8 +84,9 @@ static void npObjectInvokeImpl(const v8::FunctionCallbackInfo<v8::Value>& info, |
if (RefPtr<SharedPersistent<v8::Object> > wrapper = element->pluginWrapper()) { |
v8::HandleScope handleScope(isolate); |
npObject = v8ObjectToNPObject(wrapper->newLocal(isolate)); |
- } else |
+ } else { |
npObject = 0; |
+ } |
} else { |
// The holder object is not a subtype of HTMLPlugInElement, it must be an NPObject which has three |
// internal fields. |
@@ -322,7 +323,7 @@ static v8::Handle<v8::Value> npObjectSetProperty(v8::Local<v8::Object> self, NPI |
// Verify that our wrapper wasn't using a NPObject which has already been deleted. |
if (!npObject || !_NPN_IsAlive(npObject)) { |
throwError(v8ReferenceError, "NPObject deleted", isolate); |
- return value; // Intercepted, but an exception was thrown. |
+ return value; // Intercepted, but an exception was thrown. |
} |
if (npObject->_class->hasProperty && npObject->_class->setProperty && npObject->_class->hasProperty(npObject, identifier)) { |