diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Source/WebCore/bridge/qt/qt_runtime.cpp | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Source/WebCore/bridge/qt/qt_runtime.cpp')
| -rw-r--r-- | Source/WebCore/bridge/qt/qt_runtime.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebCore/bridge/qt/qt_runtime.cpp b/Source/WebCore/bridge/qt/qt_runtime.cpp index 0b6fa681b..11e2e9c0d 100644 --- a/Source/WebCore/bridge/qt/qt_runtime.cpp +++ b/Source/WebCore/bridge/qt/qt_runtime.cpp @@ -27,6 +27,7 @@ #include "FunctionPrototype.h" #include "Interpreter.h" #include "JSArray.h" +#include "JSContextRefPrivate.h" #include "JSDocument.h" #include "JSDOMBinding.h" #include "JSDOMWindow.h" @@ -998,9 +999,9 @@ QtRuntimeMethodData::~QtRuntimeMethodData() { } -void QtRuntimeMethodData::finalize(Handle<Unknown> value, void*) +void QtRuntimeMethodData::finalize(Handle<Unknown>, void*) { - m_instance->removeCachedMethod(static_cast<JSObject*>(value.get().asCell())); + m_instance->removeUnusedMethods(); } QtRuntimeMetaMethodData::~QtRuntimeMetaMethodData() @@ -1636,8 +1637,7 @@ EncodedJSValue QtRuntimeConnectionMethod::call(ExecState* exec) // receiver function [from arguments] // receiver this object [from arguments] - ExecState* globalExec = exec->lexicalGlobalObject()->globalExec(); - QtConnectionObject* conn = QtConnectionObject::createWithInternalJSC(globalExec, d->m_instance, signalIndex, thisObject, funcObject); + QtConnectionObject* conn = QtConnectionObject::createWithInternalJSC(exec, d->m_instance, signalIndex, thisObject, funcObject); bool ok = QMetaObject::connect(sender, signalIndex, conn, conn->metaObject()->methodOffset()); if (!ok) { delete conn; @@ -1739,7 +1739,7 @@ JSValue QtRuntimeConnectionMethod::lengthGetter(ExecState*, JSValue, PropertyNam QtConnectionObject::QtConnectionObject(JSContextRef context, PassRefPtr<QtInstance> senderInstance, int signalIndex, JSObjectRef receiver, JSObjectRef receiverFunction) : QObject(senderInstance->getObject()) - , m_context(context) + , m_context(JSContextGetGlobalContext(context)) , m_senderInstance(senderInstance) , m_originalSender(m_senderInstance->getObject()) , m_signalIndex(signalIndex) |