Skip to content

Commit b7a0302

Browse files
Benjamin PoulainBenjaminPoulain
Benjamin Poulain
authored and
BenjaminPoulain
committed
Fix a silly mistake of r160467
https://bugs.webkit.org/show_bug.cgi?id=125657 Patch by Benjamin Poulain <bpoulain@apple.com> on 2013-12-12 Reviewed by Alexey Proskuryakov. Fix a typo. The validity check was missing the logical not. * platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp: (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveData): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFinishLoading): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFail): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveChallenge): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::shouldUseCredentialStorage): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToProtectionSpace): (WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray): Canonical link: https://commits.webkit.org/143696@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160525 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 677b734 commit b7a0302

2 files changed

Lines changed: 33 additions & 11 deletions

File tree

‎Source/WebCore/ChangeLog‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2013-12-12 Benjamin Poulain <bpoulain@apple.com>
2+
3+
Fix a silly mistake of r160467
4+
https://bugs.webkit.org/show_bug.cgi?id=125657
5+
6+
Reviewed by Alexey Proskuryakov.
7+
8+
Fix a typo. The validity check was missing the logical not.
9+
10+
* platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp:
11+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSendRequest):
12+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse):
13+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveData):
14+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFinishLoading):
15+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFail):
16+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::willCacheResponse):
17+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveChallenge):
18+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData):
19+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::shouldUseCredentialStorage):
20+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToProtectionSpace):
21+
(WebCore::ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArray):
22+
123
2013-12-12 Tim Horton <timothy_horton@apple.com>
224

325
[wk2] Handle pinch-to-zoom gesture

‎Source/WebCore/platform/network/cf/ResourceHandleCFURLConnectionDelegateWithOperationQueue.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ CFURLRequestRef ResourceHandleCFURLConnectionDelegateWithOperationQueue::willSen
7676
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
7777

7878
dispatch_async(dispatch_get_main_queue(), ^{
79-
if (protector->hasHandle()) {
79+
if (!protector->hasHandle()) {
8080
continueWillSendRequest(nullptr);
8181
return;
8282
}
@@ -103,7 +103,7 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveResponse
103103
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
104104

105105
dispatch_async(dispatch_get_main_queue(), ^{
106-
if (protector->hasHandle()) {
106+
if (!protector->hasHandle()) {
107107
continueDidReceiveResponse();
108108
return;
109109
}
@@ -133,7 +133,7 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveData(CFD
133133
CFRetain(data);
134134

135135
dispatch_async(dispatch_get_main_queue(), ^{
136-
if (!protector->hasHandle()) {
136+
if (protector->hasHandle()) {
137137
LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveData(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
138138

139139
m_handle->client()->didReceiveBuffer(m_handle, SharedBuffer::wrapCFData(data), originalLength);
@@ -147,7 +147,7 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFinishLoading()
147147
{
148148
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
149149
dispatch_async(dispatch_get_main_queue(), ^{
150-
if (protector->hasHandle())
150+
if (!protector->hasHandle())
151151
return;
152152

153153
LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFinishLoading(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
@@ -161,7 +161,7 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFail(CFErrorRef
161161
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
162162
CFRetain(error);
163163
dispatch_async(dispatch_get_main_queue(), ^{
164-
if (!protector->hasHandle()) {
164+
if (protector->hasHandle()) {
165165
LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didFail(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
166166

167167
m_handle->client()->didFail(m_handle, ResourceError(error));
@@ -176,7 +176,7 @@ CFCachedURLResponseRef ResourceHandleCFURLConnectionDelegateWithOperationQueue::
176176
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
177177

178178
dispatch_async(dispatch_get_main_queue(), ^{
179-
if (protector->hasHandle()) {
179+
if (!protector->hasHandle()) {
180180
continueWillCacheResponse(nullptr);
181181
return;
182182
}
@@ -194,7 +194,7 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveChalleng
194194
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
195195
CFRetain(challenge);
196196
dispatch_async(dispatch_get_main_queue(), ^{
197-
if (!protector->hasHandle()) {
197+
if (protector->hasHandle()) {
198198
LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveChallenge(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
199199

200200
m_handle->didReceiveAuthenticationChallenge(AuthenticationChallenge(challenge, m_handle));
@@ -208,7 +208,7 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData(CF
208208
{
209209
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
210210
dispatch_async(dispatch_get_main_queue(), ^{
211-
if (protector->hasHandle())
211+
if (!protector->hasHandle())
212212
return;
213213

214214
LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
@@ -222,7 +222,7 @@ Boolean ResourceHandleCFURLConnectionDelegateWithOperationQueue::shouldUseCreden
222222
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
223223

224224
dispatch_async(dispatch_get_main_queue(), ^{
225-
if (protector->hasHandle()) {
225+
if (!protector->hasHandle()) {
226226
continueShouldUseCredentialStorage(false);
227227
return;
228228
}
@@ -241,7 +241,7 @@ Boolean ResourceHandleCFURLConnectionDelegateWithOperationQueue::canRespondToPro
241241
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
242242

243243
dispatch_async(dispatch_get_main_queue(), ^{
244-
if (protector->hasHandle()) {
244+
if (!protector->hasHandle()) {
245245
continueCanAuthenticateAgainstProtectionSpace(false);
246246
return;
247247
}
@@ -269,7 +269,7 @@ void ResourceHandleCFURLConnectionDelegateWithOperationQueue::didReceiveDataArra
269269
RefPtr<ResourceHandleCFURLConnectionDelegateWithOperationQueue> protector(this);
270270
CFRetain(dataArray);
271271
dispatch_async(dispatch_get_main_queue(), ^{
272-
if (!protector->hasHandle()) {
272+
if (protector->hasHandle()) {
273273
LOG(Network, "CFNet - ResourceHandleCFURLConnectionDelegateWithOperationQueue::didSendBodyData(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
274274

275275
m_handle->handleDataArray(dataArray);

0 commit comments

Comments
 (0)