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

Unified Diff: Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp

Issue 11830062: Merge 138863 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/WebCore/xml/parser/XMLDocumentParser.cpp ('k') | Source/WebCore/xml/parser/XMLDocumentParserQt.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp
===================================================================
--- Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (revision 139381)
+++ Source/WebCore/xml/parser/XMLDocumentParserLibxml2.cpp (working copy)
@@ -1338,8 +1338,13 @@
document()->setParsing(false); // Make the document think it's done, so it will apply XSL stylesheets.
document()->styleResolverChanged(RecalcStyleImmediately);
+
+ // styleResolverChanged() call can detach the parser and null out its document.
+ // In that case, we just bail out.
+ if (isDetached())
+ return;
+
document()->setParsing(true);
-
DocumentParser::stopParsing();
}
#endif
« no previous file with comments | « Source/WebCore/xml/parser/XMLDocumentParser.cpp ('k') | Source/WebCore/xml/parser/XMLDocumentParserQt.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698