Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1718)

Unified Diff: Source/core/rendering/RenderObject.cpp

Issue 778003003: List marker pseudo elements. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/rendering/RenderObject.cpp
diff --git a/Source/core/rendering/RenderObject.cpp b/Source/core/rendering/RenderObject.cpp
index 31af4831809b877d358fd986377c006044705af9..7ff52f3daa1ef3b96eb2b8e64055292139872f69 100644
--- a/Source/core/rendering/RenderObject.cpp
+++ b/Source/core/rendering/RenderObject.cpp
@@ -1440,7 +1440,8 @@ void RenderObject::showRenderObject() const
void RenderObject::showRenderObject(int printedCharacters) const
{
- printedCharacters += fprintf(stderr, "%s %p", renderName(), this);
+ IntRect size = absoluteBoundingBoxRect();
+ printedCharacters += fprintf(stderr, "%s %p (%d,%d %dx%d)", renderName(), this, size.x(), size.y(), size.width(), size.height());
if (isText() && toRenderText(this)->isTextFragment())
printedCharacters += fprintf(stderr, " \"%s\" ", toRenderText(this)->text().ascii().data());
@@ -1450,6 +1451,7 @@ void RenderObject::showRenderObject(int printedCharacters) const
for (; printedCharacters < showTreeCharacterOffset; printedCharacters++)
fputc(' ', stderr);
fputc('\t', stderr);
+ fputc('\t', stderr);
node()->showNode();
} else
fputc('\n', stderr);
@@ -1593,7 +1595,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.
@@ -2674,7 +2677,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);

Powered by Google App Engine
This is Rietveld 408576698