[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[chang.shu at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit 9e9739eb96c9be525dd5333574dc834c889f4923
Author: chang.shu at nokia.com <chang.shu at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 19:16:18 2011 +0000

    2011-01-28  Chang Shu  <chang.shu at nokia.com>
    
            Reviewed by Andreas Kling.
    
            Unskipp auth.html after fix.
            https://bugs.webkit.org/show_bug.cgi?id=36688
    
            * platform/qt/Skipped:
    2011-01-28  Chang Shu  <chang.shu at nokia.com>
    
            Reviewed by Andreas Kling.
    
            Reset NetworkAccessManager to clean up credentials from previous tests.
            This change causes no performance overhead either.
            https://bugs.webkit.org/show_bug.cgi?id=36688
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
            (WebCore::DumpRenderTree::open):
            * DumpRenderTree/qt/DumpRenderTreeQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76958 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c1df967..94fec85 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-28  Chang Shu  <chang.shu at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Unskipp auth.html after fix.
+        https://bugs.webkit.org/show_bug.cgi?id=36688
+
+        * platform/qt/Skipped:
+
 2011-01-28  Dimitri Glazkov  <dglazkov at chromium.org>
 
         Added newly-failing tests to expectations, will be fixing them shortly.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 3fce892..b8aa7f8 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -4968,10 +4968,6 @@ http/tests/local/link-stylesheet-load-order-preload.html
 # https://bugs.webkit.org/show_bug.cgi?id=51324
 fast/text/emphasis-overlap.html
 
-#[Qt] LayoutTests/http/tests/appcache/auth.html failed and skipped
-# https://bugs.webkit.org/show_bug.cgi?id=36688
-http/tests/appcache/auth.html
-
 # REGRESSION(r74971): [Qt] /editing/selection/caret-bidi-first-and-last-letters.html fails
 # https://bugs.webkit.org/show_bug.cgi?id=51884
 editing/selection/caret-bidi-first-and-last-letters.html
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d139548..1367bd6 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-28  Chang Shu  <chang.shu at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Reset NetworkAccessManager to clean up credentials from previous tests.
+        This change causes no performance overhead either.
+        https://bugs.webkit.org/show_bug.cgi?id=36688
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+        (WebCore::DumpRenderTree::open):
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+
 2011-01-28  Zoltan Horvath  <zoltan at webkit.org>
 
         Reviewed by Andreas Kling.
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 8d2ed59..ac5d9e7 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -520,7 +520,7 @@ void DumpRenderTree::dryRunPrint(QWebFrame* frame)
 #endif
 }
 
-void DumpRenderTree::resetToConsistentStateBeforeTesting()
+void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
 {
     // reset so that any current loads are stopped
     // NOTE: that this has to be done before the layoutTestController is
@@ -550,6 +550,14 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting()
     m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
     m_page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded);
 
+    if (url.scheme() == "http" || url.scheme() == "https") {
+        // credentials may exist from previous tests.
+        m_page->setNetworkAccessManager(0);
+        delete m_networkAccessManager;
+        m_networkAccessManager = new NetworkAccessManager(this);
+        m_page->setNetworkAccessManager(m_networkAccessManager);
+    }
+
     WorkQueue::shared()->clear();
     WorkQueue::shared()->setFrozen(false);
 
@@ -583,7 +591,7 @@ static bool isWebInspectorTest(const QUrl& url)
 void DumpRenderTree::open(const QUrl& url)
 {
     DumpRenderTreeSupportQt::dumpResourceLoadCallbacksPath(QFileInfo(url.toString()).path());
-    resetToConsistentStateBeforeTesting();
+    resetToConsistentStateBeforeTesting(url);
 
     if (isWebInspectorTest(m_page->mainFrame()->url()))
         layoutTestController()->closeWebInspector();
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
index 8cb5efb..5b53cd9 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -86,7 +86,7 @@ public:
     void setDumpPixels(bool);
 
     void closeRemainingWindows();
-    void resetToConsistentStateBeforeTesting();
+    void resetToConsistentStateBeforeTesting(const QUrl&);
 
     LayoutTestController *layoutTestController() const { return m_controller; }
     EventSender *eventSender() const { return m_eventSender; }

-- 
WebKit Debian packaging