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

Side by Side Diff: Source/core/xml/XSLTProcessor.cpp

Issue 69823002: Move ownership of the TextResourceDecoder to DecodedDataDocumentParser (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review fixes 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
OLDNEW
1 /* 1 /*
2 * This file is part of the XSL implementation. 2 * This file is part of the XSL implementation.
3 * 3 *
4 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple, Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple, Inc. All rights reserved.
5 * Copyright (C) 2005, 2006 Alexey Proskuryakov <ap@webkit.org> 5 * Copyright (C) 2005, 2006 Alexey Proskuryakov <ap@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 #include "core/xml/XSLTProcessor.h" 24 #include "core/xml/XSLTProcessor.h"
25 25
26 #include "core/dom/DOMImplementation.h" 26 #include "core/dom/DOMImplementation.h"
27 #include "core/dom/DocumentEncodingData.h"
27 #include "core/dom/DocumentFragment.h" 28 #include "core/dom/DocumentFragment.h"
28 #include "core/editing/markup.h" 29 #include "core/editing/markup.h"
29 #include "core/frame/ContentSecurityPolicy.h" 30 #include "core/frame/ContentSecurityPolicy.h"
30 #include "core/frame/DOMWindow.h" 31 #include "core/frame/DOMWindow.h"
31 #include "core/frame/Frame.h" 32 #include "core/frame/Frame.h"
32 #include "core/frame/FrameView.h" 33 #include "core/frame/FrameView.h"
33 #include "platform/weborigin/SecurityOrigin.h" 34 #include "platform/weborigin/SecurityOrigin.h"
34 #include "wtf/Assertions.h" 35 #include "wtf/Assertions.h"
35 #include "wtf/Vector.h" 36 #include "wtf/Vector.h"
36 37
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 if (oldDocument) { 84 if (oldDocument) {
84 result->setTransformSourceDocument(oldDocument.get()); 85 result->setTransformSourceDocument(oldDocument.get());
85 result->updateSecurityOrigin(oldDocument->securityOrigin()); 86 result->updateSecurityOrigin(oldDocument->securityOrigin());
86 result->setCookieURL(oldDocument->cookieURL()); 87 result->setCookieURL(oldDocument->cookieURL());
87 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy()); 88 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy());
88 } 89 }
89 } else { 90 } else {
90 result = DOMWindow::createDocument(sourceMIMEType, init, forceXHTML); 91 result = DOMWindow::createDocument(sourceMIMEType, init, forceXHTML);
91 } 92 }
92 93
93 result->setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEnc oding(sourceEncoding)); 94 DocumentEncodingData data;
95 data.encoding = sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodin g(sourceEncoding);
96 result->setEncodingData(data);
94 result->setContent(documentSource); 97 result->setContent(documentSource);
95 98
96 return result.release(); 99 return result.release();
97 } 100 }
98 101
99 PassRefPtr<Document> XSLTProcessor::transformToDocument(Node* sourceNode) 102 PassRefPtr<Document> XSLTProcessor::transformToDocument(Node* sourceNode)
100 { 103 {
101 if (!sourceNode) 104 if (!sourceNode)
102 return 0; 105 return 0;
103 106
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 151 }
149 152
150 void XSLTProcessor::reset() 153 void XSLTProcessor::reset()
151 { 154 {
152 m_stylesheet.clear(); 155 m_stylesheet.clear();
153 m_stylesheetRootNode.clear(); 156 m_stylesheetRootNode.clear();
154 m_parameters.clear(); 157 m_parameters.clear();
155 } 158 }
156 159
157 } // namespace WebCore 160 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/TextResourceDecoderBuilder.cpp ('k') | Source/core/xml/parser/XMLDocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698