Commit f3ada36b authored by psolanki@apple.com's avatar psolanki@apple.com
Browse files

2011-05-11 Pratik Solanki <psolanki@apple.com>

        Reviewed by Andreas Kling.

        Remove empty class CallbackGuard
        https://bugs.webkit.org/show_bug.cgi?id=60610

        CallbackGuard was only ever used on Tiger and it is now an empty class. Remove all uses of it.

        * platform/network/mac/ResourceHandleMac.mm:
        (-[WebCoreResourceHandleAsDelegate connection:willSendRequest:redirectResponse:]):
        (-[WebCoreResourceHandleAsDelegate connectionShouldUseCredentialStorage:]):
        (-[WebCoreResourceHandleAsDelegate connection:didReceiveAuthenticationChallenge:]):
        (-[WebCoreResourceHandleAsDelegate connection:didCancelAuthenticationChallenge:]):
        (-[WebCoreResourceHandleAsDelegate connection:canAuthenticateAgainstProtectionSpace:]):
        (-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
        (-[WebCoreResourceHandleAsDelegate connection:didReceiveData:lengthReceived:]):
        (-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]):
        (-[WebCoreResourceHandleAsDelegate connection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:]):
        (-[WebCoreResourceHandleAsDelegate connectionDidFinishLoading:]):
        (-[WebCoreResourceHandleAsDelegate connection:didFailWithError:]):
        (-[WebCoreResourceHandleAsDelegate connection:willCacheResponse:]):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@86309 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d1e17f04
2011-05-11 Pratik Solanki <psolanki@apple.com>
Reviewed by Andreas Kling.
Remove empty class CallbackGuard
https://bugs.webkit.org/show_bug.cgi?id=60610
CallbackGuard was only ever used on Tiger and it is now an empty class. Remove all uses of it.
* platform/network/mac/ResourceHandleMac.mm:
(-[WebCoreResourceHandleAsDelegate connection:willSendRequest:redirectResponse:]):
(-[WebCoreResourceHandleAsDelegate connectionShouldUseCredentialStorage:]):
(-[WebCoreResourceHandleAsDelegate connection:didReceiveAuthenticationChallenge:]):
(-[WebCoreResourceHandleAsDelegate connection:didCancelAuthenticationChallenge:]):
(-[WebCoreResourceHandleAsDelegate connection:canAuthenticateAgainstProtectionSpace:]):
(-[WebCoreResourceHandleAsDelegate connection:didReceiveResponse:]):
(-[WebCoreResourceHandleAsDelegate connection:didReceiveData:lengthReceived:]):
(-[WebCoreResourceHandleAsDelegate connection:willStopBufferingData:]):
(-[WebCoreResourceHandleAsDelegate connection:didSendBodyData:totalBytesWritten:totalBytesExpectedToWrite:]):
(-[WebCoreResourceHandleAsDelegate connectionDidFinishLoading:]):
(-[WebCoreResourceHandleAsDelegate connection:didFailWithError:]):
(-[WebCoreResourceHandleAsDelegate connection:willCacheResponse:]):
2011-05-11 Luke Macpherson <macpherson@chromium.org> 2011-05-11 Luke Macpherson <macpherson@chromium.org>
   
Reviewed by Eric Seidel. Reviewed by Eric Seidel.
...@@ -137,16 +137,6 @@ namespace WebCore { ...@@ -137,16 +137,6 @@ namespace WebCore {
static bool isInitializingConnection; static bool isInitializingConnection;
#endif #endif
class CallbackGuard {
public:
CallbackGuard()
{
}
~CallbackGuard()
{
}
};
static String encodeBasicAuthorization(const String& user, const String& password) static String encodeBasicAuthorization(const String& user, const String& password)
{ {
return base64Encode((user + ":" + password).utf8()); return base64Encode((user + ":" + password).utf8());
...@@ -717,7 +707,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -717,7 +707,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
} }
} }
CallbackGuard guard;
ResourceRequest request = newRequest; ResourceRequest request = newRequest;
// Should not set Referer after a redirect from a secure resource to non-secure one. // Should not set Referer after a redirect from a secure resource to non-secure one.
...@@ -749,7 +738,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -749,7 +738,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle) if (!m_handle)
return NO; return NO;
CallbackGuard guard;
return m_handle->shouldUseCredentialStorage(); return m_handle->shouldUseCredentialStorage();
} }
...@@ -761,7 +749,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -761,7 +749,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle) if (!m_handle)
return; return;
CallbackGuard guard;
m_handle->didReceiveAuthenticationChallenge(core(challenge)); m_handle->didReceiveAuthenticationChallenge(core(challenge));
} }
...@@ -773,7 +760,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -773,7 +760,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle) if (!m_handle)
return; return;
CallbackGuard guard;
m_handle->didCancelAuthenticationChallenge(core(challenge)); m_handle->didCancelAuthenticationChallenge(core(challenge));
} }
...@@ -785,7 +771,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -785,7 +771,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle) if (!m_handle)
return NO; return NO;
CallbackGuard guard;
return m_handle->canAuthenticateAgainstProtectionSpace(core(protectionSpace)); return m_handle->canAuthenticateAgainstProtectionSpace(core(protectionSpace));
} }
#endif #endif
...@@ -798,7 +783,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -798,7 +783,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle || !m_handle->client()) if (!m_handle || !m_handle->client())
return; return;
CallbackGuard guard;
// Avoid MIME type sniffing if the response comes back as 304 Not Modified. // Avoid MIME type sniffing if the response comes back as 304 Not Modified.
int statusCode = [r respondsToSelector:@selector(statusCode)] ? [(id)r statusCode] : 0; int statusCode = [r respondsToSelector:@selector(statusCode)] ? [(id)r statusCode] : 0;
...@@ -851,7 +835,7 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -851,7 +835,7 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
// FIXME: If we get more than 2B bytes in a single chunk, this code won't do the right thing. // FIXME: If we get more than 2B bytes in a single chunk, this code won't do the right thing.
// However, with today's computers and networking speeds, this won't happen in practice. // However, with today's computers and networking speeds, this won't happen in practice.
// Could be an issue with a giant local file. // Could be an issue with a giant local file.
CallbackGuard guard;
// FIXME: https://bugs.webkit.org/show_bug.cgi?id=19793 // FIXME: https://bugs.webkit.org/show_bug.cgi?id=19793
// -1 means we do not provide any data about transfer size to inspector so it would use // -1 means we do not provide any data about transfer size to inspector so it would use
// Content-Length headers or content size to show transfer size. // Content-Length headers or content size to show transfer size.
...@@ -869,7 +853,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -869,7 +853,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
// FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing. // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
// However, with today's computers and networking speeds, this won't happen in practice. // However, with today's computers and networking speeds, this won't happen in practice.
// Could be an issue with a giant local file. // Could be an issue with a giant local file.
CallbackGuard guard;
m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<int>([data length])); m_handle->client()->willStopBufferingData(m_handle, (const char*)[data bytes], static_cast<int>([data length]));
} }
...@@ -882,7 +865,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -882,7 +865,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle || !m_handle->client()) if (!m_handle || !m_handle->client())
return; return;
CallbackGuard guard;
m_handle->client()->didSendData(m_handle, totalBytesWritten, totalBytesExpectedToWrite); m_handle->client()->didSendData(m_handle, totalBytesWritten, totalBytesExpectedToWrite);
} }
...@@ -894,7 +876,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -894,7 +876,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle || !m_handle->client()) if (!m_handle || !m_handle->client())
return; return;
CallbackGuard guard;
if (!ResourceHandle::didSendBodyDataDelegateExists()) if (!ResourceHandle::didSendBodyDataDelegateExists())
disassociateStreamWithResourceHandle([m_handle->firstRequest().nsURLRequest() HTTPBodyStream]); disassociateStreamWithResourceHandle([m_handle->firstRequest().nsURLRequest() HTTPBodyStream]);
...@@ -910,7 +891,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -910,7 +891,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle || !m_handle->client()) if (!m_handle || !m_handle->client())
return; return;
CallbackGuard guard;
if (!ResourceHandle::didSendBodyDataDelegateExists()) if (!ResourceHandle::didSendBodyDataDelegateExists())
disassociateStreamWithResourceHandle([m_handle->firstRequest().nsURLRequest() HTTPBodyStream]); disassociateStreamWithResourceHandle([m_handle->firstRequest().nsURLRequest() HTTPBodyStream]);
...@@ -933,8 +913,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase() ...@@ -933,8 +913,6 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
if (!m_handle || !m_handle->client()) if (!m_handle || !m_handle->client())
return nil; return nil;
CallbackGuard guard;
NSCachedURLResponse *newResponse = m_handle->client()->willCacheResponse(m_handle, cachedResponse); NSCachedURLResponse *newResponse = m_handle->client()->willCacheResponse(m_handle, cachedResponse);
if (newResponse != cachedResponse) if (newResponse != cachedResponse)
return newResponse; return newResponse;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment