List marker pseudo elements.

Source/core/layout/LayoutListMarker.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
  * Copyright (C) 2010 Daniel Bates (dbates@intudata.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #include "config.h"
 #include "core/layout/LayoutListMarker.h"
 
+#include "core/dom/MarkerPseudoElement.h"
 #include "core/fetch/ImageResource.h"
 #include "core/layout/LayoutAnalyzer.h"
 #include "core/layout/LayoutListItem.h"
 #include "core/layout/TextRunConstructor.h"
 #include "core/paint/DeprecatedPaintLayer.h"
 #include "core/paint/ListMarkerPainter.h"
 #include "platform/fonts/Font.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
@@ skipping 1003 matching lines @@
     case Georgian:
         return toGeorgian(value);
     case Hebrew:
         return toHebrew(value);
     }
 
     ASSERT_NOT_REACHED();
     return "";
 }
 
+LayoutListMarker::LayoutListMarker(Element* node, LayoutListItem* item)
+    : LayoutBox(node)
+    , m_listItem(item)
+{
+    // init LayoutObject attributes
+    setInline(true); // our object is Inline
+    setReplaced(true); // pretend to be replaced

[esprehn, 2015/04/20 16:04:08]

Link to the spec? 

[dsinclair, 2015/04/21 20:23:10]

This is from the constructor below. I needed to add a second constructor in
order to provide the node pointer for the LayoutBox call. I'm not sure why these
are set on the ListMarker.

+}
+
 LayoutListMarker::LayoutListMarker(LayoutListItem* item)
     : LayoutBox(0)
     , m_listItem(item)
 {
     // init LayoutObject attributes
     setInline(true); // our object is Inline
     setReplaced(true); // pretend to be replaced
 }
 
 LayoutListMarker::~LayoutListMarker()
 {
 }
 
 void LayoutListMarker::destroy()
 {
     if (m_image)
         m_image->removeClient(this);
     LayoutBox::destroy();
 }
 
 LayoutListMarker* LayoutListMarker::createAnonymous(LayoutListItem* item)
 {
     Document& document = item->document();
-    LayoutListMarker* renderer = new LayoutListMarker(item);
-    renderer->setDocumentForAnonymous(&document);
-    return renderer;
+    LayoutListMarker* layoutObject = new LayoutListMarker(item);
+    layoutObject->setDocumentForAnonymous(&document);
+    return layoutObject;
 }
 
 void LayoutListMarker::styleWillChange(StyleDifference diff, const ComputedStyle& newStyle)
 {
     if (style() && (newStyle.listStylePosition() != style()->listStylePosition() || newStyle.listStyleType() != style()->listStyleType()))
         setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(LayoutInvalidationReason::StyleChange);
 
     LayoutBox::styleWillChange(diff, newStyle);
 }
 
 void LayoutListMarker::styleDidChange(StyleDifference diff, const ComputedStyle* oldStyle)
 {
     LayoutBox::styleDidChange(diff, oldStyle);
 
+    if (RuntimeEnabledFeatures::listMarkerPseudoElementEnabled()) {
+        updateMarginsAndContent();
+
+        if (isInside())
+            node()->parentElement()->layoutObject()->containingBlock()->updateLogicalWidth();

[esprehn, 2015/04/20 16:04:08]

You can't update logical widths from inside a style change (especially not on
your containingBlock), more things might change during style recalc or in its
descendants still. All you can do is mark yourself dirty.

[dsinclair, 2015/04/21 20:23:10]

Done. If I remove the updateMarginsAndContent() things no longer work, is that
one OK to do inside style did change?

[esprehn, 2015/04/22 07:45:44]

You should do this in layout, we already do for the isImage() case, just move
that out of the if statement.

+    }
+
     if (m_image != style()->listStyleImage()) {
         if (m_image)
             m_image->removeClient(this);
         m_image = style()->listStyleImage();
         if (m_image)
             m_image->addClient(this);
     }
 }
 
 InlineBox* LayoutListMarker::createInlineBox()
@@ skipping 528 matching lines @@
     LayoutRect rect(0, root.selectionTop() - location().y(), size().width(), root.selectionHeight());
     mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, 0);
     // FIXME: groupedMapping() leaks the squashing abstraction.
     if (paintInvalidationContainer->layer()->groupedMapping())
         DeprecatedPaintLayer::mapRectToPaintBackingCoordinates(paintInvalidationContainer, rect);
     return rect;
 }
 
 void LayoutListMarker::listItemStyleDidChange()
 {
-    RefPtr<ComputedStyle> newStyle = ComputedStyle::create();
-    // The marker always inherits from the list item, regardless of where it might end
-    // up (e.g., in some deeply nested line box). See CSS3 spec.
-    newStyle->inheritFrom(m_listItem->styleRef());
-    if (style()) {
-        // Reuse the current margins. Otherwise resetting the margins to initial values
-        // would trigger unnecessary layout.
-        newStyle->setMarginStart(style()->marginStart());
-        newStyle->setMarginEnd(style()->marginRight());
-    }
+    ASSERT(!RuntimeEnabledFeatures::listMarkerPseudoElementEnabled());
+    RefPtr<ComputedStyle> newStyle = MarkerPseudoElement::styleForListMarkerLayoutObject(*m_listItem, style());
     setStyle(newStyle.release());
 }
 
 } // namespace blink