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

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

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // there was one. 81 // there was one.
82 bool hasView = frame->view(); 82 bool hasView = frame->view();
83 oldDocument->detach(); 83 oldDocument->detach();
84 // Re-create the FrameView if needed. 84 // Re-create the FrameView if needed.
85 if (hasView) 85 if (hasView)
86 frame->loader().client()->transitionToCommittedForNewPage(); 86 frame->loader().client()->transitionToCommittedForNewPage();
87 result = frame->localDOMWindow()->installNewDocument(sourceMIMEType, ini t, forceXHTML); 87 result = frame->localDOMWindow()->installNewDocument(sourceMIMEType, ini t, forceXHTML);
88 88
89 if (oldDocument) { 89 if (oldDocument) {
90 DocumentXSLT::from(*result).setTransformSourceDocument(oldDocument.g et()); 90 DocumentXSLT::from(*result).setTransformSourceDocument(oldDocument.g et());
91 result->updateSecurityOrigin(oldDocument->securityOrigin()); 91 result->updateSecurityOrigin(oldDocument->getSecurityOrigin());
92 result->setCookieURL(oldDocument->cookieURL()); 92 result->setCookieURL(oldDocument->cookieURL());
93 93
94 RefPtrWillBeRawPtr<ContentSecurityPolicy> csp = ContentSecurityPolic y::create(); 94 RefPtrWillBeRawPtr<ContentSecurityPolicy> csp = ContentSecurityPolic y::create();
95 csp->copyStateFrom(oldDocument->contentSecurityPolicy()); 95 csp->copyStateFrom(oldDocument->contentSecurityPolicy());
96 result->initContentSecurityPolicy(csp); 96 result->initContentSecurityPolicy(csp);
97 } 97 }
98 } else { 98 } else {
99 result = LocalDOMWindow::createDocument(sourceMIMEType, init, forceXHTML ); 99 result = LocalDOMWindow::createDocument(sourceMIMEType, init, forceXHTML );
100 } 100 }
101 101
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 } 160 }
161 161
162 DEFINE_TRACE(XSLTProcessor) 162 DEFINE_TRACE(XSLTProcessor)
163 { 163 {
164 visitor->trace(m_stylesheet); 164 visitor->trace(m_stylesheet);
165 visitor->trace(m_stylesheetRootNode); 165 visitor->trace(m_stylesheetRootNode);
166 visitor->trace(m_document); 166 visitor->trace(m_document);
167 } 167 }
168 168
169 } // namespace blink 169 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/xml/DocumentXSLT.cpp ('k') | third_party/WebKit/Source/core/xml/parser/XMLDocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698