Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Side by Side Diff: WebCore/loader/WorkerThreadableLoader.cpp

Issue 28077: WebKit side of merge from r41149 to r41181. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/WebKit/
Patch Set: Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 { 192 {
193 ASSERT_UNUSED(context, context->isWorkerContext()); 193 ASSERT_UNUSED(context, context->isWorkerContext());
194 workerClientWrapper->didFail(error); 194 workerClientWrapper->didFail(error);
195 } 195 }
196 196
197 void WorkerThreadableLoader::MainThreadBridge::didFail(const ResourceError& erro r) 197 void WorkerThreadableLoader::MainThreadBridge::didFail(const ResourceError& erro r)
198 { 198 {
199 m_messagingProxy.postTaskToWorkerContext(createCallbackTask(&workerContextDi dFail, m_workerClientWrapper, error)); 199 m_messagingProxy.postTaskToWorkerContext(createCallbackTask(&workerContextDi dFail, m_workerClientWrapper, error));
200 } 200 }
201 201
202 static void workerContextDidFailRedirectCheck(ScriptExecutionContext* context, R efPtr<ThreadableLoaderClientWrapper> workerClientWrapper)
203 {
204 ASSERT_UNUSED(context, context->isWorkerContext());
205 workerClientWrapper->didFailRedirectCheck();
206 }
207
208 void WorkerThreadableLoader::MainThreadBridge::didFailRedirectCheck()
209 {
210 m_messagingProxy.postTaskToWorkerContext(createCallbackTask(&workerContextDi dFailRedirectCheck, m_workerClientWrapper));
211 }
212
202 static void workerContextDidReceiveAuthenticationCancellation(ScriptExecutionCon text* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, auto_p tr<CrossThreadResourceResponseData> responseData) 213 static void workerContextDidReceiveAuthenticationCancellation(ScriptExecutionCon text* context, RefPtr<ThreadableLoaderClientWrapper> workerClientWrapper, auto_p tr<CrossThreadResourceResponseData> responseData)
203 { 214 {
204 ASSERT_UNUSED(context, context->isWorkerContext()); 215 ASSERT_UNUSED(context, context->isWorkerContext());
205 OwnPtr<ResourceResponse> response(ResourceResponse::adopt(responseData)); 216 OwnPtr<ResourceResponse> response(ResourceResponse::adopt(responseData));
206 workerClientWrapper->didReceiveAuthenticationCancellation(*response); 217 workerClientWrapper->didReceiveAuthenticationCancellation(*response);
207 } 218 }
208 219
209 void WorkerThreadableLoader::MainThreadBridge::didReceiveAuthenticationCancellat ion(const ResourceResponse& response) 220 void WorkerThreadableLoader::MainThreadBridge::didReceiveAuthenticationCancellat ion(const ResourceResponse& response)
210 { 221 {
211 m_messagingProxy.postTaskToWorkerContext(createCallbackTask(&workerContextDi dReceiveAuthenticationCancellation, m_workerClientWrapper, response)); 222 m_messagingProxy.postTaskToWorkerContext(createCallbackTask(&workerContextDi dReceiveAuthenticationCancellation, m_workerClientWrapper, response));
212 } 223 }
213 224
214 } // namespace WebCore 225 } // namespace WebCore
215 226
216 #endif // ENABLE(WORKERS) 227 #endif // ENABLE(WORKERS)
OLDNEW
« no previous file with comments | « WebCore/loader/WorkerThreadableLoader.h ('k') | WebCore/loader/appcache/ApplicationCacheGroup.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698