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

Side by Side Diff: Source/core/fetch/ResourceFetcher.cpp

Issue 52563002: Remove TextTrackResource (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@dataReceived
Patch Set: Created 7 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 | « Source/core/fetch/ResourceFetcher.h ('k') | Source/core/fetch/TextTrackResource.h » ('j') | 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 24 matching lines...) Expand all
35 #include "core/fetch/FetchContext.h" 35 #include "core/fetch/FetchContext.h"
36 #include "core/fetch/FetchRequest.h" 36 #include "core/fetch/FetchRequest.h"
37 #include "core/fetch/FontResource.h" 37 #include "core/fetch/FontResource.h"
38 #include "core/fetch/ImageResource.h" 38 #include "core/fetch/ImageResource.h"
39 #include "core/fetch/MemoryCache.h" 39 #include "core/fetch/MemoryCache.h"
40 #include "core/fetch/RawResource.h" 40 #include "core/fetch/RawResource.h"
41 #include "core/fetch/ResourceLoader.h" 41 #include "core/fetch/ResourceLoader.h"
42 #include "core/fetch/ResourceLoaderSet.h" 42 #include "core/fetch/ResourceLoaderSet.h"
43 #include "core/fetch/ScriptResource.h" 43 #include "core/fetch/ScriptResource.h"
44 #include "core/fetch/ShaderResource.h" 44 #include "core/fetch/ShaderResource.h"
45 #include "core/fetch/TextTrackResource.h"
46 #include "core/fetch/XSLStyleSheetResource.h" 45 #include "core/fetch/XSLStyleSheetResource.h"
47 #include "core/html/HTMLElement.h" 46 #include "core/html/HTMLElement.h"
48 #include "core/html/HTMLFrameOwnerElement.h" 47 #include "core/html/HTMLFrameOwnerElement.h"
49 #include "core/html/HTMLImport.h" 48 #include "core/html/HTMLImport.h"
50 #include "core/inspector/InspectorInstrumentation.h" 49 #include "core/inspector/InspectorInstrumentation.h"
51 #include "core/loader/DocumentLoader.h" 50 #include "core/loader/DocumentLoader.h"
52 #include "core/loader/FrameLoader.h" 51 #include "core/loader/FrameLoader.h"
53 #include "core/loader/FrameLoaderClient.h" 52 #include "core/loader/FrameLoaderClient.h"
54 #include "core/loader/PingLoader.h" 53 #include "core/loader/PingLoader.h"
55 #include "core/loader/UniqueIdentifier.h" 54 #include "core/loader/UniqueIdentifier.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 return new FontResource(request); 87 return new FontResource(request);
89 case Resource::Raw: 88 case Resource::Raw:
90 case Resource::MainResource: 89 case Resource::MainResource:
91 return new RawResource(request, type); 90 return new RawResource(request, type);
92 case Resource::XSLStyleSheet: 91 case Resource::XSLStyleSheet:
93 return new XSLStyleSheetResource(request); 92 return new XSLStyleSheetResource(request);
94 case Resource::LinkPrefetch: 93 case Resource::LinkPrefetch:
95 return new Resource(request, Resource::LinkPrefetch); 94 return new Resource(request, Resource::LinkPrefetch);
96 case Resource::LinkSubresource: 95 case Resource::LinkSubresource:
97 return new Resource(request, Resource::LinkSubresource); 96 return new Resource(request, Resource::LinkSubresource);
98 case Resource::TextTrack: 97 case Resource::TextTrack:
Nate Chapin 2013/10/30 16:30:53 Nit: move this case up to be next to Resource::Raw
philipj_slow 2013/10/30 19:51:17 Done.
99 return new TextTrackResource(request); 98 return new RawResource(request, type);
100 case Resource::Shader: 99 case Resource::Shader:
101 return new ShaderResource(request); 100 return new ShaderResource(request);
102 case Resource::ImportResource: 101 case Resource::ImportResource:
103 return new RawResource(request, type); 102 return new RawResource(request, type);
104 } 103 }
105 104
106 ASSERT_NOT_REACHED(); 105 ASSERT_NOT_REACHED();
107 return 0; 106 return 0;
108 } 107 }
109 108
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 302
304 if (Resource* resource = resourceFromDataURIRequest(request.resourceRequest( ), request.options())) 303 if (Resource* resource = resourceFromDataURIRequest(request.resourceRequest( ), request.options()))
305 memoryCache()->add(resource); 304 memoryCache()->add(resource);
306 } 305 }
307 306
308 ResourcePtr<FontResource> ResourceFetcher::fetchFont(FetchRequest& request) 307 ResourcePtr<FontResource> ResourceFetcher::fetchFont(FetchRequest& request)
309 { 308 {
310 return static_cast<FontResource*>(requestResource(Resource::Font, request).g et()); 309 return static_cast<FontResource*>(requestResource(Resource::Font, request).g et());
311 } 310 }
312 311
313 ResourcePtr<TextTrackResource> ResourceFetcher::fetchTextTrack(FetchRequest& req uest)
314 {
315 return static_cast<TextTrackResource*>(requestResource(Resource::TextTrack, request).get());
316 }
317
318 ResourcePtr<ShaderResource> ResourceFetcher::fetchShader(FetchRequest& request) 312 ResourcePtr<ShaderResource> ResourceFetcher::fetchShader(FetchRequest& request)
319 { 313 {
320 return static_cast<ShaderResource*>(requestResource(Resource::Shader, reques t).get()); 314 return static_cast<ShaderResource*>(requestResource(Resource::Shader, reques t).get());
321 } 315 }
322 316
323 ResourcePtr<RawResource> ResourceFetcher::fetchImport(FetchRequest& request) 317 ResourcePtr<RawResource> ResourceFetcher::fetchImport(FetchRequest& request)
324 { 318 {
325 return static_cast<RawResource*>(requestResource(Resource::ImportResource, r equest).get()); 319 return static_cast<RawResource*>(requestResource(Resource::ImportResource, r equest).get());
326 } 320 }
327 321
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1327 } 1321 }
1328 #endif 1322 #endif
1329 1323
1330 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions() 1324 const ResourceLoaderOptions& ResourceFetcher::defaultResourceOptions()
1331 { 1325 {
1332 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffCon tent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientF orCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, UseDefaul tOriginRestrictionsForType, DocumentContext)); 1326 DEFINE_STATIC_LOCAL(ResourceLoaderOptions, options, (SendCallbacks, SniffCon tent, BufferData, AllowStoredCredentials, ClientRequestedCredentials, AskClientF orCrossOriginCredentials, DoSecurityCheck, CheckContentSecurityPolicy, UseDefaul tOriginRestrictionsForType, DocumentContext));
1333 return options; 1327 return options;
1334 } 1328 }
1335 1329
1336 } 1330 }
OLDNEW
« no previous file with comments | « Source/core/fetch/ResourceFetcher.h ('k') | Source/core/fetch/TextTrackResource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698