| Index: Source/bindings/v8/V8NPObject.cpp
|
| diff --git a/Source/bindings/v8/V8NPObject.cpp b/Source/bindings/v8/V8NPObject.cpp
|
| index aa96fd0e4e3cb36158b2039666f032dc1427689b..f3717624314fbce974b1e1c6f1f06691d87f97de 100644
|
| --- a/Source/bindings/v8/V8NPObject.cpp
|
| +++ b/Source/bindings/v8/V8NPObject.cpp
|
| @@ -70,15 +70,14 @@ static void npObjectInvokeImpl(const v8::FunctionCallbackInfo<v8::Value>& info,
|
| {
|
| NPObject* npObject;
|
|
|
| - WrapperWorldType currentWorldType = worldType(info.GetIsolate());
|
| // These three types are subtypes of HTMLPlugInElement.
|
| - if (V8HTMLAppletElement::hasInstance(info.Holder(), info.GetIsolate(), currentWorldType) || V8HTMLEmbedElement::hasInstance(info.Holder(), info.GetIsolate(), currentWorldType)
|
| - || V8HTMLObjectElement::hasInstance(info.Holder(), info.GetIsolate(), currentWorldType)) {
|
| + if (V8HTMLAppletElement::hasInstance(info.Holder(), info.GetIsolate()) || V8HTMLEmbedElement::hasInstance(info.Holder(), info.GetIsolate())
|
| + || V8HTMLObjectElement::hasInstance(info.Holder(), info.GetIsolate())) {
|
| // The holder object is a subtype of HTMLPlugInElement.
|
| HTMLPlugInElement* element;
|
| - if (V8HTMLAppletElement::hasInstance(info.Holder(), info.GetIsolate(), currentWorldType))
|
| + if (V8HTMLAppletElement::hasInstance(info.Holder(), info.GetIsolate()))
|
| element = V8HTMLAppletElement::toNative(info.Holder());
|
| - else if (V8HTMLEmbedElement::hasInstance(info.Holder(), info.GetIsolate(), currentWorldType))
|
| + else if (V8HTMLEmbedElement::hasInstance(info.Holder(), info.GetIsolate()))
|
| element = V8HTMLEmbedElement::toNative(info.Holder());
|
| else
|
| element = V8HTMLObjectElement::toNative(info.Holder());
|
|
|