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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/loader/cache/CachedResourceLoader.h ('k') | Source/core/loader/cache/CachedSVGDocument.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/cache/CachedResourceLoader.cpp
diff --git a/Source/core/loader/cache/CachedResourceLoader.cpp b/Source/core/loader/cache/CachedResourceLoader.cpp
index 9ae18ac2324d66a1e561900065e73c4c8fcde42d..841708aac540e126a08e4f74de335ce3a7639c52 100644
--- a/Source/core/loader/cache/CachedResourceLoader.cpp
+++ b/Source/core/loader/cache/CachedResourceLoader.cpp
@@ -42,11 +42,11 @@
#include "core/loader/FrameLoaderClient.h"
#include "core/loader/PingLoader.h"
#include "core/loader/cache/CachedCSSStyleSheet.h"
+#include "core/loader/cache/CachedDocument.h"
#include "core/loader/cache/CachedFont.h"
#include "core/loader/cache/CachedImage.h"
#include "core/loader/cache/CachedRawResource.h"
#include "core/loader/cache/CachedResourceRequest.h"
-#include "core/loader/cache/CachedSVGDocument.h"
#include "core/loader/cache/CachedScript.h"
#include "core/loader/cache/CachedShader.h"
#include "core/loader/cache/CachedXSLStyleSheet.h"
@@ -77,7 +77,7 @@ static CachedResource* createResource(CachedResource::Type type, ResourceRequest
case CachedResource::Script:
return new CachedScript(request, charset);
case CachedResource::SVGDocumentResource:
- return new CachedSVGDocument(request);
+ return new CachedDocument(request, CachedResource::SVGDocumentResource);
case CachedResource::FontResource:
return new CachedFont(request);
case CachedResource::RawResource:
@@ -195,9 +195,9 @@ CachedResourceHandle<CachedXSLStyleSheet> CachedResourceLoader::requestXSLStyleS
return static_cast<CachedXSLStyleSheet*>(requestResource(CachedResource::XSLStyleSheet, request).get());
}
-CachedResourceHandle<CachedSVGDocument> CachedResourceLoader::requestSVGDocument(CachedResourceRequest& request)
+CachedResourceHandle<CachedDocument> CachedResourceLoader::requestSVGDocument(CachedResourceRequest& request)
{
- return static_cast<CachedSVGDocument*>(requestResource(CachedResource::SVGDocumentResource, request).get());
+ return static_cast<CachedDocument*>(requestResource(CachedResource::SVGDocumentResource, request).get());
}
CachedResourceHandle<CachedResource> CachedResourceLoader::requestLinkResource(CachedResource::Type type, CachedResourceRequest& request)
« 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