| Index: Source/core/rendering/RenderObject.cpp
|
| diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
|
| index 31ef55b2640d041f77aa202fa76652f8aeadb880..bc8aa7a9a79fac7c3d850d3aea8bc7c71959c86a 100644
|
| --- a/Source/core/rendering/RenderObject.cpp
|
| +++ b/Source/core/rendering/RenderObject.cpp
|
| @@ -1575,7 +1575,8 @@ StyleDifference RenderObject::adjustStyleDifference(StyleDifference diff) const
|
|
|
| void RenderObject::setPseudoStyle(PassRefPtr<RenderStyle> pseudoStyle)
|
| {
|
| - ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFTER || pseudoStyle->styleType() == FIRST_LETTER);
|
| + ASSERT(pseudoStyle->styleType() == BEFORE || pseudoStyle->styleType() == AFTER || pseudoStyle->styleType() == FIRST_LETTER ||
|
| + (RuntimeEnabledFeatures::listMarkerPseudoElementEnabled() && pseudoStyle->styleType() == MARKER));
|
|
|
| // FIXME: We should consider just making all pseudo items use an inherited style.
|
|
|
| @@ -2626,7 +2627,8 @@ RenderStyle* RenderObject::cachedFirstLineStyle() const
|
|
|
| RenderStyle* RenderObject::getCachedPseudoStyle(PseudoId pseudo, RenderStyle* parentStyle) const
|
| {
|
| - if (pseudo < FIRST_INTERNAL_PSEUDOID && !style()->hasPseudoStyle(pseudo))
|
| + // FIXME: adding display != LIST_ITEM seems wrong ... wrap in method?
|
| + if (pseudo < FIRST_INTERNAL_PSEUDOID && !style()->hasPseudoStyle(pseudo) && style()->display() != LIST_ITEM)
|
| return 0;
|
|
|
| RenderStyle* cachedStyle = style()->getCachedPseudoStyle(pseudo);
|
|
|