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

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

Issue 133273007: Revert "Moved text decoding to the parser thread" (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 11 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
« no previous file with comments | « Source/core/xml/XMLHttpRequest.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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 result->setTransformSourceDocument(oldDocument.get()); 85 result->setTransformSourceDocument(oldDocument.get());
86 result->updateSecurityOrigin(oldDocument->securityOrigin()); 86 result->updateSecurityOrigin(oldDocument->securityOrigin());
87 result->setCookieURL(oldDocument->cookieURL()); 87 result->setCookieURL(oldDocument->cookieURL());
88 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy()); 88 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy());
89 } 89 }
90 } else { 90 } else {
91 result = DOMWindow::createDocument(sourceMIMEType, init, forceXHTML); 91 result = DOMWindow::createDocument(sourceMIMEType, init, forceXHTML);
92 } 92 }
93 93
94 DocumentEncodingData data; 94 DocumentEncodingData data;
95 data.setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodi ng(sourceEncoding)); 95 data.encoding = sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodin g(sourceEncoding);
96 result->setEncodingData(data); 96 result->setEncodingData(data);
97 result->setContent(documentSource); 97 result->setContent(documentSource);
98 98
99 return result.release(); 99 return result.release();
100 } 100 }
101 101
102 PassRefPtr<Document> XSLTProcessor::transformToDocument(Node* sourceNode) 102 PassRefPtr<Document> XSLTProcessor::transformToDocument(Node* sourceNode)
103 { 103 {
104 if (!sourceNode) 104 if (!sourceNode)
105 return 0; 105 return 0;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 } 151 }
152 152
153 void XSLTProcessor::reset() 153 void XSLTProcessor::reset()
154 { 154 {
155 m_stylesheet.clear(); 155 m_stylesheet.clear();
156 m_stylesheetRootNode.clear(); 156 m_stylesheetRootNode.clear();
157 m_parameters.clear(); 157 m_parameters.clear();
158 } 158 }
159 159
160 } // namespace WebCore 160 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/xml/XMLHttpRequest.cpp ('k') | Source/core/xml/parser/XMLDocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698