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

Side by Side Diff: Source/WebCore/loader/DataUriResource.cpp

Issue 14188008: Move Data uri handling into WebCore Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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
« no previous file with comments | « Source/WebCore/loader/DataUriResource.h ('k') | Source/WebCore/loader/DocumentLoader.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) 2008, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2010 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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of 13 * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
14 * its contributors may be used to endorse or promote products derived 14 * its contributors may be used to endorse or promote products derived
15 * from this software without specific prior written permission. 15 * from this software without specific prior written permission.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY 17 * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 18 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 19 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY 20 * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 21 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
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 "ArchiveResource.h" 30 #include "DataUriResource.h"
31 31
32 #include "SharedBuffer.h" 32 #include "SharedBuffer.h"
33 33
34 namespace WebCore { 34 namespace WebCore {
35 35
36 inline ArchiveResource::ArchiveResource(PassRefPtr<SharedBuffer> data, const KUR L& url, const String& mimeType, const String& textEncoding, const String& frameN ame, const ResourceResponse& response) 36 inline DataUriResource::DataUriResource(PassRefPtr<SharedBuffer> data, const KUR L& url, const String& mimeType, const String& textEncoding, const ResourceRespon se& response)
37 : SubstituteResource(url, response, data) 37 : SubstituteResource(url, response, data)
38 , m_mimeType(mimeType) 38 , m_mimeType(mimeType)
39 , m_textEncoding(textEncoding) 39 , m_textEncoding(textEncoding)
40 , m_frameName(frameName)
41 , m_shouldIgnoreWhenUnarchiving(false)
42 { 40 {
43 } 41 }
44 42
45 PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> dat a, const KURL& url, const String& mimeType, const String& textEncoding, const St ring& frameName, const ResourceResponse& response) 43 PassRefPtr<DataUriResource> DataUriResource::create(PassRefPtr<SharedBuffer> dat a, const KURL& url, const String& mimeType, const String& textEncoding, const Re sourceResponse& response)
46 { 44 {
47 if (!data) 45 if (!data)
48 return 0; 46 return 0;
49 if (response.isNull()) { 47 if (response.isNull()) {
50 unsigned dataSize = data->size(); 48 unsigned dataSize = data->size();
51 return adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, f rameName, 49 return adoptRef(new DataUriResource(data, url, mimeType, textEncoding, R esourceResponse(url, mimeType, dataSize, textEncoding, String())));
52 ResourceResponse(url, mimeType, dataSize, textEncoding, String())));
53 } 50 }
54 return adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frame Name, response)); 51 return adoptRef(new DataUriResource(data, url, mimeType, textEncoding, respo nse));
55 } 52 }
56 53
57 PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> dat a, const KURL& url, const ResourceResponse& response) 54 PassRefPtr<DataUriResource> DataUriResource::create(PassRefPtr<SharedBuffer> dat a, const KURL& url, const ResourceResponse& response)
58 { 55 {
59 return create(data, url, response.mimeType(), response.textEncodingName(), S tring(), response); 56 return create(data, url, response.mimeType(), response.textEncodingName(), r esponse);
60 } 57 }
61 58
62 } 59 }
OLDNEW
« no previous file with comments | « Source/WebCore/loader/DataUriResource.h ('k') | Source/WebCore/loader/DocumentLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698