Changeset 121788 in webkit

Timestamp:

Jul 3, 2012 10:36:27 AM (12 years ago)

Author:

kbalazs@webkit.org

Message:

[Qt][WTR] Get rid of using DumpRenderTreeSupportQt
​https://bugs.webkit.org/show_bug.cgi?id=90262

Unreviewed build fix.

Reverting r121550 manually because it caused build
break on ARM and Mac. It turned out that the Qt build
system is too broken for this change now, first we have
to address two issues:

• symbol hiding was forbidden accidentally on x86 Linux
• Qt lacks a separate library for test support

• Tools.pro:
• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::resetAfterTest):
(WTR::InjectedBundlePage::didClearWindowForFrame):

• WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Tools.pro (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (modified) (3 diffs)
• WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-03  Balazs Kelemen  <kbalazs@webkit.org>
+
+        [Qt][WTR] Get rid of using DumpRenderTreeSupportQt
+        https://bugs.webkit.org/show_bug.cgi?id=90262
+
+        Unreviewed build fix.
+
+        Reverting r121550 manually because it caused build
+        break on ARM and Mac. It turned out that the Qt build
+        system is too broken for this change now, first we have
+        to address two issues:
+            * symbol hiding was forbidden accidentally on x86 Linux
+            * Qt lacks a separate library for test support
+
+        * Tools.pro:
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::resetAfterTest):
+        (WTR::InjectedBundlePage::didClearWindowForFrame):
+        * WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp:
+
 2012-07-03  Tony Chang  <tony@chromium.org>
 

trunk/Tools/Tools.pro

@@ -18 +18 @@
     SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
     SUBDIRS += MiniBrowser/qt/raw/MiniBrowserRaw.pro
+
+    # WTR's InjectedBundle depends currently on WK1's DumpRenderTreeSupport
+    !no_webkit1: SUBDIRS += WebKitTestRunner/WebKitTestRunner.pro
 }
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

@@ -45 +45 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
+
+#if PLATFORM(QT)
+#include "DumpRenderTreeSupportQt.h"
+#endif
 
 using namespace std;
@@ -348 +352 @@
     WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page);
     JSGlobalContextRef context = WKBundleFrameGetJavaScriptContext(frame);
+#if PLATFORM(QT)
+    DumpRenderTreeSupportQt::injectInternalsObject(context);
+#else
     WebCoreTestSupport::resetInternalsObject(context);
+#endif
 }
 
@@ -770 +778 @@
     InjectedBundle::shared().accessibilityController()->makeWindowObject(context, window, &exception);
 
+#if PLATFORM(QT)
+    DumpRenderTreeSupportQt::injectInternalsObject(context);
+#else
     WebCoreTestSupport::injectInternalsObject(context);
+#endif
 }
 

trunk/Tools/WebKitTestRunner/InjectedBundle/qt/ActivateFontsQt.cpp

@@ -30 +30 @@
 #include "config.h"
 #include "ActivateFonts.h"
+#include "DumpRenderTreeSupportQt.h"
 #include "QtInitializeTestFonts.h"