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

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

Issue 10170018: Merge 113670 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/fast/dom/text-node-attach-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/xml/parser/XMLDocumentParser.cpp
===================================================================
--- Source/WebCore/xml/parser/XMLDocumentParser.cpp (revision 114850)
+++ Source/WebCore/xml/parser/XMLDocumentParser.cpp (working copy)
@@ -175,7 +175,8 @@
m_bufferedText.swap(empty);
#endif
- if (m_view && !m_leafTextNode->attached())
+ if (m_view && m_leafTextNode->parentNode() && m_leafTextNode->parentNode()->attached()
+ && !m_leafTextNode->attached())
m_leafTextNode->attach();
m_leafTextNode = 0;
« no previous file with comments | « LayoutTests/fast/dom/text-node-attach-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698