[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 00:51:24 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 426c4883c5fdfa5ca863b8f29dd040d1537188f8
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Dec 29 08:26:32 2009 +0000
2009-12-29 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Eric Seidel.
[Qt] DRT: Frame loader callbacks differ from the Mac port
https://bugs.webkit.org/show_bug.cgi?id=32989
Remove messages from the callbacks that should not dump them to match
the expected results for the http/loading tests.
Unskip some http/loading tests which succeed now.
* WebCoreSupport/FrameLoaderClientQt.cpp:
(WebCore::FrameLoaderClientQt::dispatchDidPopStateWithinPage):
(WebCore::FrameLoaderClientQt::dispatchWillClose):
(WebCore::FrameLoaderClientQt::dispatchDidReceiveIcon):
(WebCore::FrameLoaderClientQt::dispatchDidClearWindowObjectInWorld):
2009-12-29 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Eric Seidel.
[Qt] DRT: Frame loader callbacks differ from the Mac port
https://bugs.webkit.org/show_bug.cgi?id=32989
Remove messages from the callbacks that should not dump them to match
the expected results for the http/loading tests.
Unskip some http/loading tests which succeed now.
* platform/qt/Skipped:
2009-12-29 Jakub Wieczorek <faw217 at gmail.com>
Reviewed by Eric Seidel.
[Qt] DRT: Frame loader callbacks differ from the Mac port
https://bugs.webkit.org/show_bug.cgi?id=32989
Remove messages from the callbacks that should not dump them to match
the expected results for the http/loading tests.
Unskip some http/loading tests which succeed now.
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::DumpRenderTree::dump):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52612 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 36b96b1..58ad380 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-29 Jakub Wieczorek <faw217 at gmail.com>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] DRT: Frame loader callbacks differ from the Mac port
+ https://bugs.webkit.org/show_bug.cgi?id=32989
+
+ Remove messages from the callbacks that should not dump them to match
+ the expected results for the http/loading tests.
+
+ Unskip some http/loading tests which succeed now.
+
+ * platform/qt/Skipped:
+
2009-12-29 Robert Hogan <robert at roberthogan.net>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 4be858c..e6fb7b6 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -29,20 +29,10 @@ http/tests/wml
http/tests/uri/escaped-entity.html
# Failing HTTP Loading tests
-http/tests/loading/bad-server-subframe.html
http/tests/loading/bad-scheme-subframe.html
-http/tests/loading/basic-auth-resend-wrong-credentials.html
-http/tests/loading/basic.html
-http/tests/loading/deleted-host-in-resource-load-delegate-callback.html
-http/tests/loading/empty-subframe.html
http/tests/loading/gmail-assert-on-load.html
-http/tests/loading/location-hash-reload-cycle.html
-http/tests/loading/onload-vs-immediate-refresh.pl
-http/tests/loading/preload-img-test.html
http/tests/loading/redirect-methods.html
-http/tests/loading/redirect-with-no-location-crash.html
http/tests/loading/simple-subframe.html
-http/tests/loading/slow-parsing-subframe.html
http/tests/loading/text-content-type-with-binary-extension.html
# Failing Local tests
@@ -4834,7 +4824,6 @@ fast/loader/main-document-url-for-non-http-loads.html
fast/loader/null-request-after-willSendRequest.html
fast/loader/policy-delegate-action-hit-test-zoomed.html
fast/loader/reload-policy-delegate.html
-fast/loading/subframe-removes-itself.html
platform/qt/fast/events/event-sender-keydown-frame.html
plugins/netscape-plugin-setwindow-size-2.html
security/set-form-autocomplete-attribute.html
@@ -4884,6 +4873,7 @@ userscripts
# No authentication challenge handling
http/tests/loading/basic-credentials-sent-automatically.html
+http/tests/loading/basic-auth-resend-wrong-credentials.html
# This port doesn't support detecting slow unload handlers.
fast/dom/Window/slow_unload_handler.html
@@ -5093,7 +5083,6 @@ fast/repaint/block-selection-gap-stale-cache-2.html
fast/repaint/block-selection-gap-stale-cache.html
fast/repaint/inline-overflow.html
fast/repaint/inline-relative-positioned.html
-http/tests/loading/state-object-security-exception.html
http/tests/local/file-url-sent-as-referer.html
http/tests/misc/bubble-drag-events.html
http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7370242..93c0999 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,21 @@
+2009-12-29 Jakub Wieczorek <faw217 at gmail.com>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] DRT: Frame loader callbacks differ from the Mac port
+ https://bugs.webkit.org/show_bug.cgi?id=32989
+
+ Remove messages from the callbacks that should not dump them to match
+ the expected results for the http/loading tests.
+
+ Unskip some http/loading tests which succeed now.
+
+ * WebCoreSupport/FrameLoaderClientQt.cpp:
+ (WebCore::FrameLoaderClientQt::dispatchDidPopStateWithinPage):
+ (WebCore::FrameLoaderClientQt::dispatchWillClose):
+ (WebCore::FrameLoaderClientQt::dispatchDidReceiveIcon):
+ (WebCore::FrameLoaderClientQt::dispatchDidClearWindowObjectInWorld):
+
2009-12-29 Robert Hogan <robert at roberthogan.net>
Reviewed by Eric Seidel.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 3c30ab5..1685325 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -331,8 +331,6 @@ void FrameLoaderClientQt::dispatchDidPopStateWithinPage()
void FrameLoaderClientQt::dispatchWillClose()
{
- if (dumpFrameLoaderCallbacks)
- printf("%s - willCloseFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
}
@@ -599,9 +597,6 @@ String FrameLoaderClientQt::userAgent(const KURL& url)
void FrameLoaderClientQt::dispatchDidReceiveIcon()
{
- if (dumpFrameLoaderCallbacks)
- printf("%s - didReceiveIconForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
-
if (m_webFrame) {
emit m_webFrame->iconChanged();
}
@@ -626,9 +621,6 @@ void FrameLoaderClientQt::dispatchDidClearWindowObjectInWorld(DOMWrapperWorld* w
if (world != mainThreadNormalWorld())
return;
- if (dumpFrameLoaderCallbacks)
- printf("%s - didClearWindowObjectForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
-
if (m_webFrame)
emit m_webFrame->javaScriptWindowObjectCleared();
}
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 62268e3..c18f3f3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-29 Jakub Wieczorek <faw217 at gmail.com>
+
+ Reviewed by Eric Seidel.
+
+ [Qt] DRT: Frame loader callbacks differ from the Mac port
+ https://bugs.webkit.org/show_bug.cgi?id=32989
+
+ Remove messages from the callbacks that should not dump them to match
+ the expected results for the http/loading tests.
+
+ Unskip some http/loading tests which succeed now.
+
+ * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+ (WebCore::DumpRenderTree::dump):
+
2009-12-29 Robert Hogan <robert at roberthogan.net>
Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 4c4b5e9..00fdac5 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -608,6 +608,9 @@ static const char *methodNameStringForFailedTest(LayoutTestController *controlle
void DumpRenderTree::dump()
{
+ // Prevent any further frame load callbacks from appearing after we dump the result.
+ qt_dump_frame_loader(false);
+
QWebFrame *mainFrame = m_page->mainFrame();
//fprintf(stderr, " Dumping\n");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list