Title: [135575] trunk/Source
- Revision
- 135575
- Author
- [email protected]
- Date
- 2012-11-23 02:17:48 -0800 (Fri, 23 Nov 2012)
Log Message
[Qt] Avoid initializing PlatformStrategies twice.
Rubber-stamped by Simon Hausmann.
This fixes another regression introduced in r135515:
initializeWebKitQt shouldn't implicitely call initializeWebCoreQt
since it can be called from WebKit2 to initialize QStyle for testing.
This would then lead to things such as PlatformStrategies being
initialized twice.
Source/WebKit/qt:
* Api/qwebpage.cpp: Explicitely call initializeWebCoreQt().
(QWebPagePrivate::QWebPagePrivate):
* WebCoreSupport/InitWebCoreQt.cpp:
(WebKit::initializeWebKitQt):
Source/WebKit2:
* qt/MainQt.cpp: No need to initialize anything if we're not using QStyle.
(WebKit):
(main):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (135574 => 135575)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-11-23 10:14:24 UTC (rev 135574)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2012-11-23 10:17:48 UTC (rev 135575)
@@ -68,6 +68,7 @@
#include "HTMLNames.h"
#include "HitTestResult.h"
#include "Image.h"
+#include "InitWebCoreQt.h"
#include "InitWebKitQt.h"
#include "InspectorClientQt.h"
#include "InspectorClientWebPage.h"
@@ -325,6 +326,7 @@
#endif
WebKit::initializeWebKitWidgets();
+ WebCore::initializeWebCoreQt();
Page::PageClients pageClients;
pageClients.chromeClient = new ChromeClientQt(this);
Modified: trunk/Source/WebKit/qt/ChangeLog (135574 => 135575)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-23 10:14:24 UTC (rev 135574)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-23 10:17:48 UTC (rev 135575)
@@ -1,3 +1,20 @@
+2012-11-22 Pierre Rossi <[email protected]>
+
+ [Qt] Avoid initializing PlatformStrategies twice.
+
+ Rubber-stamped by Simon Hausmann.
+
+ This fixes another regression introduced in r135515:
+ initializeWebKitQt shouldn't implicitely call initializeWebCoreQt
+ since it can be called from WebKit2 to initialize QStyle for testing.
+ This would then lead to things such as PlatformStrategies being
+ initialized twice.
+
+ * Api/qwebpage.cpp: Explicitely call initializeWebCoreQt().
+ (QWebPagePrivate::QWebPagePrivate):
+ * WebCoreSupport/InitWebCoreQt.cpp:
+ (WebKit::initializeWebKitQt):
+
2012-11-23 Simon Hausmann <[email protected]>
Unreviewed trivial Qt/Win build fix:
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp (135574 => 135575)
--- trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp 2012-11-23 10:14:24 UTC (rev 135574)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InitWebCoreQt.cpp 2012-11-23 10:17:48 UTC (rev 135575)
@@ -62,8 +62,6 @@
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 (135574 => 135575)
--- trunk/Source/WebKit2/ChangeLog 2012-11-23 10:14:24 UTC (rev 135574)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-23 10:17:48 UTC (rev 135575)
@@ -1,3 +1,19 @@
+2012-11-22 Pierre Rossi <[email protected]>
+
+ [Qt] Avoid initializing PlatformStrategies twice.
+
+ Rubber-stamped by Simon Hausmann.
+
+ This fixes another regression introduced in r135515:
+ initializeWebKitQt shouldn't implicitely call initializeWebCoreQt
+ since it can be called from WebKit2 to initialize QStyle for testing.
+ This would then lead to things such as PlatformStrategies being
+ initialized twice.
+
+ * qt/MainQt.cpp: No need to initialize anything if we're not using QStyle.
+ (WebKit):
+ (main):
+
2012-11-22 Carlos Garcia Campos <[email protected]>
[GTK] Use custom private macros to define GObjects
Modified: trunk/Source/WebKit2/qt/MainQt.cpp (135574 => 135575)
--- trunk/Source/WebKit2/qt/MainQt.cpp 2012-11-23 10:14:24 UTC (rev 135574)
+++ trunk/Source/WebKit2/qt/MainQt.cpp 2012-11-23 10:17:48 UTC (rev 135575)
@@ -45,7 +45,6 @@
#if !defined(QT_NO_WIDGETS)
Q_DECL_IMPORT void initializeWebKitWidgets();
#endif
-Q_DECL_IMPORT void initializeWebKitQt();
}
#if !defined(NDEBUG) && defined(Q_OS_UNIX)
@@ -96,10 +95,7 @@
#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
