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

Side by Side Diff: webkit/appcache/appcache_interceptor.cc

Issue 5384002: net: Remove typedef net::URLRequest URLRequest; (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 10 years 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 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/appcache/appcache_interceptor.h" 5 #include "webkit/appcache/appcache_interceptor.h"
6 6
7 #include "webkit/appcache/appcache_backend_impl.h" 7 #include "webkit/appcache/appcache_backend_impl.h"
8 #include "webkit/appcache/appcache_host.h" 8 #include "webkit/appcache/appcache_host.h"
9 #include "webkit/appcache/appcache_interfaces.h" 9 #include "webkit/appcache/appcache_interfaces.h"
10 #include "webkit/appcache/appcache_request_handler.h" 10 #include "webkit/appcache/appcache_request_handler.h"
11 #include "webkit/appcache/appcache_service.h" 11 #include "webkit/appcache/appcache_service.h"
12 #include "webkit/appcache/appcache_url_request_job.h" 12 #include "webkit/appcache/appcache_url_request_job.h"
13 13
14 namespace appcache { 14 namespace appcache {
15 15
16 void AppCacheInterceptor::SetHandler( 16 void AppCacheInterceptor::SetHandler(
17 URLRequest* request, AppCacheRequestHandler* handler) { 17 net::URLRequest* request, AppCacheRequestHandler* handler) {
18 request->SetUserData(instance(), handler); // request takes ownership 18 request->SetUserData(instance(), handler); // request takes ownership
19 } 19 }
20 20
21 AppCacheRequestHandler* AppCacheInterceptor::GetHandler(URLRequest* request) { 21 AppCacheRequestHandler* AppCacheInterceptor::GetHandler(
22 net::URLRequest* request) {
22 return reinterpret_cast<AppCacheRequestHandler*>( 23 return reinterpret_cast<AppCacheRequestHandler*>(
23 request->GetUserData(instance())); 24 request->GetUserData(instance()));
24 } 25 }
25 26
26 void AppCacheInterceptor::SetExtraRequestInfo( 27 void AppCacheInterceptor::SetExtraRequestInfo(
27 URLRequest* request, AppCacheService* service, int process_id, 28 net::URLRequest* request, AppCacheService* service, int process_id,
28 int host_id, ResourceType::Type resource_type) { 29 int host_id, ResourceType::Type resource_type) {
29 if (!service || (host_id == kNoHostId)) 30 if (!service || (host_id == kNoHostId))
30 return; 31 return;
31 32
32 AppCacheBackendImpl* backend = service->GetBackend(process_id); 33 AppCacheBackendImpl* backend = service->GetBackend(process_id);
33 if (!backend) 34 if (!backend)
34 return; 35 return;
35 36
36 // TODO(michaeln): An invalid host id is indicative of bad data 37 // TODO(michaeln): An invalid host id is indicative of bad data
37 // from a child process. How should we handle that here? 38 // from a child process. How should we handle that here?
38 AppCacheHost* host = backend->GetHost(host_id); 39 AppCacheHost* host = backend->GetHost(host_id);
39 if (!host) 40 if (!host)
40 return; 41 return;
41 42
42 // Create a handler for this request and associate it with the request. 43 // Create a handler for this request and associate it with the request.
43 AppCacheRequestHandler* handler = 44 AppCacheRequestHandler* handler =
44 host->CreateRequestHandler(request, resource_type); 45 host->CreateRequestHandler(request, resource_type);
45 if (handler) 46 if (handler)
46 SetHandler(request, handler); 47 SetHandler(request, handler);
47 } 48 }
48 49
49 void AppCacheInterceptor::GetExtraResponseInfo(URLRequest* request, 50 void AppCacheInterceptor::GetExtraResponseInfo(net::URLRequest* request,
50 int64* cache_id, 51 int64* cache_id,
51 GURL* manifest_url) { 52 GURL* manifest_url) {
52 DCHECK(*cache_id == kNoCacheId); 53 DCHECK(*cache_id == kNoCacheId);
53 DCHECK(manifest_url->is_empty()); 54 DCHECK(manifest_url->is_empty());
54 AppCacheRequestHandler* handler = GetHandler(request); 55 AppCacheRequestHandler* handler = GetHandler(request);
55 if (handler) 56 if (handler)
56 handler->GetExtraResponseInfo(cache_id, manifest_url); 57 handler->GetExtraResponseInfo(cache_id, manifest_url);
57 } 58 }
58 59
59 AppCacheInterceptor::AppCacheInterceptor() { 60 AppCacheInterceptor::AppCacheInterceptor() {
60 URLRequest::RegisterRequestInterceptor(this); 61 net::URLRequest::RegisterRequestInterceptor(this);
61 } 62 }
62 63
63 AppCacheInterceptor::~AppCacheInterceptor() { 64 AppCacheInterceptor::~AppCacheInterceptor() {
64 URLRequest::UnregisterRequestInterceptor(this); 65 net::URLRequest::UnregisterRequestInterceptor(this);
65 } 66 }
66 67
67 URLRequestJob* AppCacheInterceptor::MaybeIntercept(URLRequest* request) { 68 URLRequestJob* AppCacheInterceptor::MaybeIntercept(net::URLRequest* request) {
68 AppCacheRequestHandler* handler = GetHandler(request); 69 AppCacheRequestHandler* handler = GetHandler(request);
69 if (!handler) 70 if (!handler)
70 return NULL; 71 return NULL;
71 return handler->MaybeLoadResource(request); 72 return handler->MaybeLoadResource(request);
72 } 73 }
73 74
74 URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect( 75 URLRequestJob* AppCacheInterceptor::MaybeInterceptRedirect(
75 URLRequest* request, 76 net::URLRequest* request,
76 const GURL& location) { 77 const GURL& location) {
77 AppCacheRequestHandler* handler = GetHandler(request); 78 AppCacheRequestHandler* handler = GetHandler(request);
78 if (!handler) 79 if (!handler)
79 return NULL; 80 return NULL;
80 return handler->MaybeLoadFallbackForRedirect(request, location); 81 return handler->MaybeLoadFallbackForRedirect(request, location);
81 } 82 }
82 83
83 URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse( 84 URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
84 URLRequest* request) { 85 net::URLRequest* request) {
85 AppCacheRequestHandler* handler = GetHandler(request); 86 AppCacheRequestHandler* handler = GetHandler(request);
86 if (!handler) 87 if (!handler)
87 return NULL; 88 return NULL;
88 return handler->MaybeLoadFallbackForResponse(request); 89 return handler->MaybeLoadFallbackForResponse(request);
89 } 90 }
90 91
91 } // namespace appcache 92 } // namespace appcache
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698