[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

mitz at apple.com mitz at apple.com
Fri Jan 21 14:42:02 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit f17405345aa9780ea0dad513a08c1de399a13ef2
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 25 01:52:13 2010 +0000

    REGRESSION (r74648): XHR layout test failures
    https://bugs.webkit.org/show_bug.cgi?id=51603
    
    Reviewed by Alexey Proskuryakov.
    
    Reverted r74648.
    
    WebCore:
    
    * WebCore.exp.in:
    
    WebKit2:
    
    * UIProcess/WebPageProxy.cpp:
    (WebKit::WebPageProxy::didReceiveAuthenticationChallenge):
    * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebKit::WebFrameLoaderClient::shouldUseCredentialStorage):
    * WebProcess/mac/WebProcessMainMac.mm:
    (WebKit::WebProcessMain):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74657 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 44ed643..b17777a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,16 @@
 2010-12-24  Dan Bernstein  <mitz at apple.com>
 
+        Reviewed by Alexey Proskuryakov.
+
+        REGRESSION (r74648): XHR layout test failures
+        https://bugs.webkit.org/show_bug.cgi?id=51603
+
+        Reverted r74648.
+
+        * WebCore.exp.in:
+
+2010-12-24  Dan Bernstein  <mitz at apple.com>
+
         Try to fix the Qt build after r74648.
 
         * WebCore.gypi:
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index 0bc453d..593bc60 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -435,7 +435,6 @@ __ZN7WebCore16enclosingIntRectERK7_NSRect
 __ZN7WebCore16enclosingIntRectERKNS_9FloatRectE
 __ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionENS_27EditingBoundaryCrossingRuleE
 __ZN7WebCore16jsStringSlowCaseEPN3JSC9ExecStateERNS0_9WeakGCMapIPN3WTF10StringImplEPNS0_8JSStringEEES6_
-__ZN7WebCore17CredentialStorage24getFromPersistentStorageERKNS_15ProtectionSpaceE
 __ZN7WebCore17CredentialStorage3getERKNS_15ProtectionSpaceE
 __ZN7WebCore17DOMImplementation13isXMLMIMETypeERKN3WTF6StringE
 __ZN7WebCore17DOMImplementation14isTextMIMETypeERKN3WTF6StringE
@@ -934,10 +933,8 @@ __ZN7WebCore9plainTextEPKNS_5RangeENS_20TextIteratorBehaviorE
 __ZN7WebCore9toElementEN3JSC7JSValueE
 __ZNK3JSC8Bindings10RootObject12globalObjectEv
 __ZNK3WTF6String14createCFStringEv
-__ZNK7WebCore10Credential11hasPasswordEv
 __ZNK7WebCore10Credential11persistenceEv
 __ZNK7WebCore10Credential4userEv
-__ZNK7WebCore10Credential7isEmptyEv
 __ZNK7WebCore10Credential8passwordEv
 __ZNK7WebCore10FloatPointcv8_NSPointEv
 __ZNK7WebCore10PluginData16supportsMimeTypeERKN3WTF6StringE
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index cfb332e..1ba1bf9 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-24  Dan Bernstein  <mitz at apple.com>
+
+        Reviewed by Alexey Proskuryakov.
+
+        REGRESSION (r74648): XHR layout test failures
+        https://bugs.webkit.org/show_bug.cgi?id=51603
+
+        Reverted r74648.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didReceiveAuthenticationChallenge):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::shouldUseCredentialStorage):
+        * WebProcess/mac/WebProcessMainMac.mm:
+        (WebKit::WebProcessMain):
+
 2010-12-24  Simon Fraser  <simon.fraser at apple.com>
 
         Fix the Qt build after r74650.
diff --git a/WebKit2/UIProcess/WebPageProxy.cpp b/WebKit2/UIProcess/WebPageProxy.cpp
index 24b5a9d..dbc9170 100644
--- a/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/WebKit2/UIProcess/WebPageProxy.cpp
@@ -27,7 +27,6 @@
 
 #include "AuthenticationChallengeProxy.h"
 #include "AuthenticationDecisionListener.h"
-#include "AuthenticationManagerMessages.h"
 #include "DataReference.h"
 #include "DrawingAreaProxy.h"
 #include "FindIndicator.h"
@@ -62,7 +61,6 @@
 #include "WebProtectionSpace.h"
 #include "WebSecurityOrigin.h"
 #include "WebURLRequest.h"
-#include <WebCore/CredentialStorage.h>
 #include <WebCore/FloatRect.h>
 #include <WebCore/MIMETypeRegistry.h>
 #include <WebCore/WindowFeatures.h>
@@ -1984,14 +1982,6 @@ void WebPageProxy::didReceiveAuthenticationChallenge(uint64_t frameID, const Web
     WebFrameProxy* frame = process()->webFrame(frameID);
     MESSAGE_CHECK(frame);
 
-    if (!coreChallenge.previousFailureCount()) {
-        Credential defaultCredential = CredentialStorage::getFromPersistentStorage(coreChallenge.protectionSpace());
-        if (!defaultCredential.isEmpty() && defaultCredential.hasPassword() && !defaultCredential.password().isEmpty()) {
-            process()->send(Messages::AuthenticationManager::UseCredentialForChallenge(challengeID, defaultCredential), pageID());
-            return;
-        }
-    }
-
     RefPtr<AuthenticationChallengeProxy> authenticationChallenge = AuthenticationChallengeProxy::create(coreChallenge, challengeID, this);
     
     m_loaderClient.didReceiveAuthenticationChallengeInFrame(this, frame, authenticationChallenge.get());
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 3306b46..be10517 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -161,7 +161,7 @@ void WebFrameLoaderClient::dispatchWillSendRequest(DocumentLoader*, unsigned lon
 
 bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*, unsigned long identifier)
 {
-    return false;
+    return true;
 }
 
 void WebFrameLoaderClient::dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long, const AuthenticationChallenge& challenge)
diff --git a/WebKit2/WebProcess/mac/WebProcessMainMac.mm b/WebKit2/WebProcess/mac/WebProcessMainMac.mm
index 4d84d8a..2f455f4 100644
--- a/WebKit2/WebProcess/mac/WebProcessMainMac.mm
+++ b/WebKit2/WebProcess/mac/WebProcessMainMac.mm
@@ -104,9 +104,6 @@ int WebProcessMain(const CommandLine& commandLine)
         return 2;
     }
 
-    // Disallow access to the user keychain.
-    SecKeychainSetPreferenceDomain(kSecPreferencesDomainSystem);
-
 #if !SHOW_CRASH_REPORTER
     // Installs signal handlers that exit on a crash so that CrashReporter does not show up.
     signal(SIGILL, _exit);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list