Changeset 76958 in webkit

Timestamp:

Jan 28, 2011 11:16:18 AM (13 years ago)

Author:

chang.shu@nokia.com

Message:

2011-01-28 Chang Shu <​chang.shu@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@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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (modified) (3 diffs)
• Tools/DumpRenderTree/qt/DumpRenderTreeQt.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-28  Chang Shu  <chang.shu@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@chromium.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -4969 +4969 @@
 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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-28  Chang Shu  <chang.shu@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@webkit.org>
 

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp

@@ -521 +521 @@
 }
 
-void DumpRenderTree::resetToConsistentStateBeforeTesting()
+void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
 {
     // reset so that any current loads are stopped
@@ -551 +551 @@
     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);
@@ -584 +592 @@
 {
     DumpRenderTreeSupportQt::dumpResourceLoadCallbacksPath(QFileInfo(url.toString()).path());
-    resetToConsistentStateBeforeTesting();
+    resetToConsistentStateBeforeTesting(url);
 
     if (isWebInspectorTest(m_page->mainFrame()->url()))

trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h

@@ -87 +87 @@
 
     void closeRemainingWindows();
-    void resetToConsistentStateBeforeTesting();
+    void resetToConsistentStateBeforeTesting(const QUrl&);
 
     LayoutTestController *layoutTestController() const { return m_controller; }