Scrubbing HTMLPluginElement V8 custom bindings, Chromium side.

R=brettw


Review URL: http://codereview.chromium.org/20282

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9779 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 70 deletions

diff --git a/DEPS b/DEPS
index 83353f7..dce4227 100644
--- a/DEPS
+++ b/DEPS
@@ -19,7 +19,7 @@ deps = {
     "http://googletest.googlecode.com/svn/trunk@167",
 
   "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@9772",
+    "/trunk/deps/third_party/WebKit@9778",
 
   "src/third_party/icu38":
     "/trunk/deps/third_party/icu38@9252",
diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index 602322a..5fee005 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -357,6 +357,7 @@ inputs = [
     '$WEBCORE_DIR/bindings/v8/custom/V8HTMLFormElementCustom.cpp',
     '$WEBCORE_DIR/bindings/v8/custom/V8HTMLInputElementCustom.cpp',
     '$WEBCORE_DIR/bindings/v8/custom/V8HTMLOptionsCollectionCustom.cpp',
+    '$WEBCORE_DIR/bindings/v8/custom/V8HTMLPlugInElementCustom.cpp',
     '$WEBCORE_DIR/bindings/v8/custom/V8HTMLSelectElementCustom.cpp',
     '$WEBCORE_DIR/bindings/v8/custom/V8HTMLSelectElementCustom.h',
     '$WEBCORE_DIR/bindings/v8/custom/V8NamedNodesCollection.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index a2168ab..6a5615f 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -156,6 +156,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8HTMLPlugInElementCustom.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\v8\custom\V8HTMLSelectElementCustom.cpp"
 			>
 		</File>
diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp
index 4a3f392..86c2c01 100644
--- a/webkit/port/bindings/v8/v8_custom.cpp
+++ b/webkit/port/bindings/v8/v8_custom.cpp
@@ -955,75 +955,6 @@ NAMED_PROPERTY_SETTER(CSSStyleDeclaration) {
 }
 
 
-NAMED_PROPERTY_GETTER(HTMLPlugInElement) {
-  INC_STATS("DOM.HTMLPlugInElement.NamedPropertyGetter");
-  HTMLPlugInElement* imp =
-      V8Proxy::DOMWrapperToNode<HTMLPlugInElement>(info.Holder());
-  ScriptInstance script_instance = imp->getInstance();
-  if (script_instance) {
-    v8::Local<v8::Object> instance =
-        v8::Local<v8::Object>::New(script_instance->instance());
-    if (!instance.IsEmpty()) {
-      return NPObjectGetNamedProperty(instance, name);
-    }
-  }
-  return v8::Handle<v8::Object>();
-}
-
-
-NAMED_PROPERTY_SETTER(HTMLPlugInElement) {
-  INC_STATS("DOM.HTMLPlugInElement.NamedPropertySetter");
-  HTMLPlugInElement* imp =
-      V8Proxy::DOMWrapperToNode<HTMLPlugInElement>(info.Holder());
-  ScriptInstance script_instance = imp->getInstance();
-  if (script_instance) {
-    v8::Local<v8::Object> instance =
-        v8::Local<v8::Object>::New(script_instance->instance());
-    if (!instance.IsEmpty()) {
-      return NPObjectSetNamedProperty(instance, name, value);
-    }
-  }
-  return v8::Handle<v8::Value>();  // do not block the call
-}
-
-
-CALLBACK_FUNC_DECL(HTMLPlugInElement) {
-  INC_STATS("DOM.HTMLPluginElement()");
-  return NPObjectInvokeDefaultHandler(args);
-}
-
-
-INDEXED_PROPERTY_GETTER(HTMLPlugInElement) {
-  INC_STATS("DOM.HTMLPlugInElement.IndexedPropertyGetter");
-  HTMLPlugInElement* imp =
-      V8Proxy::DOMWrapperToNode<HTMLPlugInElement>(info.Holder());
-  ScriptInstance script_instance = imp->getInstance();
-  if (script_instance) {
-    v8::Local<v8::Object> instance =
-        v8::Local<v8::Object>::New(script_instance->instance());
-    if (!instance.IsEmpty()) {
-      return NPObjectGetIndexedProperty(instance, index);
-    }
-  }
-  return v8::Handle<v8::Object>();
-}
-
-
-INDEXED_PROPERTY_SETTER(HTMLPlugInElement) {
-  INC_STATS("DOM.HTMLPlugInElement.IndexedPropertySetter");
-  HTMLPlugInElement* imp =
-      V8Proxy::DOMWrapperToNode<HTMLPlugInElement>(info.Holder());
-  ScriptInstance script_instance = imp->getInstance();
-  if (script_instance) {
-    v8::Local<v8::Object> instance =
-        v8::Local<v8::Object>::New(script_instance->instance());
-    if (!instance.IsEmpty()) {
-      return NPObjectSetIndexedProperty(instance, index, value);
-    }
-  }
-  return v8::Handle<v8::Value>();  // do not block the call
-}
-
 NAMED_PROPERTY_GETTER(StyleSheetList) {
   INC_STATS("DOM.StyleSheetList.NamedPropertyGetter");
   // Look for local properties first.
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index 61df3f9..f696e94 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -46,6 +46,7 @@
 		4112E7060EFB0A26001E0E7A /* RandomNumber.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4112E7050EFB0A26001E0E7A /* RandomNumber.cpp */; };
 		41807C570F268375007BB4CC /* ByteArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41807C550F268375007BB4CC /* ByteArray.cpp */; };
 		419E80750F264BBC006564E0 /* CSSPropertyLonghand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419E80730F264BBC006564E0 /* CSSPropertyLonghand.cpp */; };
+		41D0113F0F438DA3004A662F /* V8HTMLPlugInElementCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41D0113E0F438DA3004A662F /* V8HTMLPlugInElementCustom.cpp */; };
 		41DE6EBC0F3A328C0049BC24 /* MainThreadChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DE6EBB0F3A328C0049BC24 /* MainThreadChromium.cpp */; };
 		41DE6EBF0F3A32EE0049BC24 /* chromium_threading.cc in Sources */ = {isa = PBXBuildFile; fileRef = 41DE6EBE0F3A32EE0049BC24 /* chromium_threading.cc */; };
 		41DE748C0F3CDBCB0049BC24 /* V8SVGElementInstanceCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41DE74890F3CDBCB0049BC24 /* V8SVGElementInstanceCustom.cpp */; };
@@ -1573,6 +1574,7 @@
 		41A365600F01AB3800778012 /* InspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorController.h; sourceTree = "<group>"; };
 		41AF32C40EE5E6ED00BF6361 /* ScriptInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptInstance.cpp; sourceTree = "<group>"; };
 		41AF32C50EE5E6ED00BF6361 /* ScriptInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptInstance.h; sourceTree = "<group>"; };
+		41D0113E0F438DA3004A662F /* V8HTMLPlugInElementCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = V8HTMLPlugInElementCustom.cpp; sourceTree = "<group>"; };
 		41DE6EBB0F3A328C0049BC24 /* MainThreadChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MainThreadChromium.cpp; sourceTree = "<group>"; };
 		41DE6EBD0F3A329F0049BC24 /* ChromiumThreading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChromiumThreading.h; sourceTree = "<group>"; };
 		41DE6EBE0F3A32EE0049BC24 /* chromium_threading.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chromium_threading.cc; sourceTree = "<group>"; };
@@ -4556,6 +4558,7 @@
 				41DE7C960F424AAC0049BC24 /* V8HTMLCollectionCustom.cpp */,
 				41DE7C9D0F424ACD0049BC24 /* V8HTMLFormElementCustom.cpp */,
 				41DE7B6E0F40EA7C0049BC24 /* V8HTMLInputElementCustom.cpp */,
+				41D0113E0F438DA3004A662F /* V8HTMLPlugInElementCustom.cpp */,
 				41DE7B6B0F40EA5F0049BC24 /* V8HTMLOptionsCollectionCustom.cpp */,
 				41DE7CA40F424BEE0049BC24 /* V8HTMLSelectElementCustom.h */,
 				41DE7C9F0F424AE80049BC24 /* V8HTMLSelectElementCustom.cpp */,
@@ -8440,6 +8443,7 @@
 				41DE7B6C0F40EA5F0049BC24 /* V8HTMLOptionsCollectionCustom.cpp in Sources */,
 				938447F50F16B06E0075F4C5 /* V8HTMLParagraphElement.cpp in Sources */,
 				938447F60F16B06E0075F4C5 /* V8HTMLParamElement.cpp in Sources */,
+				41D0113F0F438DA3004A662F /* V8HTMLPlugInElementCustom.cpp in Sources */,
 				938447F70F16B06E0075F4C5 /* V8HTMLPreElement.cpp in Sources */,
 				938447F80F16B06E0075F4C5 /* V8HTMLQuoteElement.cpp in Sources */,
 				938447F90F16B06E0075F4C5 /* V8HTMLScriptElement.cpp in Sources */,