| Index: Source/core/layout/LayoutObject.cpp
|
| diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp
|
| index d1fc99c155c500d236098a2356efdef3c6bce94f..69b90b5c1ac44d0e606166d7a42bf92c3da806be 100644
|
| --- a/Source/core/layout/LayoutObject.cpp
|
| +++ b/Source/core/layout/LayoutObject.cpp
|
| @@ -1518,7 +1518,8 @@ void LayoutObject::showLayoutObject() const
|
|
|
| void LayoutObject::showLayoutObject(int printedCharacters) const
|
| {
|
| - printedCharacters += fprintf(stderr, "%s %p", decoratedName().ascii().data(), this);
|
| + IntRect size = absoluteBoundingBoxRect();
|
| + printedCharacters += fprintf(stderr, "%s %p (%d,%d %dx%d)", decoratedName().ascii().data(), this, size.x(), size.y(), size.width(), size.height());
|
|
|
| if (isText() && toLayoutText(this)->isTextFragment())
|
| printedCharacters += fprintf(stderr, " \"%s\" ", toLayoutText(this)->text().ascii().data());
|
| @@ -1528,6 +1529,7 @@ void LayoutObject::showLayoutObject(int printedCharacters) const
|
| for (; printedCharacters < showTreeCharacterOffset; printedCharacters++)
|
| fputc(' ', stderr);
|
| fputc('\t', stderr);
|
| + fputc('\t', stderr);
|
| node()->showNode();
|
| } else {
|
| fputc('\n', stderr);
|
| @@ -1675,7 +1677,8 @@ StyleDifference LayoutObject::adjustStyleDifference(StyleDifference diff) const
|
|
|
| void LayoutObject::setPseudoStyle(PassRefPtr<ComputedStyle> 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.
|
|
|
| @@ -2743,7 +2746,8 @@ ComputedStyle* LayoutObject::cachedFirstLineStyle() const
|
|
|
| ComputedStyle* LayoutObject::getCachedPseudoStyle(PseudoId pseudo, const ComputedStyle* 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;
|
|
|
| ComputedStyle* cachedStyle = style()->getCachedPseudoStyle(pseudo);
|
| @@ -3057,8 +3061,6 @@ PositionWithAffinity LayoutObject::createPositionWithAffinity(const Position& po
|
| {
|
| if (position.isNotNull())
|
| return PositionWithAffinity(position);
|
| -
|
| - ASSERT(!node());
|
| return createPositionWithAffinity(0, DOWNSTREAM);
|
| }
|
|
|
|
|