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

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: Created 7 years, 3 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 * 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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 if (Document* oldDocument = frame->document()) { 80 if (Document* oldDocument = frame->document()) {
81 result->setTransformSourceDocument(oldDocument); 81 result->setTransformSourceDocument(oldDocument);
82 result->setSecurityOrigin(oldDocument->securityOrigin()); 82 result->setSecurityOrigin(oldDocument->securityOrigin());
83 result->setCookieURL(oldDocument->cookieURL()); 83 result->setCookieURL(oldDocument->cookieURL());
84 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy()); 84 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy());
85 } 85 }
86 86
87 frame->domWindow()->setDocument(result); 87 frame->domWindow()->setDocument(result);
88 } 88 }
89 89
90 result->setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEnc oding(sourceEncoding)); 90 Document::DocumentEncodingData data;
91 data.encoding = sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodin g(sourceEncoding);
92 result->setEncoding(data);
91 result->setContent(documentSource); 93 result->setContent(documentSource);
92 94
93 return result.release(); 95 return result.release();
94 } 96 }
95 97
96 PassRefPtr<Document> XSLTProcessor::transformToDocument(Node* sourceNode) 98 PassRefPtr<Document> XSLTProcessor::transformToDocument(Node* sourceNode)
97 { 99 {
98 if (!sourceNode) 100 if (!sourceNode)
99 return 0; 101 return 0;
100 102
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 } 147 }
146 148
147 void XSLTProcessor::reset() 149 void XSLTProcessor::reset()
148 { 150 {
149 m_stylesheet.clear(); 151 m_stylesheet.clear();
150 m_stylesheetRootNode.clear(); 152 m_stylesheetRootNode.clear();
151 m_parameters.clear(); 153 m_parameters.clear();
152 } 154 }
153 155
154 } // namespace WebCore 156 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698