Title: [135642] trunk/Source
- Revision
- 135642
- Author
- [email protected]
- Date
- 2012-11-23 22:13:20 -0800 (Fri, 23 Nov 2012)
Log Message
Unreviewed, rolling out r135575.
http://trac.webkit.org/changeset/135575
https://bugs.webkit.org/show_bug.cgi?id=103169
It made all tests assert (Requested by Ossy on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-11-23
Source/WebKit/qt:
* Api/qwebpage.cpp:
(QWebPagePrivate::QWebPagePrivate):
* WebCoreSupport/InitWebCoreQt.cpp:
(WebKit::initializeWebKitQt):
Source/WebKit2:
* qt/MainQt.cpp:
(WebKit):
(main):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (135641 => 135642)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-11-24 05:18:31 UTC (rev 135641)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-11-24 06:13:20 UTC (rev 135642)
@@ -68,7 +68,6 @@
#include "HTMLNames.h"
#include "HitTestResult.h"
#include "Image.h"
-#include "InitWebCoreQt.h"
#include "InitWebKitQt.h"
#include "InspectorClientQt.h"
#include "InspectorClientWebPage.h"
@@ -326,7 +325,6 @@
#endif
WebKit::initializeWebKitWidgets();
- WebCore::initializeWebCoreQt();
Page::PageClients pageClients;
pageClients.chromeClient = new ChromeClientQt(this);
Modified: trunk/Source/WebKit/qt/ChangeLog (135641 => 135642)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-24 05:18:31 UTC (rev 135641)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-24 06:13:20 UTC (rev 135642)
@@ -1,3 +1,16 @@
+2012-11-23 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r135575.
+ http://trac.webkit.org/changeset/135575
+ https://bugs.webkit.org/show_bug.cgi?id=103169
+
+ It made all tests assert (Requested by Ossy on #webkit).
+
+ * Api/qwebpage.cpp:
+ (QWebPagePrivate::QWebPagePrivate):
+ * WebCoreSupport/InitWebCoreQt.cpp:
+ (WebKit::initializeWebKitQt):
+
2012-11-23 Allan Sandfeld Jensen <[email protected]>
tst_qwebpage fails after QMimeDatabase patch
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp (135641 => 135642)
--- trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp 2012-11-24 05:18:31 UTC (rev 135641)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp 2012-11-24 06:13:20 UTC (rev 135642)
@@ -62,6 +62,8 @@
WebCore::RenderThemeQStyle::setStyleFactoryFunction(initCallback);
WebCore::RenderThemeQt::setCustomTheme(WebCore::RenderThemeQStyle::create, new WebCore::ScrollbarThemeQStyle);
}
+
+ WebCore::initializeWebCoreQt();
}
Q_DECL_EXPORT void setImagePlatformResource(const char* name, const QPixmap& pixmap)
Modified: trunk/Source/WebKit2/ChangeLog (135641 => 135642)
--- trunk/Source/WebKit2/ChangeLog 2012-11-24 05:18:31 UTC (rev 135641)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-24 06:13:20 UTC (rev 135642)
@@ -1,3 +1,15 @@
+2012-11-23 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r135575.
+ http://trac.webkit.org/changeset/135575
+ https://bugs.webkit.org/show_bug.cgi?id=103169
+
+ It made all tests assert (Requested by Ossy on #webkit).
+
+ * qt/MainQt.cpp:
+ (WebKit):
+ (main):
+
2012-11-23 Alexis Menard <[email protected]>
[CSS3 Backgrounds and Borders] Implement new CSS3 background-position parsing.
Modified: trunk/Source/WebKit2/qt/MainQt.cpp (135641 => 135642)
--- trunk/Source/WebKit2/qt/MainQt.cpp 2012-11-24 05:18:31 UTC (rev 135641)
+++ trunk/Source/WebKit2/qt/MainQt.cpp 2012-11-24 06:13:20 UTC (rev 135642)
@@ -45,6 +45,7 @@
#if !defined(QT_NO_WIDGETS)
Q_DECL_IMPORT void initializeWebKitWidgets();
#endif
+Q_DECL_IMPORT void initializeWebKitQt();
}
#if !defined(NDEBUG) && defined(Q_OS_UNIX)
@@ -95,7 +96,10 @@
#if !defined(QT_NO_WIDGETS)
if (qgetenv("QT_WEBKIT_THEME_NAME") == "qstyle")
WebKit::initializeWebKitWidgets();
+ else
#endif
+ WebKit::initializeWebKitQt();
+
return WebKit::WebProcessMainQt(appInstance);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
