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

Side by Side Diff: Source/core/loader/cache/CachedDocument.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) 2010 Rob Buis <rwlbuis@gmail.com> 2 Copyright (C) 2010 Rob Buis <rwlbuis@gmail.com>
3 Copyright (C) 2011 Cosmin Truta <ctruta@gmail.com> 3 Copyright (C) 2011 Cosmin Truta <ctruta@gmail.com>
4 Copyright (C) 2012 University of Szeged 4 Copyright (C) 2012 University of Szeged
5 Copyright (C) 2012 Renata Hodovan <reni@webkit.org> 5 Copyright (C) 2012 Renata Hodovan <reni@webkit.org>
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.
11 11
12 This library is distributed in the hope that it will be useful, 12 This library is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 Library General Public License for more details. 15 Library General Public License for more details.
16 16
17 You should have received a copy of the GNU Library General Public License 17 You should have received a copy of the GNU Library General Public License
18 along with this library; see the file COPYING.LIB. If not, write to 18 along with this library; see the file COPYING.LIB. If not, write to
19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 19 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20 Boston, MA 02110-1301, USA. 20 Boston, MA 02110-1301, USA.
21 */ 21 */
22 22
23 #include "config.h" 23 #include "config.h"
24 24
25 #include "core/loader/cache/CachedSVGDocument.h" 25 #include "core/loader/cache/CachedDocument.h"
26 26
27 #include "core/loader/cache/CachedResourceClient.h" 27 #include "core/loader/cache/CachedResourceClient.h"
28 #include "core/loader/cache/CachedResourceHandle.h" 28 #include "core/loader/cache/CachedResourceHandle.h"
29 #include "core/platform/SharedBuffer.h" 29 #include "core/platform/SharedBuffer.h"
30 #include <wtf/text/StringBuilder.h> 30 #include "core/svg/SVGDocument.h"
31 #include "wtf/text/StringBuilder.h"
31 32
32 namespace WebCore { 33 namespace WebCore {
33 34
34 CachedSVGDocument::CachedSVGDocument(const ResourceRequest& request) 35 CachedDocument::CachedDocument(const ResourceRequest& request, Type type)
35 : CachedResource(request, SVGDocumentResource) 36 : CachedResource(request, type)
36 , m_decoder(TextResourceDecoder::create("application/xml")) 37 , m_decoder(TextResourceDecoder::create("application/xml"))
37 { 38 {
38 setAccept("image/svg+xml"); 39 // FIXME: We'll support more types to support HTMLImports.
40 ASSERT(type == SVGDocumentResource);
39 } 41 }
40 42
41 CachedSVGDocument::~CachedSVGDocument() 43 CachedDocument::~CachedDocument()
42 { 44 {
43 } 45 }
44 46
45 void CachedSVGDocument::setEncoding(const String& chs) 47 void CachedDocument::setEncoding(const String& chs)
46 { 48 {
47 m_decoder->setEncoding(chs, TextResourceDecoder::EncodingFromHTTPHeader); 49 m_decoder->setEncoding(chs, TextResourceDecoder::EncodingFromHTTPHeader);
48 } 50 }
49 51
50 String CachedSVGDocument::encoding() const 52 String CachedDocument::encoding() const
51 { 53 {
52 return m_decoder->encoding().name(); 54 return m_decoder->encoding().name();
53 } 55 }
54 56
55 void CachedSVGDocument::checkNotify() 57 void CachedDocument::checkNotify()
56 { 58 {
57 if (m_data) { 59 if (m_data) {
58 StringBuilder decodedText; 60 StringBuilder decodedText;
59 decodedText.append(m_decoder->decode(m_data->data(), m_data->size())); 61 decodedText.append(m_decoder->decode(m_data->data(), m_data->size()));
60 decodedText.append(m_decoder->flush()); 62 decodedText.append(m_decoder->flush());
61 // We don't need to create a new frame because the new document belongs to the parent UseElement. 63 // We don't need to create a new frame because the new document belongs to the parent UseElement.
62 m_document = SVGDocument::create(0, response().url()); 64 m_document = createDocument(response().url());
63 m_document->setContent(decodedText.toString()); 65 m_document->setContent(decodedText.toString());
64 } 66 }
65 CachedResource::checkNotify(); 67 CachedResource::checkNotify();
66 } 68 }
67 69
68 void CachedSVGDocument::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) co nst 70 PassRefPtr<Document> CachedDocument::createDocument(const KURL& url)
71 {
72 switch (type()) {
73 case SVGDocumentResource:
74 return SVGDocument::create(0, url);
75 default:
76 // FIXME: We'll add more types to support HTMLImports.
77 ASSERT_NOT_REACHED();
78 return 0;
79 }
80 }
81
82 void CachedDocument::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
69 { 83 {
70 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou rceSVG); 84 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CachedResou rceSVG);
71 CachedResource::reportMemoryUsage(memoryObjectInfo); 85 CachedResource::reportMemoryUsage(memoryObjectInfo);
72 info.addMember(m_document, "document"); 86 info.addMember(m_document, "document");
73 info.addMember(m_decoder, "decoder"); 87 info.addMember(m_decoder, "decoder");
74 } 88 }
75 89
76 } 90 }
OLDNEW
« no previous file with comments | « Source/core/loader/cache/CachedDocument.h ('k') | Source/core/loader/cache/CachedResourceClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698