Source/WebCore/html/parser/HTMLTreeBuilder.cpp - Issue 10377014: Merge 115763

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/html/parser/HTMLTreeBuilder.cpp

Issue 10377014: Merge 115763 (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:

Index: Source/WebCore/html/parser/HTMLTreeBuilder.cpp

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

--- Source/WebCore/html/parser/HTMLTreeBuilder.cpp (revision 116143)

+++ Source/WebCore/html/parser/HTMLTreeBuilder.cpp (working copy)

@@ -2204,7 +2204,7 @@

case InSelectMode:

ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode);

if (token.name() == optgroupTag) {

- if (m_tree.currentNode()->hasTagName(optionTag) && m_tree.oneBelowTop()->hasTagName(optgroupTag))

+ if (m_tree.currentNode()->hasTagName(optionTag) && m_tree.oneBelowTop() && m_tree.oneBelowTop()->hasTagName(optgroupTag))

processFakeEndTag(optionTag);

if (m_tree.currentNode()->hasTagName(optgroupTag)) {

m_tree.openElements()->pop();

« no previous file with comments | « Source/WebCore/html/parser/HTMLElementStack.cpp ('k') | no next file » | no next file with comments »