Revert "Merge WebKit r47420"

This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.

8 files changed, 22 insertions, 30 deletions

diff --git a/WebCore/bridge/jni/jni_jsobject.mm b/WebCore/bridge/jni/jni_jsobject.mm
index eb4a6bd..c9af8b0 100644
--- a/WebCore/bridge/jni/jni_jsobject.mm
+++ b/WebCore/bridge/jni/jni_jsobject.mm
@@ -29,18 +29,19 @@
 #if ENABLE(MAC_JAVA_BRIDGE)
 
 #include "Frame.h"
-#include "ScriptController.h"
-#include "StringSourceProvider.h"
 #include "WebCoreFrameView.h"
 #include "jni_runtime.h"
 #include "jni_utility.h"
+#include "ScriptController.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
 #include <interpreter/CallFrame.h>
-#include <runtime/Completion.h>
 #include <runtime/JSGlobalObject.h>
 #include <runtime/JSLock.h>
+#include <runtime/Completion.h>
+#include <runtime/Completion.h>
 #include <wtf/Assertions.h>
+#include <parser/SourceProvider.h>
 
 using WebCore::Frame;
 
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h
index 5991f5b..126d513 100644
--- a/WebCore/bridge/npapi.h
+++ b/WebCore/bridge/npapi.h
@@ -114,14 +114,6 @@
 /*             Definition of Basic Types                                */
 /*----------------------------------------------------------------------*/
 
-/* QNX sets the _INT16 and friends defines, but does not typedef the types */
-#ifdef __QNXNTO__
-#undef _UINT16
-#undef _INT16
-#undef _UINT32
-#undef _INT32
-#endif
-
 #ifndef _UINT16
 #define _UINT16
 typedef unsigned short uint16;
diff --git a/WebCore/bridge/objc/objc_runtime.mm b/WebCore/bridge/objc/objc_runtime.mm
index 67bd2a3..2d69c1c 100644
--- a/WebCore/bridge/objc/objc_runtime.mm
+++ b/WebCore/bridge/objc/objc_runtime.mm
@@ -209,7 +209,7 @@ void ObjcFallbackObjectImp::put(ExecState*, const Identifier&, JSValue, PutPrope
 
 static JSValue JSC_HOST_CALL callObjCFallbackObject(ExecState* exec, JSObject* function, JSValue thisValue, const ArgList& args)
 {
-    if (!thisValue.inherits(&RuntimeObjectImp::s_info))
+    if (!thisValue.isObject(&RuntimeObjectImp::s_info))
         return throwError(exec, TypeError);
 
     JSValue result = jsUndefined();
diff --git a/WebCore/bridge/qt/qt_instance.cpp b/WebCore/bridge/qt/qt_instance.cpp
index 58280e3..506697a 100644
--- a/WebCore/bridge/qt/qt_instance.cpp
+++ b/WebCore/bridge/qt/qt_instance.cpp
@@ -56,12 +56,12 @@ public:
 
     static const ClassInfo s_info;
 
-    virtual void markChildren(MarkStack& markStack)
+    virtual void mark()
     {
-        RuntimeObjectImp::markChildren(markStack);
         QtInstance* instance = static_cast<QtInstance*>(getInternalInstance());
         if (instance)
-            instance->markAggregate(markStack);
+            instance->mark();
+        RuntimeObjectImp::mark();
     }
 
 protected:
@@ -202,13 +202,13 @@ RuntimeObjectImp* QtInstance::createRuntimeObject(ExecState* exec)
     return ret;
 }
 
-void QtInstance::markAggregate(MarkStack& markStack)
+void QtInstance::mark()
 {
-    if (m_defaultMethod)
-        markStack.append(m_defaultMethod);
+    if (m_defaultMethod && !m_defaultMethod->marked())
+        m_defaultMethod->mark();
     foreach(JSObject* val, m_methods.values()) {
-        if (val)
-            markStack.append(val);
+        if (val && !val->marked())
+            val->mark();
     }
 }
 
diff --git a/WebCore/bridge/qt/qt_instance.h b/WebCore/bridge/qt/qt_instance.h
index c276b29..23766b1 100644
--- a/WebCore/bridge/qt/qt_instance.h
+++ b/WebCore/bridge/qt/qt_instance.h
@@ -48,7 +48,7 @@ public:
     virtual JSValue valueOf(ExecState*) const;
     virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const;
 
-    void markAggregate(MarkStack&);
+    virtual void mark(); // This isn't inherited
 
     virtual JSValue invokeMethod(ExecState*, const MethodList&, const ArgList&);
 
diff --git a/WebCore/bridge/qt/qt_runtime.cpp b/WebCore/bridge/qt/qt_runtime.cpp
index 1590417..6be119c 100644
--- a/WebCore/bridge/qt/qt_runtime.cpp
+++ b/WebCore/bridge/qt/qt_runtime.cpp
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "qt_runtime.h"
 
-#include "BooleanObject.h"
 #include "DateInstance.h"
 #include "DateMath.h"
 #include "DatePrototype.h"
@@ -47,9 +46,9 @@
 #include <JSFunction.h>
 #include <limits.h>
 #include <runtime.h>
-#include <runtime/Error.h>
 #include <runtime_array.h>
 #include <runtime_object.h>
+#include "BooleanObject.h"
 
 // QtScript has these
 Q_DECLARE_METATYPE(QObjectList);
@@ -1329,14 +1328,14 @@ QtRuntimeMetaMethod::QtRuntimeMetaMethod(ExecState* exec, const Identifier& iden
     d->m_allowPrivate = allowPrivate;
 }
 
-void QtRuntimeMetaMethod::markChildren(MarkStack& markStack)
+void QtRuntimeMetaMethod::mark()
 {
-    QtRuntimeMethod::markChildren(markStack);
+    QtRuntimeMethod::mark();
     QW_D(QtRuntimeMetaMethod);
     if (d->m_connect)
-        markStack.append(d->m_connect);
+        d->m_connect->mark();
     if (d->m_disconnect)
-        markStack.append(d->m_disconnect);
+        d->m_disconnect->mark();
 }
 
 JSValue QtRuntimeMetaMethod::call(ExecState* exec, JSObject* functionObject, JSValue thisValue, const ArgList& args)
diff --git a/WebCore/bridge/qt/qt_runtime.h b/WebCore/bridge/qt/qt_runtime.h
index edb577c..72d93eb 100644
--- a/WebCore/bridge/qt/qt_runtime.h
+++ b/WebCore/bridge/qt/qt_runtime.h
@@ -167,7 +167,7 @@ public:
 
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
 
-    virtual void markChildren(MarkStack& markStack);
+    virtual void mark();
 
 protected:
     QtRuntimeMetaMethodData* d_func() const {return reinterpret_cast<QtRuntimeMetaMethodData*>(d_ptr);}
diff --git a/WebCore/bridge/runtime_method.cpp b/WebCore/bridge/runtime_method.cpp
index 15ea582..0af0af5 100644
--- a/WebCore/bridge/runtime_method.cpp
+++ b/WebCore/bridge/runtime_method.cpp
@@ -82,13 +82,13 @@ static JSValue JSC_HOST_CALL callRuntimeMethod(ExecState* exec, JSObject* functi
     
     RuntimeObjectImp* imp;
 
-    if (thisValue.inherits(&RuntimeObjectImp::s_info)) {
+    if (thisValue.isObject(&RuntimeObjectImp::s_info)) {
         imp = static_cast<RuntimeObjectImp*>(asObject(thisValue));
     } else {
         // If thisObj is the DOM object for a plugin, get the corresponding
         // runtime object from the DOM object.
         JSValue value = thisValue.get(exec, Identifier(exec, "__apple_runtime_object"));
-        if (value.inherits(&RuntimeObjectImp::s_info))    
+        if (value.isObject(&RuntimeObjectImp::s_info))    
             imp = static_cast<RuntimeObjectImp*>(asObject(value));
         else
             return throwError(exec, TypeError);