Source/WebCore/xml/parser/XMLDocumentParser.cpp - Issue 10166026: Merge 113670

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10166026: Merge 113670 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/

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:

Index: Source/WebCore/xml/parser/XMLDocumentParser.cpp

===================================================================

--- Source/WebCore/xml/parser/XMLDocumentParser.cpp (revision 114849)

+++ 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 »