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

Side by Side Diff: Source/core/loader/archive/ArchiveResourceCollection.cpp

Issue 54053006: Move weborigin/ under platform/ so that it may someday call platform APIs (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Stale refernence to weboriginexport in .gpyi 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "config.h" 29 #include "config.h"
30 #include "core/loader/archive/ArchiveResourceCollection.h" 30 #include "core/loader/archive/ArchiveResourceCollection.h"
31 31
32 #include "weborigin/KURL.h" 32 #include "platform/weborigin/KURL.h"
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 ArchiveResourceCollection::ArchiveResourceCollection() 36 ArchiveResourceCollection::ArchiveResourceCollection()
37 { 37 {
38 } 38 }
39 39
40 void ArchiveResourceCollection::addAllResources(MHTMLArchive* archive) 40 void ArchiveResourceCollection::addAllResources(MHTMLArchive* archive)
41 { 41 {
42 ASSERT(archive); 42 ASSERT(archive);
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 PassRefPtr<MHTMLArchive> ArchiveResourceCollection::popSubframeArchive(const Str ing& frameName, const KURL& url) 86 PassRefPtr<MHTMLArchive> ArchiveResourceCollection::popSubframeArchive(const Str ing& frameName, const KURL& url)
87 { 87 {
88 RefPtr<MHTMLArchive> archive = m_subframes.take(frameName); 88 RefPtr<MHTMLArchive> archive = m_subframes.take(frameName);
89 if (archive) 89 if (archive)
90 return archive.release(); 90 return archive.release();
91 91
92 return m_subframes.take(url.string()); 92 return m_subframes.take(url.string());
93 } 93 }
94 94
95 } 95 }
OLDNEW
« no previous file with comments | « Source/core/loader/archive/ArchiveResource.h ('k') | Source/core/loader/archive/MHTMLArchive.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698