Changeset 147756 in webkit

Timestamp:

Apr 5, 2013 10:15:09 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Regions] Elements in a region should be assignable to a named flow
​https://bugs.webkit.org/show_bug.cgi?id=74144

Patch by Mihai Maerean <Mihai Maerean> on 2013-04-05
Reviewed by David Hyatt.

Source/WebCore:

DOM children of a region must not be rendered as children of the region, but can be collected in flow threads.

NodeRenderingContext::parentRenderer now creates the parent render flow thread if it doesn't exist.

Element::moveToFlowThreadIsNeeded is a virtual method that is overriden in PseudoElement to return false and
in SVGElement so only svg root elements can directly be collected by a render flow thread.

RenderObject::canDOMChildrenHaveRenderParent exists to optimize the code so nodes inside regions (and maybe
other types of renderers in the future) can still have renderers if they need to be in a flow thread while the
rest of renderers that can't have children skip the new instructions.

Tests: fast/regions/flow-body-in-html.html . To test the duplicate bug #103685.

fast/regions/region-content-flown-into-region.html
fast/regions/universal-selector-children-to-the-same-region.html . To test the duplicate bug #103685.

• dom/Element.cpp:

(WebCore::Element::moveToFlowThreadIsNeeded):

• dom/Element.h:
• dom/NodeRenderingContext.cpp:

(WebCore::NodeRenderingContext::parentRenderer): the renderer that will be the parent for this node's renderer.
In the case of RenderFlowThreads, it may need to create it.
(WebCore::NodeRenderingContext::shouldCreateRenderer): In a region, only the children that need to be in a flow
thread should have a renderer.
(WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
(WebCore::NodeRenderingContext::moveToFlowThread):

• dom/NodeRenderingContext.h:

(NodeRenderingContext):

• dom/PseudoElement.h: pseudo-elements cannot be directly collected into a named flow.
• dom/Text.cpp:

(WebCore::Text::textRendererIsNeeded):
(WebCore::Text::updateTextRenderer): Because calling textRendererIsNeeded(NodeRenderingContext(...)) on a
non-const l-value NodeRenderingContext cannot be done on a temporary object on the stack.

• dom/Text.h:
• rendering/FlowThreadController.cpp:

(WebCore::FlowThreadController::isContentNodeRegisteredWithAnyNamedFlow):

• rendering/FlowThreadController.h:
• rendering/RenderObject.h:

(WebCore::RenderObject::canDOMChildrenHaveRenderParent): Even if this render object can't have render children,
the children in the DOM tree may have a render parent (that is different from this render object).

• rendering/RenderRegion.h:
• svg/SVGElement.cpp:

(WebCore::SVGElement::moveToFlowThreadIsNeeded): Allow only svg root elements to be directly collected by a
render flow thread.

• svg/SVGElement.h:

(SVGElement):

LayoutTests:

• fast/regions/flow-body-in-html-expected.txt: Added.
• fast/regions/flow-body-in-html.html: Added. To test the duplicate bug #103685.
• fast/regions/region-content-flown-into-region-expected.html: Added.
• fast/regions/region-content-flown-into-region.html: Added.
• fast/regions/universal-selector-children-to-the-same-region-expected.txt: Added.
• fast/regions/universal-selector-children-to-the-same-region.html: Added. To test the duplicate bug #103685.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/regions/flow-body-in-html-expected.txt (added)
• LayoutTests/fast/regions/flow-body-in-html.html (added)
• LayoutTests/fast/regions/region-content-flown-into-region-expected.html (added)
• LayoutTests/fast/regions/region-content-flown-into-region.html (added)
• LayoutTests/fast/regions/universal-selector-children-to-the-same-region-expected.txt (added)
• LayoutTests/fast/regions/universal-selector-children-to-the-same-region.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/dom/NodeRenderingContext.cpp (modified) (4 diffs)
• Source/WebCore/dom/NodeRenderingContext.h (modified) (2 diffs)
• Source/WebCore/dom/PseudoElement.h (modified) (1 diff)
• Source/WebCore/dom/Text.cpp (modified) (2 diffs)
• Source/WebCore/dom/Text.h (modified) (1 diff)
• Source/WebCore/rendering/FlowThreadController.cpp (modified) (1 diff)
• Source/WebCore/rendering/FlowThreadController.h (modified) (1 diff)
• Source/WebCore/rendering/RenderObject.h (modified) (1 diff)
• Source/WebCore/rendering/RenderRegion.h (modified) (1 diff)
• Source/WebCore/svg/SVGElement.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-04-05  Mihai Maerean  <mmaerean@adobe.com>
+
+        [CSS Regions] Elements in a region should be assignable to a named flow
+        https://bugs.webkit.org/show_bug.cgi?id=74144
+
+        Reviewed by David Hyatt.
+
+        * fast/regions/flow-body-in-html-expected.txt: Added.
+        * fast/regions/flow-body-in-html.html: Added. To test the duplicate bug #103685.
+        * fast/regions/region-content-flown-into-region-expected.html: Added.
+        * fast/regions/region-content-flown-into-region.html: Added.
+        * fast/regions/universal-selector-children-to-the-same-region-expected.txt: Added.
+        * fast/regions/universal-selector-children-to-the-same-region.html: Added. To test the duplicate bug #103685.
+
 2013-04-05  Aivo Paas  <aivopaas@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-05  Mihai Maerean  <mmaerean@adobe.com>
+
+        [CSS Regions] Elements in a region should be assignable to a named flow
+        https://bugs.webkit.org/show_bug.cgi?id=74144
+
+        Reviewed by David Hyatt.
+
+        DOM children of a region must not be rendered as children of the region, but can be collected in flow threads.
+
+        NodeRenderingContext::parentRenderer now creates the parent render flow thread if it doesn't exist.
+
+        Element::moveToFlowThreadIsNeeded is a virtual method that is overriden in PseudoElement to return false and
+        in SVGElement so only svg root elements can directly be collected by a render flow thread.
+
+        RenderObject::canDOMChildrenHaveRenderParent exists to optimize the code so nodes inside regions (and maybe
+        other types of renderers in the future) can still have renderers if they need to be in a flow thread while the
+        rest of renderers that can't have children skip the new instructions.
+
+        Tests: fast/regions/flow-body-in-html.html . To test the duplicate bug #103685.
+               fast/regions/region-content-flown-into-region.html
+               fast/regions/universal-selector-children-to-the-same-region.html . To test the duplicate bug #103685.
+
+        * dom/Element.cpp:
+        (WebCore::Element::moveToFlowThreadIsNeeded):
+        * dom/Element.h:
+        * dom/NodeRenderingContext.cpp:
+        (WebCore::NodeRenderingContext::parentRenderer): the renderer that will be the parent for this node's renderer.
+        In the case of RenderFlowThreads, it may need to create it.
+        (WebCore::NodeRenderingContext::shouldCreateRenderer): In a region, only the children that need to be in a flow
+        thread should have a renderer.
+        (WebCore::NodeRenderingContext::moveToFlowThreadIfNeeded):
+        (WebCore::NodeRenderingContext::moveToFlowThread):
+        * dom/NodeRenderingContext.h:
+        (NodeRenderingContext):
+        * dom/PseudoElement.h: pseudo-elements cannot be directly collected into a named flow.
+        * dom/Text.cpp:
+        (WebCore::Text::textRendererIsNeeded):
+        (WebCore::Text::updateTextRenderer): Because calling textRendererIsNeeded(NodeRenderingContext(...)) on a
+        non-const l-value NodeRenderingContext cannot be done on a temporary object on the stack.
+        * dom/Text.h:
+        * rendering/FlowThreadController.cpp:
+        (WebCore::FlowThreadController::isContentNodeRegisteredWithAnyNamedFlow):
+        * rendering/FlowThreadController.h:
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::canDOMChildrenHaveRenderParent): Even if this render object can't have render children,
+        the children in the DOM tree may have a render parent (that is different from this render object).
+        * rendering/RenderRegion.h:
+        * svg/SVGElement.cpp:
+        (WebCore::SVGElement::moveToFlowThreadIsNeeded): Allow only svg root elements to be directly collected by a
+        render flow thread.
+        * svg/SVGElement.h:
+        (SVGElement):
+
 2013-04-05  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -2559 +2559 @@
 }
 
+bool Element::moveToFlowThreadIsNeeded(RefPtr<RenderStyle>& cachedStyle)
+{
+    Document* doc = document();
+    
+    if (!doc->cssRegionsEnabled())
+        return false;
+
+#if ENABLE(FULLSCREEN_API)
+    if (doc->webkitIsFullScreen() && doc->webkitCurrentFullScreenElement() == this)
+        return false;
+#endif
+
+    if (isInShadowTree())
+        return false;
+
+    if (!cachedStyle)
+        cachedStyle = styleForRenderer();
+    if (!cachedStyle)
+        return false;
+
+    if (cachedStyle->flowThread().isEmpty())
+        return false;
+
+    return !document()->renderView()->flowThreadController()->isContentNodeRegisteredWithAnyNamedFlow(this);
+}
+
 #if ENABLE(CSS_REGIONS)
 

trunk/Source/WebCore/dom/Element.h

@@ -610 +610 @@
 
     RenderRegion* renderRegion() const;
+    virtual bool moveToFlowThreadIsNeeded(RefPtr<RenderStyle>& cachedStyle);
 #if ENABLE(CSS_REGIONS)
     const AtomicString& webkitRegionOverset() const;

trunk/Source/WebCore/dom/NodeRenderingContext.cpp

@@ -149 +149 @@
 }
 
-RenderObject* NodeRenderingContext::parentRenderer() const
+RenderObject* NodeRenderingContext::parentRenderer()
 {
     if (RenderObject* renderer = m_node->renderer())
@@ -171 +171 @@
         return m_parentFlowRenderer;
 
+    if (m_node->isElementNode() && toElement(m_node)->moveToFlowThreadIsNeeded(m_style)) {
+        moveToFlowThread();
+        return m_parentFlowRenderer;
+    }
+
     return m_renderingParent ? m_renderingParent->renderer() : 0;
 }
 
-bool NodeRenderingContext::shouldCreateRenderer() const
+bool NodeRenderingContext::shouldCreateRenderer()
 {
     if (!m_node->document()->shouldCreateRenderers())
@@ -183 +188 @@
     if (!parentRenderer)
         return false;
-    if (!parentRenderer->canHaveChildren())
-        return false;
+    if (!parentRenderer->canHaveChildren()) {
+        if (parentRenderer->canDOMChildrenHaveRenderParent()) {
+            // In a region, only the children that need to be in a flow thread should have a renderer.
+            bool shouldBeInNamedFlow = m_node->isElementNode() && toElement(m_node)->moveToFlowThreadIsNeeded(m_style);
+            if (!shouldBeInNamedFlow)
+                return false;
+        } else
+            return false;
+    }
+
     if (!m_renderingParent->childShouldCreateRenderer(*this))
         return false;
@@ -193 +206 @@
 {
     ASSERT(m_node->isElementNode());
+
+    if (!toElement(m_node)->moveToFlowThreadIsNeeded(m_style))
+        return;
+
+    moveToFlowThread();
+}
+
+void NodeRenderingContext::moveToFlowThread()
+{
+    ASSERT(m_node->isElementNode());
+    ASSERT(toElement(m_node)->moveToFlowThreadIsNeeded(m_style));
+
+    if (!m_style)
+        m_style = toElement(m_node)->styleForRenderer();
     ASSERT(m_style);
-    if (!m_node->document()->cssRegionsEnabled())
-        return;
-
-    if (m_style->flowThread().isEmpty())
-        return;
-
-    // As per http://dev.w3.org/csswg/css3-regions/#flow-into, pseudo-elements such as ::first-line, ::first-letter, ::before or ::after
-    // cannot be directly collected into a named flow.
-    if (m_node->isPseudoElement())
-        return;
-
-    // FIXME: Do not collect elements if they are in shadow tree.
-    if (m_node->isInShadowTree())
-        return;
-
-#if ENABLE(FULLSCREEN_API)
-    Document* document = m_node->document();
-    if (document->webkitIsFullScreen() && document->webkitCurrentFullScreenElement() == m_node)
-        return;
-#endif
-
-#if ENABLE(SVG)
-    // Allow only svg root elements to be directly collected by a render flow thread.
-    if (m_node->isSVGElement()
-        && (!(m_node->hasTagName(SVGNames::svgTag) && m_node->parentNode() && !m_node->parentNode()->isSVGElement())))
-        return;
-#endif
-
     m_flowThread = m_style->flowThread();
     ASSERT(m_node->document()->renderView());

trunk/Source/WebCore/dom/NodeRenderingContext.h

@@ -56 +56 @@
     ContainerNode* parentNodeForRenderingAndStyle() const;
     bool resetStyleInheritance() const;
-    RenderObject* parentRenderer() const;
+    RenderObject* parentRenderer(); // the renderer that will be the parent for this node's renderer. In the case of RenderFlowThreads, it may need to create it.
     RenderObject* nextRenderer() const;
     RenderObject* previousRenderer() const;
@@ -67 +67 @@
 
 private:
-    bool shouldCreateRenderer() const;
+    bool shouldCreateRenderer();
+    void moveToFlowThread();
     void moveToFlowThreadIfNeeded();
 

trunk/Source/WebCore/dom/PseudoElement.h

@@ -47 +47 @@
     virtual bool rendererIsNeeded(const NodeRenderingContext&) OVERRIDE;
 
+    // As per http://dev.w3.org/csswg/css3-regions/#flow-into, pseudo-elements such as ::first-line, ::first-letter, ::before or ::after
+    // cannot be directly collected into a named flow.
+    virtual bool moveToFlowThreadIsNeeded(RefPtr<RenderStyle>& cachedStyle) OVERRIDE
+    {
+        UNUSED_PARAM(cachedStyle);
+        return false;
+    }
+
     virtual bool canStartSelection() const OVERRIDE { return false; }
     virtual bool canContainRangeEndPoint() const OVERRIDE { return false; }

trunk/Source/WebCore/dom/Text.cpp

@@ -198 +198 @@
 }
 
-bool Text::textRendererIsNeeded(const NodeRenderingContext& context)
+bool Text::textRendererIsNeeded(NodeRenderingContext& context)
 {
     if (isEditingText())
@@ -303 +303 @@
         return;
     RenderText* textRenderer = toRenderText(renderer());
-    if (!textRenderer || !textRendererIsNeeded(NodeRenderingContext(this, textRenderer->style()))) {
+    if (!textRenderer) {
+        reattach();
+        return;
+    }
+    NodeRenderingContext renderingContext(this, textRenderer->style());
+    if (!textRendererIsNeeded(renderingContext)) {
         reattach();
         return;

trunk/Source/WebCore/dom/Text.h

@@ -47 +47 @@
     void recalcTextStyle(StyleChange);
     void createTextRendererIfNeeded();
-    bool textRendererIsNeeded(const NodeRenderingContext&);
+    bool textRendererIsNeeded(NodeRenderingContext&);
     RenderText* createTextRenderer(RenderArena*, RenderStyle*);
     void updateTextRenderer(unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);

trunk/Source/WebCore/rendering/FlowThreadController.cpp

@@ -228 +228 @@
 }
 
+bool FlowThreadController::isContentNodeRegisteredWithAnyNamedFlow(Node* contentNode) const
+{
+    return m_mapNamedFlowContentNodes.contains(contentNode);
+}
+
 #ifndef NDEBUG
 bool FlowThreadController::isAutoLogicalHeightRegionsCountConsistent() const

trunk/Source/WebCore/rendering/FlowThreadController.h

@@ -67 +67 @@
     void registerNamedFlowContentNode(Node*, RenderNamedFlowThread*);
     void unregisterNamedFlowContentNode(Node*);
+    bool isContentNodeRegisteredWithAnyNamedFlow(Node*) const;
 
     bool hasFlowThreadsWithAutoLogicalHeightRegions() const { return m_flowThreadsWithAutoLogicalHeightRegions; }

trunk/Source/WebCore/rendering/RenderObject.h

@@ -258 +258 @@
     //////////////////////////////////////////
     virtual bool canHaveChildren() const { return virtualChildren(); }
+    virtual bool canDOMChildrenHaveRenderParent() const { return false; } // Even if this render object can't have render children, the children in the DOM tree may have a render parent (that is different from this object).
     virtual bool canHaveGeneratedChildren() const;
     virtual bool isChildAllowed(RenderObject*, RenderStyle*) const { return true; }

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -146 +146 @@
 
     virtual bool canHaveChildren() const OVERRIDE { return false; }
+    virtual bool canDOMChildrenHaveRenderParent() const OVERRIDE { return true; }
 
     virtual void insertedIntoTree() OVERRIDE;

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -451 +451 @@
 
     return false;
+}
+
+bool SVGElement::moveToFlowThreadIsNeeded(RefPtr<RenderStyle>& cachedStyle)
+{
+    // Allow only svg root elements to be directly collected by a render flow thread.
+    return parentNode() && !parentNode()->isSVGElement() && hasTagName(SVGNames::svgTag) && Element::moveToFlowThreadIsNeeded(cachedStyle);
 }
 

trunk/Source/WebCore/svg/SVGElement.h

@@ -121 +121 @@
     virtual bool removeEventListener(const AtomicString& eventType, EventListener*, bool useCapture) OVERRIDE;
 
+    virtual bool moveToFlowThreadIsNeeded(RefPtr<RenderStyle>& cachedStyle) OVERRIDE;
+
 protected:
     SVGElement(const QualifiedName&, Document*, ConstructionType = CreateSVGElement);