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

Side by Side Diff: sky/engine/core/fetch/ResourceFetcher.cpp

Issue 690823002: Remove a number of frontends to ResourceFetcher (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « sky/engine/core/fetch/ResourceFetcher.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
7 7
8 This library is free software; you can redistribute it and/or 8 This library is free software; you can redistribute it and/or
9 modify it under the terms of the GNU Library General Public 9 modify it under the terms of the GNU Library General Public
10 License as published by the Free Software Foundation; either 10 License as published by the Free Software Foundation; either
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 229 }
230 } 230 }
231 231
232 ResourcePtr<FontResource> ResourceFetcher::fetchFont(FetchRequest& request) 232 ResourcePtr<FontResource> ResourceFetcher::fetchFont(FetchRequest& request)
233 { 233 {
234 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone ); 234 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone );
235 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textFont); 235 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textFont);
236 return toFontResource(requestResource(Resource::Font, request)); 236 return toFontResource(requestResource(Resource::Font, request));
237 } 237 }
238 238
239 ResourcePtr<RawResource> ResourceFetcher::fetchImport(FetchRequest& request)
240 {
241 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone );
242 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textImport);
243 return toRawResource(requestResource(Resource::ImportResource, request));
244 }
245
246 ResourcePtr<Resource> ResourceFetcher::fetchLinkResource(Resource::Type type, Fe tchRequest& request)
247 {
248 ASSERT(frame());
249 ASSERT(type == Resource::LinkPrefetch || type == Resource::LinkSubresource);
250 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone );
251 request.mutableResourceRequest().setRequestContext(type == Resource::LinkPre fetch ? WebURLRequest::RequestContextPrefetch : WebURLRequest::RequestContextSub resource);
252 return requestResource(type, request);
253 }
254
255 ResourcePtr<RawResource> ResourceFetcher::fetchRawResource(FetchRequest& request )
256 {
257 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone );
258 ASSERT(request.resourceRequest().requestContext() != WebURLRequest::RequestC ontextUnspecified);
259 return toRawResource(requestResource(Resource::Raw, request));
260 }
261
262 ResourcePtr<RawResource> ResourceFetcher::fetchMedia(FetchRequest& request)
263 {
264 ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone );
265 // FIXME: Split this into audio and video.
266 request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestCon textVideo);
267 return toRawResource(requestResource(Resource::Media, request));
268 }
269
270 bool ResourceFetcher::canRequest(Resource::Type type, const KURL& url, const Res ourceLoaderOptions& options, bool forPreload, FetchRequest::OriginRestriction or iginRestriction) const 239 bool ResourceFetcher::canRequest(Resource::Type type, const KURL& url, const Res ourceLoaderOptions& options, bool forPreload, FetchRequest::OriginRestriction or iginRestriction) const
271 { 240 {
272 // FIXME(sky): Remove 241 // FIXME(sky): Remove
273 return true; 242 return true;
274 } 243 }
275 244
276 bool ResourceFetcher::shouldLoadNewResource(Resource::Type type) const 245 bool ResourceFetcher::shouldLoadNewResource(Resource::Type type) const
277 { 246 {
278 if (!frame()) 247 if (!frame())
279 return false; 248 return false;
(...skipping 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 case Revalidate: 930 case Revalidate:
962 ++m_revalidateCount; 931 ++m_revalidateCount;
963 return; 932 return;
964 case Use: 933 case Use:
965 ++m_useCount; 934 ++m_useCount;
966 return; 935 return;
967 } 936 }
968 } 937 }
969 938
970 } 939 }
OLDNEW
« no previous file with comments | « sky/engine/core/fetch/ResourceFetcher.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698