Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/bridge/qt/qt_instance.cpp

 /*
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 80 matching lines @@
 
 void QtRuntimeObjectImp::removeFromCache()
 {
     JSLock lock(false);
     QtInstance* key = cachedObjects.key(this);
     if (key)
         cachedObjects.remove(key);
 }
 
 // QtInstance
-QtInstance::QtInstance(QObject* o, PassRefPtr<RootObject> rootObject, QScriptEngine::ValueOwnership ownership)
+QtInstance::QtInstance(QObject* o, PassRefPtr<RootObject> rootObject)
     : Instance(rootObject)
     , m_class(0)
     , m_object(o)
     , m_hashkey(o)
     , m_defaultMethod(0)
-    , m_ownership(ownership)
 {
 }
 
 QtInstance::~QtInstance()
 {
     JSLock lock(false);
 
     cachedObjects.remove(this);
     cachedInstances.remove(m_hashkey);
 
     // clean up (unprotect from gc) the JSValues we've created
     m_methods.clear();
 
     foreach(QtField* f, m_fields.values()) {
         delete f;
     }
     m_fields.clear();
-
-    if (m_object) {
-        switch (m_ownership) {
-        case QScriptEngine::QtOwnership:
-            break;
-        case QScriptEngine::AutoOwnership:
-            if (m_object->parent())
-                break;
-            // fall through!
-        case QScriptEngine::ScriptOwnership:
-            delete m_object;
-            break;
-        }
-    }
-}
-
-PassRefPtr<QtInstance> QtInstance::getQtInstance(QObject* o, PassRefPtr<RootObject> rootObject, QScriptEngine::ValueOwnership ownership)
+}
+
+PassRefPtr<QtInstance> QtInstance::getQtInstance(QObject* o, PassRefPtr<RootObject> rootObject)
 {
     JSLock lock(false);
 
     foreach(QtInstance* instance, cachedInstances.values(o)) {
         if (instance->rootObject() == rootObject)
             return instance;
     }
 
-    RefPtr<QtInstance> ret = QtInstance::create(o, rootObject, ownership);
+    RefPtr<QtInstance> ret = QtInstance::create(o, rootObject);
     cachedInstances.insert(o, ret.get());
 
     return ret.release();
 }
 
 bool QtInstance::getOwnPropertySlot(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
 {
     return object->JSObject::getOwnPropertySlot(exec, propertyName, slot);
 }
 
@@ skipping 228 matching lines @@
             obj->setProperty(m_dynamicProperty.constData(), val);
     } else {
         QString msg = QString(QLatin1String("cannot access member `%1' of deleted QObject")).arg(QLatin1String(name()));
         throwError(exec, GeneralError, msg.toLatin1().constData());
     }
 }
 
 
 }
 }