Source/core/loader/cache/CachedResourceLoader.h - Issue 19940002: [HTML Import] Respect Content Security Policy Model

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

Issue 19940002: [HTML Import] Respect Content Security Policy Model (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Fix mac build failure. Created 7 years, 5 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

« Source/core/dom/DocumentInit.cpp ('K') | « Source/core/loader/cache/CachedResource.h ('k') | Source/core/loader/cache/CachedResourceLoader.cpp » ('j') | Source/core/page/ContentSecurityPolicy.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.	4 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.

5 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/	5 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/

6	6

7 This library is free software; you can redistribute it and/or	7 This library is free software; you can redistribute it and/or

8 modify it under the terms of the GNU Library General Public	8 modify it under the terms of the GNU Library General Public

9 License as published by the Free Software Foundation; either	9 License as published by the Free Software Foundation; either

10 version 2 of the License, or (at your option) any later version.	10 version 2 of the License, or (at your option) any later version.

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82 CachedResourceHandle<CachedCSSStyleSheet> requestUserCSSStyleSheet(CachedRes ourceRequest&);	82 CachedResourceHandle<CachedCSSStyleSheet> requestUserCSSStyleSheet(CachedRes ourceRequest&);

83 CachedResourceHandle<CachedScript> requestScript(CachedResourceRequest&);	83 CachedResourceHandle<CachedScript> requestScript(CachedResourceRequest&);

84 CachedResourceHandle<CachedFont> requestFont(CachedResourceRequest&);	84 CachedResourceHandle<CachedFont> requestFont(CachedResourceRequest&);

85 CachedResourceHandle<CachedRawResource> requestRawResource(CachedResourceReq uest&);	85 CachedResourceHandle<CachedRawResource> requestRawResource(CachedResourceReq uest&);

86 CachedResourceHandle<CachedRawResource> requestMainResource(CachedResourceRe quest&);	86 CachedResourceHandle<CachedRawResource> requestMainResource(CachedResourceRe quest&);

87 CachedResourceHandle<CachedDocument> requestSVGDocument(CachedResourceReques t&);	87 CachedResourceHandle<CachedDocument> requestSVGDocument(CachedResourceReques t&);

88 CachedResourceHandle<CachedXSLStyleSheet> requestXSLStyleSheet(CachedResourc eRequest&);	88 CachedResourceHandle<CachedXSLStyleSheet> requestXSLStyleSheet(CachedResourc eRequest&);

89 CachedResourceHandle<CachedResource> requestLinkResource(CachedResource::Typ e, CachedResourceRequest&);	89 CachedResourceHandle<CachedResource> requestLinkResource(CachedResource::Typ e, CachedResourceRequest&);

90 CachedResourceHandle<CachedTextTrack> requestTextTrack(CachedResourceRequest &);	90 CachedResourceHandle<CachedTextTrack> requestTextTrack(CachedResourceRequest &);

91 CachedResourceHandle<CachedShader> requestShader(CachedResourceRequest&);	91 CachedResourceHandle<CachedShader> requestShader(CachedResourceRequest&);

	92 CachedResourceHandle<CachedRawResource> requestImport(CachedResourceRequest& );

92	93

93 // Logs an access denied message to the console for the specified URL.	94 // Logs an access denied message to the console for the specified URL.

94 void printAccessDeniedMessage(const KURL& url) const;	95 void printAccessDeniedMessage(const KURL& url) const;

95	96

96 CachedResource* cachedResource(const String& url) const;	97 CachedResource* cachedResource(const String& url) const;

97 CachedResource* cachedResource(const KURL& url) const;	98 CachedResource* cachedResource(const KURL& url) const;

98	99

99 typedef HashMap<String, CachedResourceHandle<CachedResource> > DocumentResou rceMap;	100 typedef HashMap<String, CachedResourceHandle<CachedResource> > DocumentResou rceMap;

100 const DocumentResourceMap& allCachedResources() const { return m_documentRes ources; }	101 const DocumentResourceMap& allCachedResources() const { return m_documentRes ources; }

101	102

(...skipping 121 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
223 m_loader->m_allowStaleResources = m_previousState;	224 m_loader->m_allowStaleResources = m_previousState;

224 }	225 }

225 private:	226 private:

226 CachedResourceLoader* m_loader;	227 CachedResourceLoader* m_loader;

227 bool m_previousState;	228 bool m_previousState;

228 };	229 };

229	230

230 } // namespace WebCore	231 } // namespace WebCore

231	232

232 #endif	233 #endif

OLD	NEW