Ignore:
Timestamp:
May 17, 2013, 5:51:35 PM (12 years ago)
Author:
[email protected]
Message:

Unreviewed, rolling out r150294.
​http://trac.webkit.org/changeset/150294
​https://bugs.webkit.org/show_bug.cgi?id=116369

Caused 31 tests to fail (Requested by rniwa on #webkit).

  • WebCore.exp.in:
  • rendering/InlineFlowBox.h:
  • rendering/InlineTextBox.h:

(InlineTextBox):

  • rendering/RenderApplet.h:
  • rendering/RenderBR.h:
  • rendering/RenderBlock.h:

(RenderBlock):
(WebCore::RenderBlock::virtualContinuation):

  • rendering/RenderBox.h:

(WebCore::RenderBox::borderBoundingBox):
(RenderBox):
(WebCore::RenderBox::marginLogicalLeft):
(WebCore::RenderBox::marginLogicalRight):

  • rendering/RenderBoxModelObject.h:

(WebCore::RenderBoxModelObject::isBoxModelObject):

  • rendering/RenderButton.h:
  • rendering/RenderCombineText.h:
  • rendering/RenderCounter.h:
  • rendering/RenderDeprecatedFlexibleBox.h:
  • rendering/RenderDetailsMarker.h:
  • rendering/RenderEmbeddedObject.h:

(RenderEmbeddedObject):
(WebCore::RenderEmbeddedObject::isEmbeddedObject):
(WebCore::RenderEmbeddedObject::virtualChildren):

  • rendering/RenderFieldset.h:
  • rendering/RenderFileUploadControl.h:
  • rendering/RenderFlexibleBox.h:
  • rendering/RenderFlowThread.h:
  • rendering/RenderFrame.h:
  • rendering/RenderFrameSet.h:
  • rendering/RenderFullScreen.cpp:
  • rendering/RenderFullScreen.h:
  • rendering/RenderGrid.h:
  • rendering/RenderHTMLCanvas.h:
  • rendering/RenderIFrame.h:
  • rendering/RenderImage.h:

(RenderImage):
(WebCore::RenderImage::isRenderImage):

  • rendering/RenderInline.h:

(RenderInline):
(WebCore::RenderInline::virtualContinuation):
(WebCore::RenderInline::virtualChildren):
(WebCore::RenderInline::isRenderInline):
(WebCore::RenderInline::layout):
(WebCore::RenderInline::requiresLayer):
(WebCore::RenderInline::offsetWidth):
(WebCore::RenderInline::offsetHeight):
(WebCore::RenderInline::borderBoundingBox):
(WebCore::RenderInline::dirtyLinesFromChangedChild):

  • rendering/RenderLayerModelObject.h:
  • rendering/RenderListBox.h:
  • rendering/RenderListItem.h:
  • rendering/RenderListMarker.h:
  • rendering/RenderMedia.h:

(WebCore::RenderMedia::virtualChildren):
(WebCore::RenderMedia::canHaveChildren):
(WebCore::RenderMedia::isMedia):
(WebCore::RenderMedia::isImage):
(WebCore::RenderMedia::requiresForcedStyleRecalcPropagation):

  • rendering/RenderMediaControlElements.h:
  • rendering/RenderMenuList.h:
  • rendering/RenderMeter.h:
  • rendering/RenderMultiColumnBlock.h:
  • rendering/RenderMultiColumnFlowThread.h:
  • rendering/RenderMultiColumnSet.h:
  • rendering/RenderNamedFlowThread.h:
  • rendering/RenderPart.h:

(RenderPart):
(WebCore::RenderPart::isRenderPart):
(WebCore::RenderPart::renderName):

  • rendering/RenderProgress.h:
  • rendering/RenderRegion.h:

(WebCore::RenderRegion::isRenderRegion):

  • rendering/RenderRegionSet.h:
  • rendering/RenderReplaced.h:

(RenderReplaced):
(WebCore::RenderReplaced::renderName):

  • rendering/RenderReplica.h:
  • rendering/RenderRuby.h:
  • rendering/RenderRubyBase.h:
  • rendering/RenderRubyRun.h:
  • rendering/RenderRubyText.h:
  • rendering/RenderScrollbarPart.h:
  • rendering/RenderSearchField.h:
  • rendering/RenderSlider.h:
  • rendering/RenderSnapshottedPlugIn.h:

(RenderSnapshottedPlugIn):

  • rendering/RenderTable.h:

(RenderTable):
(WebCore::RenderTable::renderName):
(WebCore::RenderTable::isTable):
(WebCore::RenderTable::avoidsFloats):

  • rendering/RenderTableCaption.h:
  • rendering/RenderTableCell.h:
  • rendering/RenderTableCol.h:
  • rendering/RenderTableRow.h:
  • rendering/RenderTableSection.h:
  • rendering/RenderText.h:

(RenderText):
(WebCore::RenderText::marginLeft):
(WebCore::RenderText::marginRight):
(WebCore::RenderText::styleWillChange):
(WebCore::RenderText::length):
(WebCore::RenderText::paint):
(WebCore::RenderText::layout):

  • rendering/RenderTextControl.h:

(RenderTextControl):
(WebCore::RenderTextControl::renderName):
(WebCore::RenderTextControl::isTextControl):
(WebCore::RenderTextControl::avoidsFloats):

  • rendering/RenderTextControlMultiLine.h:
  • rendering/RenderTextControlSingleLine.h:

(RenderTextControlSingleLine):
(WebCore::RenderTextControlSingleLine::isTextField):

  • rendering/RenderTextFragment.h:
  • rendering/RenderTextTrackCue.h:
  • rendering/RenderVideo.h:
  • rendering/RenderView.h:
  • rendering/RenderWidget.h:

(RenderWidget):
(WebCore::RenderWidget::isWidget):

  • rendering/RenderWordBreak.h:
  • rendering/RootInlineBox.h:

(RootInlineBox):

  • rendering/mathml/RenderMathMLBlock.h:
  • rendering/svg/RenderSVGBlock.h:

(RenderSVGBlock):

  • rendering/svg/RenderSVGContainer.h:

(WebCore::RenderSVGContainer::setNeedsBoundariesUpdate):
(WebCore::RenderSVGContainer::virtualChildren):
(WebCore::RenderSVGContainer::isSVGContainer):
(WebCore::RenderSVGContainer::renderName):
(RenderSVGContainer):
(WebCore::RenderSVGContainer::objectBoundingBox):
(WebCore::RenderSVGContainer::strokeBoundingBox):
(WebCore::RenderSVGContainer::repaintRectInLocalCoordinates):

  • rendering/svg/RenderSVGEllipse.h:
  • rendering/svg/RenderSVGForeignObject.h:
  • rendering/svg/RenderSVGGradientStop.h:
  • rendering/svg/RenderSVGHiddenContainer.h:

(WebCore::RenderSVGHiddenContainer::renderName):
(RenderSVGHiddenContainer):
(WebCore::RenderSVGHiddenContainer::isSVGHiddenContainer):

  • rendering/svg/RenderSVGImage.h:
  • rendering/svg/RenderSVGInline.h:

(WebCore::RenderSVGInline::renderName):
(WebCore::RenderSVGInline::requiresLayer):
(WebCore::RenderSVGInline::isSVGInline):
(RenderSVGInline):

  • rendering/svg/RenderSVGInlineText.h:
  • rendering/svg/RenderSVGModelObject.h:

(WebCore::RenderSVGModelObject::requiresLayer):
(RenderSVGModelObject):

  • rendering/svg/RenderSVGPath.h:
  • rendering/svg/RenderSVGRect.h:
  • rendering/svg/RenderSVGResourceClipper.h:
  • rendering/svg/RenderSVGResourceContainer.h:

(RenderSVGResourceContainer):
(WebCore::RenderSVGResourceContainer::isSVGResourceContainer):
(WebCore::RenderSVGResourceContainer::toRenderSVGResourceContainer):

  • rendering/svg/RenderSVGResourceFilter.h:
  • rendering/svg/RenderSVGResourceFilterPrimitive.h:
  • rendering/svg/RenderSVGResourceGradient.h:

(RenderSVGResourceGradient):
(WebCore::RenderSVGResourceGradient::resourceBoundingBox):

  • rendering/svg/RenderSVGResourceLinearGradient.h:
  • rendering/svg/RenderSVGResourceMarker.h:
  • rendering/svg/RenderSVGResourceMasker.h:
  • rendering/svg/RenderSVGResourcePattern.h:
  • rendering/svg/RenderSVGResourceRadialGradient.h:
  • rendering/svg/RenderSVGRoot.h:
  • rendering/svg/RenderSVGShape.h:

(WebCore::RenderSVGShape::setNeedsBoundariesUpdate):
(WebCore::RenderSVGShape::setNeedsTransformUpdate):
(WebCore::RenderSVGShape::repaintRectInLocalCoordinates):
(WebCore::RenderSVGShape::localToParentTransform):
(WebCore::RenderSVGShape::localTransform):
(WebCore::RenderSVGShape::isSVGShape):
(RenderSVGShape):
(WebCore::RenderSVGShape::objectBoundingBox):
(WebCore::RenderSVGShape::strokeBoundingBox):

  • rendering/svg/RenderSVGTSpan.h:
  • rendering/svg/RenderSVGText.h:
  • rendering/svg/RenderSVGTextPath.h:
  • rendering/svg/RenderSVGTransformableContainer.h:
  • rendering/svg/RenderSVGViewportContainer.h:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/rendering/RenderTable.h

    r150294 r150312  
    125125    void recalcBordersInRowDirection();
    126126
    127     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE FINAL;
     127    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
    128128
    129129    struct ColumnStruct {
    … …  
    196196
    197197    // Override paddingStart/End to return pixel values to match behavor of RenderTableCell.
    198     virtual LayoutUnit paddingEnd() const OVERRIDE FINAL { return static_cast<int>(RenderBlock::paddingEnd()); }
    199     virtual LayoutUnit paddingStart() const OVERRIDE FINAL { return static_cast<int>(RenderBlock::paddingStart()); }
     198    virtual LayoutUnit paddingEnd() const OVERRIDE { return static_cast<int>(RenderBlock::paddingEnd()); }
     199    virtual LayoutUnit paddingStart() const OVERRIDE { return static_cast<int>(RenderBlock::paddingStart()); }
    200200
    201201    LayoutUnit bordersPaddingAndSpacingInRowDirection() const
    … …  
    264264
    265265protected:
    266     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE FINAL;
    267     virtual void simplifiedNormalFlowLayout() OVERRIDE FINAL;
     266    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
     267    virtual void simplifiedNormalFlowLayout();
    268268
    269269private:
    270     virtual const char* renderName() const OVERRIDE { return "RenderTable"; }
    271 
    272     virtual bool isTable() const OVERRIDE FINAL { return true; }
    273 
    274     virtual bool avoidsFloats() const OVERRIDE FINAL { return true; }
    275 
    276     virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
    277     virtual void paintObject(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
    278     virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
    279     virtual void paintMask(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL;
    280     virtual void layout() OVERRIDE FINAL;
    281     virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const OVERRIDE FINAL;
     270    virtual const char* renderName() const { return "RenderTable"; }
     271
     272    virtual bool isTable() const { return true; }
     273
     274    virtual bool avoidsFloats() const { return true; }
     275
     276    virtual void paint(PaintInfo&, const LayoutPoint&);
     277    virtual void paintObject(PaintInfo&, const LayoutPoint&);
     278    virtual void paintBoxDecorations(PaintInfo&, const LayoutPoint&);
     279    virtual void paintMask(PaintInfo&, const LayoutPoint&);
     280    virtual void layout();
     281    virtual void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const OVERRIDE;
    282282    virtual void computePreferredLogicalWidths() OVERRIDE;
    283283    virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;
    284284
    285     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE FINAL;
     285    virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const OVERRIDE;
    286286    virtual int firstLineBoxBaseline() const OVERRIDE;
    287     virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE FINAL;
     287    virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE;
    288288
    289289    RenderTableCol* slowColElement(unsigned col, bool* startEdge, bool* endEdge) const;
    … …  
    292292    void invalidateCachedColumns();
    293293
    294     virtual RenderBlock* firstLineBlock() const OVERRIDE FINAL;
    295     virtual void updateFirstLetter() OVERRIDE FINAL;
    296    
    297     virtual void updateLogicalWidth() OVERRIDE FINAL;
     294    virtual RenderBlock* firstLineBlock() const;
     295    virtual void updateFirstLetter();
     296   
     297    virtual void updateLogicalWidth() OVERRIDE;
    298298
    299299    LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth);
    300300    LayoutUnit convertStyleLogicalHeightToComputedHeight(const Length& styleLogicalHeight);
    301301
    302     virtual LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) OVERRIDE FINAL;
    303 
    304     virtual void addOverflowFromChildren() OVERRIDE FINAL;
     302    virtual LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize);
     303
     304    virtual void addOverflowFromChildren();
    305305
    306306    void subtractCaptionRect(LayoutRect&) const;
Note: See TracChangeset for help on using the changeset viewer.