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

Side by Side Diff: Source/core/loader/cache/CachedResourceLoader.cpp

Issue 15556002: Refactoring: Generalize CachedSVGDocument for non-SVG use. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Resolved the conflict. Created 7 years, 7 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) 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 <wtf/UnusedParam.h> 35 #include <wtf/UnusedParam.h>
36 #include "bindings/v8/ScriptController.h" 36 #include "bindings/v8/ScriptController.h"
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/html/HTMLElement.h" 38 #include "core/html/HTMLElement.h"
39 #include "core/html/HTMLFrameOwnerElement.h" 39 #include "core/html/HTMLFrameOwnerElement.h"
40 #include "core/loader/DocumentLoader.h" 40 #include "core/loader/DocumentLoader.h"
41 #include "core/loader/FrameLoader.h" 41 #include "core/loader/FrameLoader.h"
42 #include "core/loader/FrameLoaderClient.h" 42 #include "core/loader/FrameLoaderClient.h"
43 #include "core/loader/PingLoader.h" 43 #include "core/loader/PingLoader.h"
44 #include "core/loader/cache/CachedCSSStyleSheet.h" 44 #include "core/loader/cache/CachedCSSStyleSheet.h"
45 #include "core/loader/cache/CachedDocument.h"
45 #include "core/loader/cache/CachedFont.h" 46 #include "core/loader/cache/CachedFont.h"
46 #include "core/loader/cache/CachedImage.h" 47 #include "core/loader/cache/CachedImage.h"
47 #include "core/loader/cache/CachedRawResource.h" 48 #include "core/loader/cache/CachedRawResource.h"
48 #include "core/loader/cache/CachedResourceRequest.h" 49 #include "core/loader/cache/CachedResourceRequest.h"
49 #include "core/loader/cache/CachedSVGDocument.h"
50 #include "core/loader/cache/CachedScript.h" 50 #include "core/loader/cache/CachedScript.h"
51 #include "core/loader/cache/CachedShader.h" 51 #include "core/loader/cache/CachedShader.h"
52 #include "core/loader/cache/CachedXSLStyleSheet.h" 52 #include "core/loader/cache/CachedXSLStyleSheet.h"
53 #include "core/loader/cache/MemoryCache.h" 53 #include "core/loader/cache/MemoryCache.h"
54 #include "core/page/Console.h" 54 #include "core/page/Console.h"
55 #include "core/page/ContentSecurityPolicy.h" 55 #include "core/page/ContentSecurityPolicy.h"
56 #include "core/page/DOMWindow.h" 56 #include "core/page/DOMWindow.h"
57 #include "core/page/Frame.h" 57 #include "core/page/Frame.h"
58 #include "core/page/Performance.h" 58 #include "core/page/Performance.h"
59 #include "core/page/Settings.h" 59 #include "core/page/Settings.h"
(...skipping 10 matching lines...) Expand all
70 static CachedResource* createResource(CachedResource::Type type, ResourceRequest & request, const String& charset) 70 static CachedResource* createResource(CachedResource::Type type, ResourceRequest & request, const String& charset)
71 { 71 {
72 switch (type) { 72 switch (type) {
73 case CachedResource::ImageResource: 73 case CachedResource::ImageResource:
74 return new CachedImage(request); 74 return new CachedImage(request);
75 case CachedResource::CSSStyleSheet: 75 case CachedResource::CSSStyleSheet:
76 return new CachedCSSStyleSheet(request, charset); 76 return new CachedCSSStyleSheet(request, charset);
77 case CachedResource::Script: 77 case CachedResource::Script:
78 return new CachedScript(request, charset); 78 return new CachedScript(request, charset);
79 case CachedResource::SVGDocumentResource: 79 case CachedResource::SVGDocumentResource:
80 return new CachedSVGDocument(request); 80 return new CachedDocument(request, CachedResource::SVGDocumentResource);
81 case CachedResource::FontResource: 81 case CachedResource::FontResource:
82 return new CachedFont(request); 82 return new CachedFont(request);
83 case CachedResource::RawResource: 83 case CachedResource::RawResource:
84 case CachedResource::MainResource: 84 case CachedResource::MainResource:
85 return new CachedRawResource(request, type); 85 return new CachedRawResource(request, type);
86 case CachedResource::XSLStyleSheet: 86 case CachedResource::XSLStyleSheet:
87 return new CachedXSLStyleSheet(request); 87 return new CachedXSLStyleSheet(request);
88 case CachedResource::LinkPrefetch: 88 case CachedResource::LinkPrefetch:
89 return new CachedResource(request, CachedResource::LinkPrefetch); 89 return new CachedResource(request, CachedResource::LinkPrefetch);
90 case CachedResource::LinkSubresource: 90 case CachedResource::LinkSubresource:
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 CachedResourceHandle<CachedScript> CachedResourceLoader::requestScript(CachedRes ourceRequest& request) 188 CachedResourceHandle<CachedScript> CachedResourceLoader::requestScript(CachedRes ourceRequest& request)
189 { 189 {
190 return static_cast<CachedScript*>(requestResource(CachedResource::Script, re quest).get()); 190 return static_cast<CachedScript*>(requestResource(CachedResource::Script, re quest).get());
191 } 191 }
192 192
193 CachedResourceHandle<CachedXSLStyleSheet> CachedResourceLoader::requestXSLStyleS heet(CachedResourceRequest& request) 193 CachedResourceHandle<CachedXSLStyleSheet> CachedResourceLoader::requestXSLStyleS heet(CachedResourceRequest& request)
194 { 194 {
195 return static_cast<CachedXSLStyleSheet*>(requestResource(CachedResource::XSL StyleSheet, request).get()); 195 return static_cast<CachedXSLStyleSheet*>(requestResource(CachedResource::XSL StyleSheet, request).get());
196 } 196 }
197 197
198 CachedResourceHandle<CachedSVGDocument> CachedResourceLoader::requestSVGDocument (CachedResourceRequest& request) 198 CachedResourceHandle<CachedDocument> CachedResourceLoader::requestSVGDocument(Ca chedResourceRequest& request)
199 { 199 {
200 return static_cast<CachedSVGDocument*>(requestResource(CachedResource::SVGDo cumentResource, request).get()); 200 return static_cast<CachedDocument*>(requestResource(CachedResource::SVGDocum entResource, request).get());
201 } 201 }
202 202
203 CachedResourceHandle<CachedResource> CachedResourceLoader::requestLinkResource(C achedResource::Type type, CachedResourceRequest& request) 203 CachedResourceHandle<CachedResource> CachedResourceLoader::requestLinkResource(C achedResource::Type type, CachedResourceRequest& request)
204 { 204 {
205 ASSERT(frame()); 205 ASSERT(frame());
206 ASSERT(type == CachedResource::LinkPrefetch || type == CachedResource::LinkS ubresource); 206 ASSERT(type == CachedResource::LinkPrefetch || type == CachedResource::LinkS ubresource);
207 return requestResource(type, request); 207 return requestResource(type, request);
208 } 208 }
209 209
210 CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestRawResource (CachedResourceRequest& request) 210 CachedResourceHandle<CachedRawResource> CachedResourceLoader::requestRawResource (CachedResourceRequest& request)
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 info.addMember(m_garbageCollectDocumentResourcesTimer, "garbageCollectDocume ntResourcesTimer"); 975 info.addMember(m_garbageCollectDocumentResourcesTimer, "garbageCollectDocume ntResourcesTimer");
976 } 976 }
977 977
978 const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions( ) 978 const ResourceLoaderOptions& CachedResourceLoader::defaultCachedResourceOptions( )
979 { 979 {
980 static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData , AllowStoredCredentials, ClientRequestedCredentials, AskClientForCrossOriginCre dentials, DoSecurityCheck, CheckContentSecurityPolicy); 980 static ResourceLoaderOptions options(SendCallbacks, SniffContent, BufferData , AllowStoredCredentials, ClientRequestedCredentials, AskClientForCrossOriginCre dentials, DoSecurityCheck, CheckContentSecurityPolicy);
981 return options; 981 return options;
982 } 982 }
983 983
984 } 984 }
OLDNEW
« no previous file with comments | « Source/core/loader/cache/CachedResourceLoader.h ('k') | Source/core/loader/cache/CachedSVGDocument.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698