Imported WebKit commit 3fb8681126c4ed0f58d5d3656a4d72ae548a0815 (http://svn.webkit.org/repository/webkit/trunk@135701)

New snapshot with prospective no-widgets build fix

Change-Id: I4820c887d991c973cfed023518f41809edeefa83
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

2 files changed, 18 insertions, 0 deletions

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8803a6f47..e6466f500 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2012-11-26  Pierre Rossi  <pierre.rossi@gmail.com>
+
+        [Qt] REGRESSION(r135575): It made all tests assert
+        https://bugs.webkit.org/show_bug.cgi?id=103169
+
+        Reviewed 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.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp: Also propagate the change to DRT this time.
+        (WebCore::DumpRenderTree::DumpRenderTree):
+
 2012-11-24  Zan Dobersek  <zandobersek@gmail.com>
 
         Add the --order option to NRWT
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 16c237866..88d8ae752 100755
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -36,6 +36,7 @@
 #include "DumpRenderTreeSupportQt.h"
 #include "EventSenderQt.h"
 #include "GCControllerQt.h"
+#include "InitWebCoreQt.h"
 #include "InitWebKitQt.h"
 #include "QtTestSupport.h"
 #include "TestRunnerQt.h"
@@ -396,6 +397,7 @@ DumpRenderTree::DumpRenderTree()
         setGraphicsBased(true);
 
     WebKit::initializeWebKitWidgets();
+    WebCore::initializeWebCoreQt();
     DumpRenderTreeSupportQt::initialize();
 
     // Set running in DRT mode for qwebpage to create testable objects.