Report JavaScript errors from Qt signals and slots

Issue: #12973 Upstream issue: https://bugreports.qt.io/browse/QTBUG-37899
vitallium · Mar 11, 2016 · 683923f · 683923f · zackw · Mar 14, 2016
1 parent 6cf54a3
commit 683923f
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/Source/WebCore/bridge/qt/qt_runtime.cpp b/Source/WebCore/bridge/qt/qt_runtime.cpp
@@ -1577,16 +1577,12 @@ void QtConnectionObject::execute(void** argv)
  args[i] = convertQVariantToValue(m_context, m_rootObject, QVariant(argType, argv[i+1]), ignoredException);
  }
 
- JSObjectCallAsFunction(m_context, m_receiverFunction, m_receiver, argc, args.data(), 0);
-}
-
-bool QtConnectionObject::match(JSContextRef context, QObject* sender, int signalIndex, JSObjectRef receiver, JSObjectRef receiverFunction)
-{
- if (sender != parent() || signalIndex != m_signalIndex)
- return false;
- JSValueRef* ignoredException = 0;
- const bool receiverMatch = (!receiver && !m_receiver) || (receiver && m_receiver && JSValueIsEqual(context, receiver, m_receiver, ignoredException));
- return receiverMatch && JSValueIsEqual(context, receiverFunction, m_receiverFunction, ignoredException);
+ JSValueRef call_exception = 0;
+ ExecState* exec = toJS(m_context);
+ JSObjectCallAsFunction(m_context, m_receiverFunction, m_receiver, argc, args.data(), &call_exception);
+ if (call_exception) {
+ WebCore::reportException(exec, toJS(exec, call_exception));
+ }
 }
 
 } }