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

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

Issue 559503002: CSP: Move policy parsing out of Document. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Reworking. Created 6 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
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.cpp ('k') | no next file » | 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 // Before parsing, we need to save & detach the old document and get the new document 80 // Before parsing, we need to save & detach the old document and get the new document
81 // in place. We have to do this only if we're rendering the result docum ent. 81 // in place. We have to do this only if we're rendering the result docum ent.
82 if (FrameView* view = frame->view()) 82 if (FrameView* view = frame->view())
83 view->clear(); 83 view->clear();
84 84
85 if (oldDocument) { 85 if (oldDocument) {
86 result->setTransformSourceDocument(oldDocument.get()); 86 result->setTransformSourceDocument(oldDocument.get());
87 result->updateSecurityOrigin(oldDocument->securityOrigin()); 87 result->updateSecurityOrigin(oldDocument->securityOrigin());
88 result->setCookieURL(oldDocument->cookieURL()); 88 result->setCookieURL(oldDocument->cookieURL());
89 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy()); 89 result->initContentSecurityPolicy();
90 } 90 }
91 } else { 91 } else {
92 result = LocalDOMWindow::createDocument(sourceMIMEType, init, forceXHTML ); 92 result = LocalDOMWindow::createDocument(sourceMIMEType, init, forceXHTML );
93 } 93 }
94 94
95 DocumentEncodingData data; 95 DocumentEncodingData data;
96 data.setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodi ng(sourceEncoding)); 96 data.setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodi ng(sourceEncoding));
97 result->setEncodingData(data); 97 result->setEncodingData(data);
98 result->setContent(documentSource); 98 result->setContent(documentSource);
99 99
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } 159 }
160 160
161 void XSLTProcessor::trace(Visitor* visitor) 161 void XSLTProcessor::trace(Visitor* visitor)
162 { 162 {
163 visitor->trace(m_stylesheet); 163 visitor->trace(m_stylesheet);
164 visitor->trace(m_stylesheetRootNode); 164 visitor->trace(m_stylesheetRootNode);
165 visitor->trace(m_document); 165 visitor->trace(m_document);
166 } 166 }
167 167
168 } // namespace blink 168 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698