Fix some types in ScriptController.h to be a bit less wonky. This was mbelshe's proposed method and I think it's sane and clsoer to upstream than what we have now, but I admit that I haven't thought carefully through all the fine points.

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

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

2 files changed, 8 insertions, 14 deletions

diff --git a/webkit/port/bridge/ScriptControllerKJS.cpp b/webkit/port/bridge/ScriptControllerKJS.cpp
index 2ff7a04..f08c353 100644
--- a/webkit/port/bridge/ScriptControllerKJS.cpp
+++ b/webkit/port/bridge/ScriptControllerKJS.cpp
@@ -172,8 +172,8 @@ JSInstanceHolder::JSInstanceHolder() :
   m_instance(0) {
 }
 
-JSInstanceHolder::JSInstanceHolder(JSInstance instance) {
-  *this = instance;
+JSInstanceHolder::JSInstanceHolder(JSInstanceHandle instance) {
+  m_instance = instance;
 }
 
 JSInstanceHolder::~JSInstanceHolder() {
@@ -185,25 +185,19 @@ bool JSInstanceHolder::IsEmpty() {
 }
 
 void JSInstanceHolder::Clear() {
-  if (m_instance) {
-    m_instance->deref();
-    m_instance = 0;
-  }
+  m_instance = 0;
 }
 
 JSInstance JSInstanceHolder::Get() {
-  return m_instance;
+  return m_instance.get();
 }
 
 JSInstance JSInstanceHolder::EmptyInstance() {
   return 0;
 }
 
-JSInstanceHolder& JSInstanceHolder::operator=(JSInstance instance) {
-  Clear();
+JSInstanceHolder& JSInstanceHolder::operator=(JSInstanceHandle instance) {
   m_instance = instance;
-  if (m_instance)
-    m_instance->ref();
   return *this;
 }
 
diff --git a/webkit/port/bridge/ScriptControllerV8.cpp b/webkit/port/bridge/ScriptControllerV8.cpp
index 63f7aa3..fa751a7 100644
--- a/webkit/port/bridge/ScriptControllerV8.cpp
+++ b/webkit/port/bridge/ScriptControllerV8.cpp
@@ -373,7 +373,7 @@ bool ScriptController::isEnabled() const
     return m_proxy->isEnabled();
 }
 
-JSInstance ScriptController::createScriptInstanceForWidget(Widget* widget)
+JSInstanceHandle ScriptController::createScriptInstanceForWidget(Widget* widget)
 {
     ASSERT(widget != 0);
 
@@ -533,7 +533,7 @@ JSInstanceHolder::JSInstanceHolder()
 {
 }
 
-JSInstanceHolder::JSInstanceHolder(JSInstance instance)
+JSInstanceHolder::JSInstanceHolder(JSInstanceHandle instance)
 {
     *this = instance;
 }
@@ -571,7 +571,7 @@ JSInstance JSInstanceHolder::EmptyInstance()
     return v8::Local<v8::Object>();
 }
 
-JSInstanceHolder& JSInstanceHolder::operator=(JSInstance instance)
+JSInstanceHolder& JSInstanceHolder::operator=(JSInstanceHandle instance)
 {
     Clear();
     if (instance.IsEmpty())