WebCore/rendering/RenderListItem.cpp - Issue 3559003: Merge 68408

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: WebCore/rendering/RenderListItem.cpp

Issue 3559003: Merge 68408 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/

Patch Set: Created 10 years, 3 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: WebCore/rendering/RenderListItem.cpp

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

--- WebCore/rendering/RenderListItem.cpp (revision 68663)

+++ WebCore/rendering/RenderListItem.cpp (working copy)

@@ -245,7 +245,7 @@

void RenderListItem::positionListMarker()

{

- if (m_marker && !m_marker->isInside() && m_marker->inlineBoxWrapper()) {

+ if (m_marker && m_marker->parent()->isBox() && !m_marker->isInside() && m_marker->inlineBoxWrapper()) {

int markerOldX = m_marker->x();

int yOffset = 0;

int xOffset = 0;