webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 64 insertions, 62 deletions

diff --git a/Source/WebCore/rendering/RenderInline.h b/Source/WebCore/rendering/RenderInline.h
index 3efe39fc5..bb26cf09c 100644
--- a/Source/WebCore/rendering/RenderInline.h
+++ b/Source/WebCore/rendering/RenderInline.h
@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef RenderInline_h
-#define RenderInline_h
+#pragma once
 
 #include "InlineFlowBox.h"
 #include "RenderBoxModelObject.h"
@@ -30,29 +29,35 @@
 namespace WebCore {
 
 class Position;
+class RenderRegion;
 
 class RenderInline : public RenderBoxModelObject {
 public:
-    RenderInline(Element&, PassRef<RenderStyle>);
-    RenderInline(Document&, PassRef<RenderStyle>);
+    RenderInline(Element&, RenderStyle&&);
+    RenderInline(Document&, RenderStyle&&);
 
-    virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
+    void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override;
 
-    virtual LayoutUnit marginLeft() const override final;
-    virtual LayoutUnit marginRight() const override final;
-    virtual LayoutUnit marginTop() const override final;
-    virtual LayoutUnit marginBottom() const override final;
-    virtual LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const override final;
-    virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const override final;
-    virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const override final;
-    virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const override final;
+    LayoutUnit marginLeft() const final;
+    LayoutUnit marginRight() const final;
+    LayoutUnit marginTop() const final;
+    LayoutUnit marginBottom() const final;
+    LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const final;
+    LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const final;
+    LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const final;
+    LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const final;
 
-    virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final;
-    virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
+    void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const final;
+    void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
 
-    virtual LayoutSize offsetFromContainer(RenderObject*, const LayoutPoint&, bool* offsetDependsOnPoint = 0) const override final;
+    LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = nullptr) const final;
 
-    IntRect linesBoundingBox() const;
+    LayoutRect borderBoundingBox() const final
+    {
+        return LayoutRect(LayoutPoint(), linesBoundingBox().size());
+    }
+
+    WEBCORE_EXPORT IntRect linesBoundingBox() const;
     LayoutRect linesVisualOverflowBoundingBox() const;
     LayoutRect linesVisualOverflowBoundingBoxInRegion(const RenderRegion*) const;
 
@@ -70,17 +75,17 @@ public:
     InlineBox* lastLineBoxIncludingCulling() const { return alwaysCreateLineBoxes() ? lastLineBox() : culledInlineLastLineBox(); }
 
 #if PLATFORM(IOS)
-    virtual void absoluteQuadsForSelection(Vector<FloatQuad>& quads) const override;
+    void absoluteQuadsForSelection(Vector<FloatQuad>& quads) const override;
 #endif
 
-    virtual RenderBoxModelObject* virtualContinuation() const override final { return continuation(); }
+    RenderBoxModelObject* virtualContinuation() const final { return continuation(); }
     RenderInline* inlineElementContinuation() const;
 
-    virtual void updateDragState(bool dragOn) override final;
+    void updateDragState(bool dragOn) final;
     
     LayoutSize offsetForInFlowPositionedInline(const RenderBox* child) const;
 
-    virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
+    void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) final;
     void paintOutline(PaintInfo&, const LayoutPoint&);
 
     using RenderBoxModelObject::continuation;
@@ -90,19 +95,22 @@ public:
     void setAlwaysCreateLineBoxes() { setRenderInlineAlwaysCreatesLineBoxes(true); }
     void updateAlwaysCreateLineBoxes(bool fullLayout);
 
-    virtual LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToEndOfLine) override final;
+    LayoutRect localCaretRect(InlineBox*, unsigned, LayoutUnit* extraWidthToEndOfLine) final;
 
     bool hitTestCulledInline(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset);
 
 protected:
-    virtual void willBeDestroyed() override;
+    void willBeDestroyed() override;
 
-    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
+    void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
+    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
+
+    void updateFromStyle() override;
 
 private:
-    virtual const char* renderName() const override;
+    const char* renderName() const override;
 
-    virtual bool canHaveChildren() const override final { return true; }
+    bool canHaveChildren() const final { return true; }
 
     LayoutRect culledInlineVisualOverflowBoundingBox() const;
     InlineBox* culledInlineFirstLineBox() const;
@@ -114,73 +122,67 @@ private:
     void generateCulledLineBoxRects(GeneratorContext& yield, const RenderInline* container) const;
 
     void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild);
-    virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = 0) override final;
+    void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = nullptr) final;
 
     void splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock,
                       RenderObject* beforeChild, RenderBoxModelObject* oldCont);
     void splitFlow(RenderObject* beforeChild, RenderBlock* newBlockBox,
                    RenderObject* newChild, RenderBoxModelObject* oldCont);
 
-    virtual void layout() override final { ASSERT_NOT_REACHED(); } // Do nothing for layout()
-
-    virtual void paint(PaintInfo&, const LayoutPoint&) override final;
+    void layout() final { ASSERT_NOT_REACHED(); } // Do nothing for layout()
 
-    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
+    void paint(PaintInfo&, const LayoutPoint&) final;
 
-    virtual bool requiresLayer() const override { return isInFlowPositioned() || createsGroup() || hasClipPath(); }
+    bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final;
 
-    virtual LayoutUnit offsetLeft() const override final;
-    virtual LayoutUnit offsetTop() const override final;
-    virtual LayoutUnit offsetWidth() const override final { return linesBoundingBox().width(); }
-    virtual LayoutUnit offsetHeight() const override final { return linesBoundingBox().height(); }
+    bool requiresLayer() const override { return isInFlowPositioned() || createsGroup() || hasClipPath() || willChangeCreatesStackingContext(); }
 
-    virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const override;
-    virtual LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const override final;
-    virtual void computeRectForRepaint(const RenderLayerModelObject* repaintContainer, LayoutRect&, bool fixed) const override final;
+    LayoutUnit offsetLeft() const final;
+    LayoutUnit offsetTop() const final;
+    LayoutUnit offsetWidth() const final { return linesBoundingBox().width(); }
+    LayoutUnit offsetHeight() const final { return linesBoundingBox().height(); }
 
-    virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const override;
-    virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
+    LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const override;
+    LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const final;
+    LayoutRect computeRectForRepaint(const LayoutRect&, const RenderLayerModelObject* repaintContainer, RepaintContext = { }) const final;
 
-    virtual VisiblePosition positionForPoint(const LayoutPoint&) override final;
+    void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const override;
+    const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
 
-    virtual LayoutRect frameRectForStickyPositioning() const override final { return linesBoundingBox(); }
+    VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) final;
 
-    virtual IntRect borderBoundingBox() const override final
-    {
-        IntRect boundingBox = linesBoundingBox();
-        return IntRect(0, 0, boundingBox.width(), boundingBox.height());
-    }
+    LayoutRect frameRectForStickyPositioning() const final { return linesBoundingBox(); }
 
     virtual std::unique_ptr<InlineFlowBox> createInlineFlowBox(); // Subclassed by RenderSVGInline
 
-    virtual void dirtyLinesFromChangedChild(RenderObject* child) override final { m_lineBoxes.dirtyLinesFromChangedChild(this, child); }
+    void dirtyLinesFromChangedChild(RenderObject& child) final { m_lineBoxes.dirtyLinesFromChangedChild(*this, child); }
 
-    virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override final;
-    virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override final;
+    LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final;
+    int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final;
     
-    virtual void childBecameNonInline(RenderObject* child) override final;
+    void childBecameNonInline(RenderElement&) final;
 
-    virtual void updateHitTestResult(HitTestResult&, const LayoutPoint&) override final;
+    void updateHitTestResult(HitTestResult&, const LayoutPoint&) final;
 
-    virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) override final;
+    void imageChanged(WrappedImagePtr, const IntRect* = 0) final;
 
 #if ENABLE(DASHBOARD_SUPPORT)
-    virtual void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) override final;
+    void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) final;
 #endif
     
-    virtual void updateFromStyle() override final;
-    
     RenderPtr<RenderInline> clone() const;
 
-    void paintOutlineForLine(GraphicsContext*, const LayoutPoint&, const LayoutRect& prevLine, const LayoutRect& thisLine,
-                             const LayoutRect& nextLine, const Color);
+    void paintOutlineForLine(GraphicsContext&, const LayoutPoint&, const LayoutRect& prevLine, const LayoutRect& thisLine, const LayoutRect& nextLine, const Color&);
     RenderBoxModelObject* continuationBefore(RenderObject* beforeChild);
 
+    bool willChangeCreatesStackingContext() const
+    {
+        return style().willChange() && style().willChange()->canCreateStackingContext();
+    }
+
     RenderLineBoxList m_lineBoxes;   // All of the line boxes created for this inline flow.  For example, <i>Hello<br>world.</i> will have two <i> line boxes.
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderInline, isRenderInline())
-
 } // namespace WebCore
 
-#endif // RenderInline_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderInline, isRenderInline())