[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ap at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 14e2d91e82867878eeb2131843a697de85657546
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 20:03:32 2010 +0000

            Reviewed by Darin Adler.
    
            https://bugs.webkit.org/show_bug.cgi?id=42586
            Log all canceled authentication attempts in DumpRenderTree
    
            * DumpRenderTree/mac/ResourceLoadDelegate.mm:
            (-[ResourceLoadDelegate webView:resource:didReceiveAuthenticationChallenge:fromDataSource:]):
            * DumpRenderTree/win/ResourceLoadDelegate.cpp:
            (ResourceLoadDelegate::didReceiveAuthenticationChallenge):
            It's important to know whether an auth sheet appeared. Added logging to "no preset credentials"
            case.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63681 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index df85a32..7122c6e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,17 @@
 
         Reviewed by Darin Adler.
 
+        https://bugs.webkit.org/show_bug.cgi?id=42586
+        Log all canceled authentication attempts in DumpRenderTree
+
+        * http/tests/misc/401-alternative-content-expected.txt:
+        * http/tests/xmlhttprequest/failed-auth-expected.txt:
+        Added the new messages.
+
+2010-07-19  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
         https://bugs.webkit.org/show_bug.cgi?id=40996
         Progress event should not be fired during synchronous XMLHttpRequest
 
diff --git a/LayoutTests/http/tests/misc/401-alternative-content-expected.txt b/LayoutTests/http/tests/misc/401-alternative-content-expected.txt
index 7ef22e9..5336c18 100644
--- a/LayoutTests/http/tests/misc/401-alternative-content-expected.txt
+++ b/LayoutTests/http/tests/misc/401-alternative-content-expected.txt
@@ -1 +1,2 @@
+<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 PASS
diff --git a/LayoutTests/http/tests/xmlhttprequest/failed-auth-expected.txt b/LayoutTests/http/tests/xmlhttprequest/failed-auth-expected.txt
index cc27c84..0332741 100644
--- a/LayoutTests/http/tests/xmlhttprequest/failed-auth-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/failed-auth-expected.txt
@@ -1,3 +1,5 @@
+<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
+<unknown> - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet
 Test for bug 13075: XMLHttpRequest with failed authentication should set status to 401.
 
 Sync, no credentials: OK
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7fa4959..baad9ad 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-19  Alexey Proskuryakov  <ap at apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42586
+        Log all canceled authentication attempts in DumpRenderTree
+
+        * DumpRenderTree/mac/ResourceLoadDelegate.mm:
+        (-[ResourceLoadDelegate webView:resource:didReceiveAuthenticationChallenge:fromDataSource:]):
+        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+        (ResourceLoadDelegate::didReceiveAuthenticationChallenge):
+        It's important to know whether an auth sheet appeared. Added logging to "no preset credentials"
+        case.
+
 2010-07-19  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r63671.
diff --git a/WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm b/WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm
index 10fa0f3..0855b83 100644
--- a/WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm
+++ b/WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm
@@ -172,6 +172,9 @@ using namespace std;
 - (void)webView:(WebView *)wv resource:(id)identifier didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource
 {
     if (!gLayoutTestController->handlesAuthenticationChallenges()) {
+        NSString *string = [NSString stringWithFormat:@"%@ - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet", identifier];
+        printf("%s\n", [string UTF8String]);
+
         [[challenge sender] continueWithoutCredentialForAuthenticationChallenge:challenge];
         return;
     }
diff --git a/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp b/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
index 33ccd7f..825366a 100644
--- a/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
+++ b/WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp
@@ -292,6 +292,7 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::didReceiveAuthenticationChalleng
         return E_FAIL;
 
     if (!gLayoutTestController->handlesAuthenticationChallenges()) {
+        printf("%S - didReceiveAuthenticationChallenge - Simulating cancelled authentication sheet\n", descriptionSuitableForTestResult(identifier).c_str());
         sender->continueWithoutCredentialForAuthenticationChallenge(challenge);
         return S_OK;
     }

-- 
WebKit Debian packaging