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

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

Issue 23455024: Move ownership of the TextResourceDecoder to DecodedDataDocumentParser (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebased 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
« no previous file with comments | « Source/core/rendering/RenderText.cpp ('k') | Source/core/xml/parser/XMLDocumentParser.cpp » ('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 * 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.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 if (oldDocument) { 83 if (oldDocument) {
84 result->setTransformSourceDocument(oldDocument.get()); 84 result->setTransformSourceDocument(oldDocument.get());
85 result->updateSecurityOrigin(oldDocument->securityOrigin()); 85 result->updateSecurityOrigin(oldDocument->securityOrigin());
86 result->setCookieURL(oldDocument->cookieURL()); 86 result->setCookieURL(oldDocument->cookieURL());
87 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy()); 87 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy());
88 } 88 }
89 } else { 89 } else {
90 result = DOMWindow::createDocument(sourceMIMEType, init, forceXHTML); 90 result = DOMWindow::createDocument(sourceMIMEType, init, forceXHTML);
91 } 91 }
92 92
93 result->setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEnc oding(sourceEncoding)); 93 Document::DocumentEncodingData data;
94 data.encoding = sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodin g(sourceEncoding);
95 result->setEncoding(data);
94 result->setContent(documentSource); 96 result->setContent(documentSource);
95 97
96 return result.release(); 98 return result.release();
97 } 99 }
98 100
99 PassRefPtr<Document> XSLTProcessor::transformToDocument(Node* sourceNode) 101 PassRefPtr<Document> XSLTProcessor::transformToDocument(Node* sourceNode)
100 { 102 {
101 if (!sourceNode) 103 if (!sourceNode)
102 return 0; 104 return 0;
103 105
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 } 150 }
149 151
150 void XSLTProcessor::reset() 152 void XSLTProcessor::reset()
151 { 153 {
152 m_stylesheet.clear(); 154 m_stylesheet.clear();
153 m_stylesheetRootNode.clear(); 155 m_stylesheetRootNode.clear();
154 m_parameters.clear(); 156 m_parameters.clear();
155 } 157 }
156 158
157 } // namespace WebCore 159 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderText.cpp ('k') | Source/core/xml/parser/XMLDocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698