List marker pseudo elements.

Source/core/dom/LayoutTreeBuilder.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 13 matching lines @@
  */
 
 #include "config.h"
 #include "core/dom/LayoutTreeBuilder.h"
 
 #include "core/HTMLNames.h"
 #include "core/SVGNames.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/FirstLetterPseudoElement.h"
 #include "core/dom/Fullscreen.h"
+#include "core/dom/MarkerPseudoElement.h"
 #include "core/dom/Node.h"
 #include "core/dom/PseudoElement.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/InsertionPoint.h"
 #include "core/layout/LayoutFullScreen.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/LayoutView.h"
 #include "core/svg/SVGElement.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
 LayoutTreeBuilderForElement::LayoutTreeBuilderForElement(Element& element, ComputedStyle* style)
     : LayoutTreeBuilder(element, nullptr)
     , m_style(style)
 {
     ASSERT(!isActiveInsertionPoint(element));
     if (element.isFirstLetterPseudoElement()) {
         if (LayoutObject* nextLayoutObject = FirstLetterPseudoElement::firstLetterTextRenderer(element))
             m_layoutObjectParent = nextLayoutObject->parent();
     } else if (ContainerNode* containerNode = LayoutTreeBuilderTraversal::parent(element)) {
         m_layoutObjectParent = containerNode->layoutObject();
     }
 }
 
-LayoutObject* LayoutTreeBuilderForElement::nextLayoutObject() const
+LayoutObject* LayoutTreeBuilderForElement::nextLayoutObject(LayoutObject* parentLayoutObject) const
 {
     ASSERT(m_layoutObjectParent);
 
     if (m_node->isInTopLayer())
         return LayoutTreeBuilderTraversal::nextInTopLayer(*m_node);
 
     if (m_node->isFirstLetterPseudoElement())
         return FirstLetterPseudoElement::firstLetterTextRenderer(*m_node);
 
+    if (m_node->isMarkerPseudoElement()) {
+        ASSERT(parentLayoutObject);
+        return MarkerPseudoElement::firstNonMarkerChild(parentLayoutObject);
+    }
+
     return LayoutTreeBuilder::nextLayoutObject();
 }
 
 LayoutObject* LayoutTreeBuilderForElement::parentLayoutObject() const
 {
     LayoutObject* parentLayoutObject = LayoutTreeBuilder::parentLayoutObject();
 
+    if (m_node->isMarkerPseudoElement()) {
+        ASSERT(m_layoutObjectParent->isLayoutBlockFlow());
+        if (LayoutObject* markerLayoutObject = MarkerPseudoElement::parentOfFirstLineBox(toLayoutBlockFlow(m_layoutObjectParent), nullptr))

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

This needs to be encapsulated, this code shouldn't need to know about
LayoutBlockFlow.

[dsinclair, 2015/04/22 20:00:38]

Done.

+            return markerLayoutObject;
+    }
+
     if (parentLayoutObject) {
-        // FIXME: Guarding this by parentLayoutObject isn't quite right as the spec for
+        // FIXME: Guarding this by parentRenderer isn't quite right as the spec for
         // top layer only talks about display: none ancestors so putting a <dialog> inside an
         // <optgroup> seems like it should still work even though this check will prevent it.
         if (m_node->isInTopLayer())
             return m_node->document().layoutView();
     }
 
     return parentLayoutObject;
 }
 
 bool LayoutTreeBuilderForElement::shouldCreateLayoutObject() const
 {
     if (!m_layoutObjectParent)
         return false;
 
     // FIXME: Should the following be in SVGElement::layoutObjectIsNeeded()?
     if (m_node->isSVGElement()) {
         // SVG elements only render when inside <svg>, or if the element is an <svg> itself.
         if (!isSVGSVGElement(*m_node) && (!m_layoutObjectParent->node() || !m_layoutObjectParent->node()->isSVGElement()))
             return false;
         if (!toSVGElement(m_node)->isValid())
             return false;
     }
 
     LayoutObject* parentLayoutObject = this->parentLayoutObject();
     if (!parentLayoutObject)
         return false;
     if (!parentLayoutObject->canHaveChildren())
         return false;
 
+    if (m_node->isMarkerPseudoElement() && m_layoutObjectParent->style()->display() == LIST_ITEM)

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

We should never even get here if the parent is the wrong display type.

[dsinclair, 2015/04/22 20:00:38]

Done.

+        return true;
+
     return m_node->layoutObjectIsNeeded(style());
 }
 
 ComputedStyle& LayoutTreeBuilderForElement::style() const
 {
     if (!m_style)
         m_style = m_node->styleForLayoutObject();
     return *m_style;
 }
 
 void LayoutTreeBuilderForElement::createLayoutObject()
 {
     ComputedStyle& style = this->style();
 
     LayoutObject* newLayoutObject = m_node->createLayoutObject(style);
     if (!newLayoutObject)
         return;
 
     LayoutObject* parentLayoutObject = this->parentLayoutObject();
 
     if (!parentLayoutObject->isChildAllowed(newLayoutObject, style)) {
         newLayoutObject->destroy();
         return;
     }
 
     // Make sure the LayoutObject already knows it is going to be added to a LayoutFlowThread before we set the style
     // for the first time. Otherwise code using inLayoutFlowThread() in the styleWillChange and styleDidChange will fail.
     newLayoutObject->setFlowThreadState(parentLayoutObject->flowThreadState());
 
-    LayoutObject* nextLayoutObject = this->nextLayoutObject();
+    LayoutObject* nextLayoutObject = this->nextLayoutObject(parentLayoutObject);

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

remove the argument, just call parentLayoutObject again for markers, they're
rare.

[dsinclair, 2015/04/22 20:00:38]

Done.

     m_node->setLayoutObject(newLayoutObject);
     newLayoutObject->setStyle(&style); // setStyle() can depend on layoutObject() already being set.
 
     if (Fullscreen::isActiveFullScreenElement(*m_node)) {
         newLayoutObject = LayoutFullScreen::wrapRenderer(newLayoutObject, parentLayoutObject, &m_node->document());
         if (!newLayoutObject)
             return;
     }
 
     // Note: Adding newLayoutObject instead of layoutObject(). layoutObject() may be a child of newLayoutObject.
@@ skipping 18 matching lines @@
     newLayoutObject->setFlowThreadState(parentLayoutObject->flowThreadState());
 
     LayoutObject* nextLayoutObject = this->nextLayoutObject();
     m_node->setLayoutObject(newLayoutObject);
     // Parent takes care of the animations, no need to call setAnimatableStyle.
     newLayoutObject->setStyle(&style);
     parentLayoutObject->addChild(newLayoutObject, nextLayoutObject);
 }
 
 }