| Index: third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
|
| index 8ec188e1f1707adf669f605d3b755964ae30459f..8848b68c54d27bf7bc073d6618d991a84ffa9bab 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8HTMLPlugInElementCustom.cpp
|
| @@ -29,12 +29,10 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#include "bindings/core/v8/NPV8Object.h"
|
| #include "bindings/core/v8/SharedPersistent.h"
|
| #include "bindings/core/v8/V8Binding.h"
|
| #include "bindings/core/v8/V8HTMLEmbedElement.h"
|
| #include "bindings/core/v8/V8HTMLObjectElement.h"
|
| -#include "bindings/core/v8/V8NPObject.h"
|
| #include "core/frame/UseCounter.h"
|
| #include "wtf/OwnPtr.h"
|
| #include "wtf/PassOwnPtr.h"
|
| @@ -67,18 +65,6 @@ void getScriptableObjectProperty(PropertyType property, const v8::PropertyCallba
|
| v8SetReturnValue(info, value);
|
| }
|
|
|
| -namespace {
|
| -void callNpObjectSetter(v8::Local<v8::Object> self, v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| -{
|
| - npObjectSetNamedProperty(self, name, value, info);
|
| -}
|
| -
|
| -void callNpObjectSetter(v8::Local<v8::Object> self, uint32_t index, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| -{
|
| - npObjectSetIndexedProperty(self, index, value, info);
|
| -}
|
| -} // namespace
|
| -
|
| template <typename ElementType, typename PropertyType>
|
| void setScriptableObjectProperty(PropertyType property, v8::Local<v8::Value> value, const v8::PropertyCallbackInfo<v8::Value>& info)
|
| {
|
| @@ -92,15 +78,6 @@ void setScriptableObjectProperty(PropertyType property, v8::Local<v8::Value> val
|
| if (instance.IsEmpty())
|
| return;
|
|
|
| - // We need to directly call setter on NPObject to be able to detect
|
| - // situation where NPObject notifies it does not possess the property
|
| - // to be able to lookup standard DOM property.
|
| - // This information is lost when retrieving it through v8::Object.
|
| - if (isWrappedNPObject(instance)) {
|
| - callNpObjectSetter(instance, property, value, info);
|
| - return;
|
| - }
|
| -
|
| // FIXME: The gTalk pepper plugin is the only plugin to make use of
|
| // SetProperty and that is being deprecated. This can be removed as soon as
|
| // it goes away.
|
|
|