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

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

Issue 246433004: Rename cookieURL to inheritedURL and add inheritedURL() to WebDocument (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: weaken statement about inheritedURL Created 6 years, 8 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/loader/DocumentLoader.cpp ('k') | Source/web/WebDocument.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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 result = frame->domWindow()->installNewDocument(sourceMIMEType, init, fo rceXHTML); 79 result = frame->domWindow()->installNewDocument(sourceMIMEType, init, fo rceXHTML);
80 80
81 // Before parsing, we need to save & detach the old document and get the new document 81 // Before parsing, we need to save & detach the old document and get the new document
82 // in place. We have to do this only if we're rendering the result docum ent. 82 // in place. We have to do this only if we're rendering the result docum ent.
83 if (FrameView* view = frame->view()) 83 if (FrameView* view = frame->view())
84 view->clear(); 84 view->clear();
85 85
86 if (oldDocument) { 86 if (oldDocument) {
87 result->setTransformSourceDocument(oldDocument.get()); 87 result->setTransformSourceDocument(oldDocument.get());
88 result->updateSecurityOrigin(oldDocument->securityOrigin()); 88 result->updateSecurityOrigin(oldDocument->securityOrigin());
89 result->setCookieURL(oldDocument->cookieURL()); 89 result->setInheritedURL(oldDocument->inheritedURL());
90 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy()); 90 result->contentSecurityPolicy()->copyStateFrom(oldDocument->contentS ecurityPolicy());
91 } 91 }
92 } else { 92 } else {
93 result = DOMWindow::createDocument(sourceMIMEType, init, forceXHTML); 93 result = DOMWindow::createDocument(sourceMIMEType, init, forceXHTML);
94 } 94 }
95 95
96 DocumentEncodingData data; 96 DocumentEncodingData data;
97 data.setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodi ng(sourceEncoding)); 97 data.setEncoding(sourceEncoding.isEmpty() ? UTF8Encoding() : WTF::TextEncodi ng(sourceEncoding));
98 result->setEncodingData(data); 98 result->setEncodingData(data);
99 result->setContent(documentSource); 99 result->setContent(documentSource);
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 m_stylesheetRootNode.clear(); 158 m_stylesheetRootNode.clear();
159 m_parameters.clear(); 159 m_parameters.clear();
160 } 160 }
161 161
162 void XSLTProcessor::trace(Visitor* visitor) 162 void XSLTProcessor::trace(Visitor* visitor)
163 { 163 {
164 visitor->trace(m_stylesheet); 164 visitor->trace(m_stylesheet);
165 } 165 }
166 166
167 } // namespace WebCore 167 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | Source/web/WebDocument.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698