Changeset 102340 in webkit

Timestamp:

Dec 8, 2011 7:46:47 AM (12 years ago)

Author:

Simon Hausmann

Message:

[Qt] WebKitTestRunner crashes with debug builds ​https://bugs.webkit.org/show_bug.cgi?id=74090

Reviewed by Tor Arne Vestbø.

Source/WebKit2:

Export private C++ API style platformInitialize function needed
by low-level WTR.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebView::platformInitialize):

• UIProcess/API/qt/qquickwebview_p.h:

Tools:

• WebKitTestRunner/qt/TestControllerQt.cpp:

(WTR::TestController::platformInitialize): Call QQuickWebView::platformInitialize
to ensure WTF/JSC threading is initialized.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/qt/TestControllerQt.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-08  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] WebKitTestRunner crashes with debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=74090
+
+        Reviewed by Tor Arne Vestbø.
+
+        Export private C++ API style platformInitialize function needed
+        by low-level WTR.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebView::platformInitialize):
+        * UIProcess/API/qt/qquickwebview_p.h:
+
 2011-12-07  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -32 +32 @@
 #include "qwebpreferences_p_p.h"
 
+#include <JavaScriptCore/InitializeThreading.h>
 #include <QtDeclarative/QQuickCanvas>
 #include <QtWidgets/QFileDialog>
@@ -617 +618 @@
 }
 
+void QQuickWebView::platformInitialize()
+{
+    JSC::initializeThreading();
+    WTF::initializeMainThread();
+}
+
 void QQuickWebView::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
 {

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h

@@ -92 +92 @@
     static QQuickWebViewAttached* qmlAttachedProperties(QObject*);
 
+    static void platformInitialize(); // Only needed by WTR.
+
 public Q_SLOTS:
     void load(const QUrl&);

trunk/Tools/ChangeLog

@@ +1 @@
+2011-12-08  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] WebKitTestRunner crashes with debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=74090
+
+        Reviewed by Tor Arne Vestbø.
+
+        * WebKitTestRunner/qt/TestControllerQt.cpp:
+        (WTR::TestController::platformInitialize): Call QQuickWebView::platformInitialize
+        to ensure WTF/JSC threading is initialized.
+
 2011-12-08  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/WebKitTestRunner/qt/TestControllerQt.cpp

@@ -36 +36 @@
 #include <QLibrary>
 #include <QObject>
+#include <qquickwebview_p.h>
 #include <QtGlobal>
 #include <wtf/Platform.h>
@@ -83 +84 @@
 void TestController::platformInitialize()
 {
+    QQuickWebView::platformInitialize();
 }