[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit d442380294ac7a166ae6ce98f6cc9041d5a72333
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 13 16:43:10 2009 +0000

    [Qt] Ensure the DRT does not output anything until first test is run
    
    Reviewed by Simon Hausmann.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    * DumpRenderTree/qt/DumpRenderTree.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50942 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4713421..821d6ef 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-13  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Ensure the DRT does not output anything until first test is run
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        * DumpRenderTree/qt/DumpRenderTree.h:
+
 2009-11-13  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index d23ce6e..1d8e8f6 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -79,39 +79,8 @@ namespace WebCore {
 const unsigned int maxViewWidth = 800;
 const unsigned int maxViewHeight = 600;
 
-class WebPage : public QWebPage {
-    Q_OBJECT
-public:
-    WebPage(QWidget *parent, DumpRenderTree *drt);
-
-    QWebPage *createWindow(QWebPage::WebWindowType);
-
-    void javaScriptAlert(QWebFrame *frame, const QString& message);
-    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
-    bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
-    bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
-
-    void resetSettings();
-
-public slots:
-    bool shouldInterruptJavaScript() { return false; }
-
-protected:
-    bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type);
-
-private slots:
-    void setViewGeometry(const QRect &r)
-    {
-        QWidget *v = view();
-        if (v)
-            v->setGeometry(r);
-    }
-private:
-    DumpRenderTree *m_drt;
-};
-
 WebPage::WebPage(QWidget *parent, DumpRenderTree *drt)
-    : QWebPage(parent), m_drt(drt)
+    : QWebPage(parent), m_drt(drt), m_enableTextOutput(false)
 {
     QWebSettings* globalSettings = QWebSettings::globalSettings();
 
@@ -156,6 +125,9 @@ QWebPage *WebPage::createWindow(QWebPage::WebWindowType)
 
 void WebPage::javaScriptAlert(QWebFrame*, const QString& message)
 {
+    if (!m_enableTextOutput)
+        return;
+
     fprintf(stdout, "ALERT: %s\n", message.toUtf8().constData());
 }
 
@@ -169,6 +141,9 @@ static QString urlSuitableForTestResult(const QString& url)
 
 void WebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString&)
 {
+    if (!m_enableTextOutput)
+        return;
+
     QString newMessage;
     if (!message.isEmpty()) {
         newMessage = message;
@@ -184,12 +159,18 @@ void WebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, c
 
 bool WebPage::javaScriptConfirm(QWebFrame*, const QString& msg)
 {
+    if (!m_enableTextOutput)
+        return true;
+
     fprintf(stdout, "CONFIRM: %s\n", msg.toUtf8().constData());
     return true;
 }
 
 bool WebPage::javaScriptPrompt(QWebFrame*, const QString& msg, const QString& defaultValue, QString* result)
 {
+    if (!m_enableTextOutput)
+        return true;
+
     fprintf(stdout, "PROMPT: %s, default text: %s\n", msg.toUtf8().constData(), defaultValue.toUtf8().constData());
     *result = defaultValue;
     return true;
@@ -224,8 +205,10 @@ bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& r
             typeDescription = "illegal value";
         }
 
-        fprintf(stdout, "Policy delegate: attempt to load %s with navigation type '%s'\n",
-                url.toUtf8().constData(), typeDescription.toUtf8().constData());
+        if (m_enableTextOutput)
+            fprintf(stdout, "Policy delegate: attempt to load %s with navigation type '%s'\n",
+                    url.toUtf8().constData(), typeDescription.toUtf8().constData());
+
         m_drt->layoutTestController()->notifyDone();
     }
     return QWebPage::acceptNavigationRequest(frame, request, type);
@@ -359,6 +342,7 @@ void DumpRenderTree::open(const QUrl& aurl)
 #endif
 
     qt_dump_frame_loader(url.toString().contains("loading/"));
+    m_page->enableTextOutput(true);
     m_page->mainFrame()->load(url);
 }
 
@@ -700,5 +684,3 @@ void DumpRenderTree::initializeFonts()
 #endif
 
 }
-
-#include "DumpRenderTree.moc"
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
index c5b4801..c77d1a2 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
@@ -35,11 +35,13 @@
 #include <QTextStream>
 #include <QSocketNotifier>
 
+#include <qwebpage.h>
+
 QT_BEGIN_NAMESPACE
 class QUrl;
 class QFile;
 QT_END_NAMESPACE
-class QWebPage;
+
 class QWebFrame;
 
 class LayoutTestController;
@@ -49,6 +51,41 @@ class GCController;
 
 namespace WebCore {
 
+class DumpRenderTree;
+
+class WebPage : public QWebPage {
+    Q_OBJECT
+public:
+    WebPage(QWidget *parent, DumpRenderTree *drt);
+
+    QWebPage *createWindow(QWebPage::WebWindowType);
+
+    void javaScriptAlert(QWebFrame *frame, const QString& message);
+    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
+    bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
+    bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
+
+    void resetSettings();
+    void enableTextOutput(bool enable) { m_enableTextOutput = enable; }
+
+public slots:
+    bool shouldInterruptJavaScript() { return false; }
+
+protected:
+    bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type);
+
+private slots:
+    void setViewGeometry(const QRect &r)
+    {
+        QWidget *v = view();
+        if (v)
+            v->setGeometry(r);
+    }
+private:
+    DumpRenderTree *m_drt;
+    bool m_enableTextOutput;
+};
+
 class DumpRenderTree : public QObject {
 Q_OBJECT
 
@@ -74,7 +111,7 @@ public:
     QWebPage *createWindow();
     int windowCount() const;
 
-    QWebPage *webPage() const { return m_page; }
+    WebPage *webPage() const { return m_page; }
 
 
 #if defined(Q_WS_X11)
@@ -101,7 +138,7 @@ private:
     bool m_dumpPixels;
     QString m_expectedHash;
 
-    QWebPage *m_page;
+    WebPage *m_page;
 
     EventSender *m_eventSender;
     TextInputController *m_textInputController;

-- 
WebKit Debian packaging