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

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

Issue 1052993006: Refactor frame navigation/detach state cleanup to be more sane. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Minor test cleanup Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/testing/DummyPageHolder.cpp ('k') | Source/web/tests/FrameTestHelpers.h » ('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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 RefPtrWillBeRawPtr<Document> result = nullptr; 70 RefPtrWillBeRawPtr<Document> result = nullptr;
71 DocumentInit init(sourceIsDocument ? ownerDocument->url() : KURL(), frame); 71 DocumentInit init(sourceIsDocument ? ownerDocument->url() : KURL(), frame);
72 72
73 bool forceXHTML = sourceMIMEType == "text/plain"; 73 bool forceXHTML = sourceMIMEType == "text/plain";
74 if (forceXHTML) 74 if (forceXHTML)
75 transformTextStringToXHTMLDocumentString(documentSource); 75 transformTextStringToXHTMLDocumentString(documentSource);
76 76
77 if (frame) { 77 if (frame) {
78 RefPtrWillBeRawPtr<Document> oldDocument = frame->document(); 78 RefPtrWillBeRawPtr<Document> oldDocument = frame->document();
79 oldDocument->detach();
79 result = frame->localDOMWindow()->installNewDocument(sourceMIMEType, ini t, forceXHTML); 80 result = frame->localDOMWindow()->installNewDocument(sourceMIMEType, ini t, forceXHTML);
80 81
81 // Before parsing, we need to save & detach the old document and get the new document 82 // 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. 83 // in place. We have to do this only if we're rendering the result docum ent.
83 if (FrameView* view = frame->view()) 84 if (FrameView* view = frame->view())
84 view->clear(); 85 view->clear();
85 86
86 if (oldDocument) { 87 if (oldDocument) {
87 DocumentXSLT::from(*result).setTransformSourceDocument(oldDocument.g et()); 88 DocumentXSLT::from(*result).setTransformSourceDocument(oldDocument.g et());
88 result->updateSecurityOrigin(oldDocument->securityOrigin()); 89 result->updateSecurityOrigin(oldDocument->securityOrigin());
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 } 158 }
158 159
159 DEFINE_TRACE(XSLTProcessor) 160 DEFINE_TRACE(XSLTProcessor)
160 { 161 {
161 visitor->trace(m_stylesheet); 162 visitor->trace(m_stylesheet);
162 visitor->trace(m_stylesheetRootNode); 163 visitor->trace(m_stylesheetRootNode);
163 visitor->trace(m_document); 164 visitor->trace(m_document);
164 } 165 }
165 166
166 } // namespace blink 167 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/testing/DummyPageHolder.cpp ('k') | Source/web/tests/FrameTestHelpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698