summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderListItem.cpp
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-10-21 17:02:36 +0100
committerBen Murdoch <benm@google.com>2010-10-21 17:02:36 +0100
commit80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf (patch)
treeadab91c5f5a3588b476a632e761d732b8a921e65 /WebCore/rendering/RenderListItem.cpp
parentd3bed0e7c739f46e955406b920498b86724e7705 (diff)
downloadexternal_webkit-80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf.zip
external_webkit-80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf.tar.gz
external_webkit-80a0e2c21aa3d6657bbf3fbd69e5eb624f16a1bf.tar.bz2
Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
See http://trac.webkit.org/changeset/68408 Change-Id: I53167c57f32a43c6bd80a1aca8126f41cb01da53
Diffstat (limited to 'WebCore/rendering/RenderListItem.cpp')
-rw-r--r--WebCore/rendering/RenderListItem.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderListItem.cpp b/WebCore/rendering/RenderListItem.cpp
index 54a7dd2..c613cbe 100644
--- a/WebCore/rendering/RenderListItem.cpp
+++ b/WebCore/rendering/RenderListItem.cpp
@@ -253,7 +253,7 @@ void RenderListItem::layout()
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;