Revert the merge. Mac build is mysteriously broken.

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

Index: third_party/WebKit/WebCore/bridge/qt/qt_instance.h
===================================================================
--- third_party/WebKit/WebCore/bridge/qt/qt_instance.h	(revision 9383)
+++ third_party/WebKit/WebCore/bridge/qt/qt_instance.h	(working copy)
@@ -1,93 +1,91 @@
-/*
- * 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
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifndef BINDINGS_QT_INSTANCE_H_
-#define BINDINGS_QT_INSTANCE_H_
-
-#include <QtScript/qscriptengine.h>
-#include "runtime.h"
-#include "runtime_root.h"
-#include <qpointer.h>
-#include <qhash.h>
-#include <qset.h>
-
-namespace JSC {
-
-namespace Bindings {
-
-class QtClass;
-class QtField;
-class QtRuntimeMetaMethod;
-
-class QtInstance : public Instance {
-public:
-    ~QtInstance();
-
-    virtual Class* getClass() const;
-    virtual RuntimeObjectImp* createRuntimeObject(ExecState*);
-
-    virtual void begin();
-    virtual void end();
-
-    virtual JSValuePtr valueOf(ExecState*) const;
-    virtual JSValuePtr defaultValue(ExecState*, PreferredPrimitiveType) const;
-
-    virtual void mark(); // This isn't inherited
-
-    virtual JSValuePtr invokeMethod(ExecState*, const MethodList&, const ArgList&);
-
-    virtual void getPropertyNames(ExecState*, PropertyNameArray&);
-
-    JSValuePtr stringValue(ExecState* exec) const;
-    JSValuePtr numberValue(ExecState* exec) const;
-    JSValuePtr booleanValue() const;
-
-    QObject* getObject() const { return m_object; }
-
-    static PassRefPtr<QtInstance> getQtInstance(QObject*, PassRefPtr<RootObject>, QScriptEngine::ValueOwnership ownership);
-
-    virtual bool getOwnPropertySlot(JSObject*, ExecState*, const Identifier&, PropertySlot&);
-    virtual void put(JSObject*, ExecState*, const Identifier&, JSValuePtr, PutPropertySlot&);
-
-    static QtInstance* getInstance(JSObject*);
-
-private:
-    static PassRefPtr<QtInstance> create(QObject *instance, PassRefPtr<RootObject> rootObject, QScriptEngine::ValueOwnership ownership)
-    {
-        return adoptRef(new QtInstance(instance, rootObject, ownership));
-    }
-
-    friend class QtClass;
-    friend class QtField;
-    QtInstance(QObject*, PassRefPtr<RootObject>, QScriptEngine::ValueOwnership ownership); // Factory produced only..
-    mutable QtClass* m_class;
-    QPointer<QObject> m_object;
-    QObject* m_hashkey;
-    mutable QHash<QByteArray, JSObject*> m_methods;
-    mutable QHash<QString, QtField*> m_fields;
-    mutable QSet<JSValuePtr> m_children;
-    mutable QtRuntimeMetaMethod* m_defaultMethod;
-    QScriptEngine::ValueOwnership m_ownership;
-};
-
-} // namespace Bindings
-
-} // namespace JSC
-
-#endif
+/*
+ * 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
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifndef BINDINGS_QT_INSTANCE_H_
+#define BINDINGS_QT_INSTANCE_H_
+
+#include "runtime.h"
+#include "runtime_root.h"
+#include <qpointer.h>
+#include <qhash.h>
+#include <qset.h>
+
+namespace JSC {
+
+namespace Bindings {
+
+class QtClass;
+class QtField;
+class QtRuntimeMetaMethod;
+
+class QtInstance : public Instance {
+public:
+    ~QtInstance();
+
+    virtual Class* getClass() const;
+    virtual RuntimeObjectImp* createRuntimeObject(ExecState*);
+
+    virtual void begin();
+    virtual void end();
+
+    virtual JSValuePtr valueOf(ExecState*) const;
+    virtual JSValuePtr defaultValue(ExecState*, PreferredPrimitiveType) const;
+
+    virtual void mark(); // This isn't inherited
+
+    virtual JSValuePtr invokeMethod(ExecState*, const MethodList&, const ArgList&);
+
+    virtual void getPropertyNames(ExecState*, PropertyNameArray&);
+
+    JSValuePtr stringValue(ExecState* exec) const;
+    JSValuePtr numberValue(ExecState* exec) const;
+    JSValuePtr booleanValue() const;
+
+    QObject* getObject() const { return m_object; }
+
+    static PassRefPtr<QtInstance> getQtInstance(QObject*, PassRefPtr<RootObject>);
+
+    virtual bool getOwnPropertySlot(JSObject*, ExecState*, const Identifier&, PropertySlot&);
+    virtual void put(JSObject*, ExecState*, const Identifier&, JSValuePtr, PutPropertySlot&);
+
+    static QtInstance* getInstance(JSObject*);
+
+private:
+    static PassRefPtr<QtInstance> create(QObject *instance, PassRefPtr<RootObject> rootObject)
+    {
+        return adoptRef(new QtInstance(instance, rootObject));
+    }
+
+    friend class QtClass;
+    friend class QtField;
+    QtInstance(QObject*, PassRefPtr<RootObject>); // Factory produced only..
+    mutable QtClass* m_class;
+    QPointer<QObject> m_object;
+    QObject* m_hashkey;
+    mutable QHash<QByteArray, JSObject*> m_methods;
+    mutable QHash<QString, QtField*> m_fields;
+    mutable QSet<JSValuePtr> m_children;
+    mutable QtRuntimeMetaMethod* m_defaultMethod;
+};
+
+} // namespace Bindings
+
+} // namespace JSC
+
+#endif