src/webkit side of webkit merge 38760:38800

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

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

1 files changed, 2 insertions, 21 deletions

diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h
index c7daeb8..00c6e0c 100644
--- a/webkit/port/bindings/v8/ScriptController.h
+++ b/webkit/port/bindings/v8/ScriptController.h
@@ -35,6 +35,7 @@
 
 #include "HashMap.h"
 #include "MessagePort.h"
+#include "ScriptInstance.h"
 #include "ScriptValue.h"
 #include "SecurityOrigin.h"
 
@@ -164,7 +165,7 @@ public:
 
     NPRuntimeFunctions* functions();
 
-    JSInstanceHandle createScriptInstanceForWidget(Widget*);
+    PassScriptInstance createScriptInstanceForWidget(Widget*);
 
     void clearPluginObjects();
     void disconnectFrame();
@@ -281,26 +282,6 @@ private:
 #endif
 };
 
-// JSInstance is an abstraction for a wrapped C class.  JSC and V8
-// have very different implementations.
-class JSInstanceHolder {
-public:
-    JSInstanceHolder();
-    JSInstanceHolder(JSInstanceHandle);
-    ~JSInstanceHolder();
-    // Returns true if the holder is empty.
-    bool IsEmpty();
-    // Get the contained JSInstance.
-    JSInstance Get();
-    // Clear the contained JSInstance.
-    void Clear();
-    JSInstanceHolder& operator=(JSInstanceHandle);
-    static JSInstance EmptyInstance();
-
-private:
-    JSPersistentInstance m_instance;
-};
-
 }  // namespace WebCore
 
 #endif  // ScriptController_h