[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:40:21 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 132658de6806641410be66b6b88d88f63cc924be
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 6 15:34:54 2009 +0000
2009-10-06 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Simon Hausmann.
[Qt] Implement layoutTestController.dumpStatusCallbacks() and unskip the
fast/dom/assign-to-window-status.html test, which is passing as a result.
https://bugs.webkit.org/show_bug.cgi?id=30127
* platform/qt/Skipped:
2009-10-06 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Simon Hausmann.
[Qt] Implement layoutTestController.dumpStatusCallbacks() and unskip the
fast/dom/assign-to-window-status.html test, which is passing as a result.
https://bugs.webkit.org/show_bug.cgi?id=30127
* DumpRenderTree/qt/DumpRenderTree.cpp:
(WebCore::DumpRenderTree::DumpRenderTree):
(WebCore::DumpRenderTree::statusBarMessage):
* DumpRenderTree/qt/DumpRenderTree.h:
* DumpRenderTree/qt/jsobjects.h:
(LayoutTestController::shouldDumpStatusCallbacks):
(LayoutTestController::dumpStatusCallbacks):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49189 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a37ce2b..c46a4ad 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-06 Jakub Wieczorek <faw217 at gmail.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Implement layoutTestController.dumpStatusCallbacks() and unskip the
+ fast/dom/assign-to-window-status.html test, which is passing as a result.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30127
+
+ * platform/qt/Skipped:
+
2009-10-06 Xan Lopez <xlopez at igalia.com>
Skip another failing test.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index b81bbbd..cf4e608 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -1061,7 +1061,6 @@ fast/css/css2-system-fonts.html
fast/css/namespaces/003.xml
fast/css/namespaces/007.xml
fast/doctypes/003.html
-fast/dom/assign-to-window-status.html
fast/dom/frame-loading-via-document-write.html
fast/dom/set-frame-src-while-running-script-in-frame.html
fast/dom/wrapper-classes.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9b97117..ed9b9cb 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,23 @@
Reviewed by Simon Hausmann.
+ [Qt] Implement layoutTestController.dumpStatusCallbacks() and unskip the
+ fast/dom/assign-to-window-status.html test, which is passing as a result.
+
+ https://bugs.webkit.org/show_bug.cgi?id=30127
+
+ * DumpRenderTree/qt/DumpRenderTree.cpp:
+ (WebCore::DumpRenderTree::DumpRenderTree):
+ (WebCore::DumpRenderTree::statusBarMessage):
+ * DumpRenderTree/qt/DumpRenderTree.h:
+ * DumpRenderTree/qt/jsobjects.h:
+ (LayoutTestController::shouldDumpStatusCallbacks):
+ (LayoutTestController::dumpStatusCallbacks):
+
+2009-10-06 Jakub Wieczorek <faw217 at gmail.com>
+
+ Reviewed by Simon Hausmann.
+
[Qt] The implementation of EventSender::mouseUp() and EventSender::mouseDown()
ignores the argument indicating which mouse button to trigger.
https://bugs.webkit.org/show_bug.cgi?id=30048
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index a6f1f57..c5a1015 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -232,6 +232,8 @@ DumpRenderTree::DumpRenderTree()
SLOT(titleChanged(const QString&)));
connect(m_page, SIGNAL(databaseQuotaExceeded(QWebFrame*,QString)),
this, SLOT(dumpDatabaseQuota(QWebFrame*,QString)));
+ connect(m_page, SIGNAL(statusBarMessage(const QString&)),
+ this, SLOT(statusBarMessage(const QString&)));
m_eventSender = new EventSender(m_page);
m_textInputController = new TextInputController(m_page);
@@ -530,6 +532,14 @@ void DumpRenderTree::dumpDatabaseQuota(QWebFrame* frame, const QString& dbName)
origin.setDatabaseQuota(5 * 1024 * 1024);
}
+void DumpRenderTree::statusBarMessage(const QString& message)
+{
+ if (!m_controller->shouldDumpStatusCallbacks())
+ return;
+
+ printf("UI DELEGATE STATUS CALLBACK: setStatusText:%s\n", message.toUtf8().constData());
+}
+
QWebPage *DumpRenderTree::createWindow()
{
if (!m_controller->canOpenWindows())
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
index 28ae1b6..c5b4801 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.h
@@ -88,6 +88,7 @@ public Q_SLOTS:
void titleChanged(const QString &s);
void connectFrame(QWebFrame *frame);
void dumpDatabaseQuota(QWebFrame* frame, const QString& dbName);
+ void statusBarMessage(const QString& message);
Q_SIGNALS:
void quit();
diff --git a/WebKitTools/DumpRenderTree/qt/jsobjects.h b/WebKitTools/DumpRenderTree/qt/jsobjects.h
index 4c4f5b7..c076bb9 100644
--- a/WebKitTools/DumpRenderTree/qt/jsobjects.h
+++ b/WebKitTools/DumpRenderTree/qt/jsobjects.h
@@ -53,6 +53,7 @@ public:
bool shouldDumpBackForwardList() const { return m_dumpBackForwardList; }
bool shouldDumpChildrenAsText() const { return m_dumpChildrenAsText; }
bool shouldDumpDatabaseCallbacks() const { return m_dumpDatabaseCallbacks; }
+ bool shouldDumpStatusCallbacks() const { return m_dumpStatusCallbacks; }
bool shouldWaitUntilDone() const { return m_waitForDone; }
bool canOpenWindows() const { return m_canOpenWindows; }
bool shouldDumpTitleChanges() const { return m_dumpTitleChanges; }
@@ -71,6 +72,7 @@ public slots:
void dumpAsText() { m_textDump = true; }
void dumpChildFramesAsText() { m_dumpChildrenAsText = true; }
void dumpDatabaseCallbacks() { m_dumpDatabaseCallbacks = true; }
+ void dumpStatusCallbacks() { m_dumpStatusCallbacks = true; }
void setCanOpenWindows() { m_canOpenWindows = true; }
void waitUntilDone();
void notifyDone();
@@ -123,7 +125,9 @@ private:
bool m_waitForDone;
bool m_dumpTitleChanges;
bool m_dumpDatabaseCallbacks;
+ bool m_dumpStatusCallbacks;
bool m_waitForPolicy;
+
QBasicTimer m_timeoutTimer;
QWebFrame *m_topLoadingFrame;
WebCore::DumpRenderTree *m_drt;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list