Title: [102340] trunk
- Revision
- 102340
- Author
- hausm...@webkit.org
- Date
- 2011-12-08 07:46:47 -0800 (Thu, 08 Dec 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102339 => 102340)
--- trunk/Source/WebKit2/ChangeLog 2011-12-08 15:45:39 UTC (rev 102339)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-08 15:46:47 UTC (rev 102340)
@@ -1,3 +1,17 @@
+2011-12-08 Simon Hausmann <simon.hausm...@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.turco...@nokia.com>
[Qt] Fix non-animated pinch-zoom scale commit.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (102339 => 102340)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-08 15:45:39 UTC (rev 102339)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-08 15:46:47 UTC (rev 102340)
@@ -31,6 +31,7 @@
#include "qquickwebview_p_p.h"
#include "qwebpreferences_p_p.h"
+#include <_javascript_Core/InitializeThreading.h>
#include <QtDeclarative/QQuickCanvas>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QInputDialog>
@@ -616,6 +617,12 @@
return new QQuickWebViewAttached(object);
}
+void QQuickWebView::platformInitialize()
+{
+ JSC::initializeThreading();
+ WTF::initializeMainThread();
+}
+
void QQuickWebView::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry)
{
Q_D(QQuickWebView);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (102339 => 102340)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-08 15:45:39 UTC (rev 102339)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-08 15:46:47 UTC (rev 102340)
@@ -91,6 +91,8 @@
QQuickWebViewExperimental* experimental() const;
static QQuickWebViewAttached* qmlAttachedProperties(QObject*);
+ static void platformInitialize(); // Only needed by WTR.
+
public Q_SLOTS:
void load(const QUrl&);
void postMessage(const QString&);
Modified: trunk/Tools/ChangeLog (102339 => 102340)
--- trunk/Tools/ChangeLog 2011-12-08 15:45:39 UTC (rev 102339)
+++ trunk/Tools/ChangeLog 2011-12-08 15:46:47 UTC (rev 102340)
@@ -1,3 +1,14 @@
+2011-12-08 Simon Hausmann <simon.hausm...@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 <dpra...@chromium.org>
fix build-webkit --chromium after breakage in r102201
Modified: trunk/Tools/WebKitTestRunner/qt/TestControllerQt.cpp (102339 => 102340)
--- trunk/Tools/WebKitTestRunner/qt/TestControllerQt.cpp 2011-12-08 15:45:39 UTC (rev 102339)
+++ trunk/Tools/WebKitTestRunner/qt/TestControllerQt.cpp 2011-12-08 15:46:47 UTC (rev 102340)
@@ -35,6 +35,7 @@
#include <QFileInfo>
#include <QLibrary>
#include <QObject>
+#include <qquickwebview_p.h>
#include <QtGlobal>
#include <wtf/Platform.h>
#include <wtf/text/WTFString.h>
@@ -82,6 +83,7 @@
void TestController::platformInitialize()
{
+ QQuickWebView::platformInitialize();
}
void TestController::platformRunUntil(bool&, double timeout)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
