Attachment 104190 Details for Bug 65330 – Remove getShouldUseCredentialStorage() - with more ChangeLog

[patch] Remove getShouldUseCredentialStorage() - with more ChangeLog

shoulduse.txt (text/plain), 5.82 KB, created by Nate Chapin on 2011-08-17 10:22:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nate Chapin

Created: 2011-08-17 10:22:44 PDT

Size: 5.82 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 93212)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,24 @@
>+2011-08-17  Nate Chapin  <japhet@chromium.org>
>+
>+        Remove getShouldUseCredentialStorage() from SubresourceLoaderClient.
>+        Its only implementation is in DocumentThreadableLoader, where it is
>+        based on the same variable that is used to forbid cookies for the
>+        request in question.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        No new tests, no functionality change intended.
>+
>+        * loader/DocumentThreadableLoader.cpp:
>+        * loader/DocumentThreadableLoader.h:
>+        * loader/ResourceLoader.cpp:
>+        (WebCore::ResourceLoader::shouldUseCredentialStorage): Don't ask the
>+            embedder whether we can access credential storage if cookies are
>+            forbidden.
>+        * loader/SubresourceLoader.cpp:
>+        * loader/SubresourceLoader.h:
>+        * loader/SubresourceLoaderClient.h:
>+
> 2011-08-17  Sailesh Agrawal  <sail@chromium.org>
> 
>         Chromium Mac: Fix implementation of wkScrollbarMinimumTotalLengthNeededForThumb to match WebKitSystemInterface
>Index: Source/WebCore/loader/SubresourceLoaderClient.h
>===================================================================
>--- Source/WebCore/loader/SubresourceLoaderClient.h	(revision 93212)
>+++ Source/WebCore/loader/SubresourceLoaderClient.h	(working copy)
>@@ -51,7 +51,6 @@
>     virtual void didFinishLoading(SubresourceLoader*, double /*finishTime*/) { }
>     virtual void didFail(SubresourceLoader*, const ResourceError&) { }
>     
>-    virtual bool getShouldUseCredentialStorage(SubresourceLoader*, bool& /*shouldUseCredentialStorage*/) { return false; }
>     virtual void didReceiveAuthenticationChallenge(SubresourceLoader*, const AuthenticationChallenge&) { }
> };
> 
>Index: Source/WebCore/loader/ResourceLoader.cpp
>===================================================================
>--- Source/WebCore/loader/ResourceLoader.cpp	(revision 93212)
>+++ Source/WebCore/loader/ResourceLoader.cpp	(working copy)
>@@ -519,6 +519,16 @@
> #endif
>     if (!fastMallocSize(documentLoader()->frame()))
>         CRASH();
>+
>+    // This is sort of a weird check, because cookies and stored credentials aren't the same thing.
>+    // There are two reasons for it:
>+    // (1) The places where we've traditionally had a blanket ban on stored credentials were identical
>+    //     to the places where we forbade cookies.
>+    // (2) It seems like if we don't feel it's safe to send cookies, we certainly shouldn't be sending
>+    //     stored credentials.
>+    if (!m_request.allowCookies())
>+        return false;
>+    
>     RefPtr<ResourceLoader> protector(this);
>     return frameLoader()->client()->shouldUseCredentialStorage(documentLoader(), identifier());
> }
>Index: Source/WebCore/loader/DocumentThreadableLoader.h
>===================================================================
>--- Source/WebCore/loader/DocumentThreadableLoader.h	(revision 93212)
>+++ Source/WebCore/loader/DocumentThreadableLoader.h	(working copy)
>@@ -82,7 +82,6 @@
>         virtual void didFinishLoading(SubresourceLoader*, double);
>         virtual void didFail(SubresourceLoader*, const ResourceError&);
> 
>-        virtual bool getShouldUseCredentialStorage(SubresourceLoader*, bool& shouldUseCredentialStorage);
>         virtual void didReceiveAuthenticationChallenge(SubresourceLoader*, const AuthenticationChallenge&);
> 
>         void didReceiveResponse(unsigned long identifier, const ResourceResponse&);
>Index: Source/WebCore/loader/SubresourceLoader.cpp
>===================================================================
>--- Source/WebCore/loader/SubresourceLoader.cpp	(revision 93212)
>+++ Source/WebCore/loader/SubresourceLoader.cpp	(working copy)
>@@ -235,17 +235,6 @@
>     m_documentLoader->removeSubresourceLoader(this);
> }
> 
>-bool SubresourceLoader::shouldUseCredentialStorage()
>-{
>-    RefPtr<SubresourceLoader> protect(this);
>-
>-    bool shouldUse;
>-    if (m_client && m_client->getShouldUseCredentialStorage(this, shouldUse))
>-        return shouldUse;
>-
>-    return ResourceLoader::shouldUseCredentialStorage();
>-}
>-
> void SubresourceLoader::didReceiveAuthenticationChallenge(const AuthenticationChallenge& challenge)
> {
>     RefPtr<SubresourceLoader> protect(this);
>Index: Source/WebCore/loader/DocumentThreadableLoader.cpp
>===================================================================
>--- Source/WebCore/loader/DocumentThreadableLoader.cpp	(revision 93212)
>+++ Source/WebCore/loader/DocumentThreadableLoader.cpp	(working copy)
>@@ -288,18 +288,6 @@
>     m_client->didFail(error);
> }
> 
>-bool DocumentThreadableLoader::getShouldUseCredentialStorage(SubresourceLoader* loader, bool& shouldUseCredentialStorage)
>-{
>-    ASSERT_UNUSED(loader, loader == m_loader || !m_loader);
>-
>-    if (!m_options.allowCredentials) {
>-        shouldUseCredentialStorage = false;
>-        return true;
>-    }
>-
>-    return false; // Only FrameLoaderClient can ultimately permit credential use.
>-}
>-
> void DocumentThreadableLoader::didReceiveAuthenticationChallenge(SubresourceLoader* loader, const AuthenticationChallenge& challenge)
> {
>     ASSERT(loader == m_loader);
>Index: Source/WebCore/loader/SubresourceLoader.h
>===================================================================
>--- Source/WebCore/loader/SubresourceLoader.h	(revision 93212)
>+++ Source/WebCore/loader/SubresourceLoader.h	(working copy)
>@@ -56,7 +56,6 @@
>         virtual void didReceiveCachedMetadata(const char*, int);
>         virtual void didFinishLoading(double finishTime);
>         virtual void didFail(const ResourceError&);
>-        virtual bool shouldUseCredentialStorage();
>         virtual void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
>         virtual void willCancel(const ResourceError&);
>         virtual void didCancel(const ResourceError&);

Actions: View | Formatted Diff | Diff

Attachments on bug 65330: 102275 | 102970 | 102985 | 102990 | 103077 | 103316 | 104190 | 104198 | 104727 | 105410 | 105654 | 105664 | 108242