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

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

Issue 1099613003: Oilpan: have xml/ objects on the heap by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: simplify XPathResult dtor 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
« no previous file with comments | « Source/core/xml/XSLStyleSheet.h ('k') | Source/core/xml/XSLTProcessor.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, 2008, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2008, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 loadChildSheet(String::fromUTF8((const char*)uriRef)); 221 loadChildSheet(String::fromUTF8((const char*)uriRef));
222 xmlFree(uriRef); 222 xmlFree(uriRef);
223 } 223 }
224 curr = curr->next; 224 curr = curr->next;
225 } 225 }
226 } 226 }
227 } 227 }
228 228
229 void XSLStyleSheet::loadChildSheet(const String& href) 229 void XSLStyleSheet::loadChildSheet(const String& href)
230 { 230 {
231 OwnPtrWillBeRawPtr<XSLImportRule> childRule = XSLImportRule::create(this, hr ef); 231 XSLImportRule* childRule = XSLImportRule::create(this, href);
232 XSLImportRule* c = childRule.get(); 232 m_children.append(childRule);
233 m_children.append(childRule.release()); 233 childRule->loadSheet();
234 c->loadSheet();
235 } 234 }
236 235
237 xsltStylesheetPtr XSLStyleSheet::compileStyleSheet() 236 xsltStylesheetPtr XSLStyleSheet::compileStyleSheet()
238 { 237 {
239 // FIXME: Hook up error reporting for the stylesheet compilation process. 238 // FIXME: Hook up error reporting for the stylesheet compilation process.
240 if (m_embedded) 239 if (m_embedded)
241 return xsltLoadStylesheetPI(document()); 240 return xsltLoadStylesheetPI(document());
242 241
243 // Certain libxslt versions are corrupting the xmlDoc on compilation 242 // Certain libxslt versions are corrupting the xmlDoc on compilation
244 // failures - hence attempting to recompile after a failure is unsafe. 243 // failures - hence attempting to recompile after a failure is unsafe.
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 DEFINE_TRACE(XSLStyleSheet) 319 DEFINE_TRACE(XSLStyleSheet)
321 { 320 {
322 visitor->trace(m_ownerNode); 321 visitor->trace(m_ownerNode);
323 visitor->trace(m_children); 322 visitor->trace(m_children);
324 visitor->trace(m_parentStyleSheet); 323 visitor->trace(m_parentStyleSheet);
325 visitor->trace(m_ownerDocument); 324 visitor->trace(m_ownerDocument);
326 StyleSheet::trace(visitor); 325 StyleSheet::trace(visitor);
327 } 326 }
328 327
329 } // namespace blink 328 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/xml/XSLStyleSheet.h ('k') | Source/core/xml/XSLTProcessor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698