Changeset 156954 in webkit for trunk/Source/WebCore/rendering/RenderBox.cpp

Timestamp:

Oct 5, 2013, 8:55:28 AM (12 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r156952.
​http://trac.webkit.org/changeset/156952
​https://bugs.webkit.org/show_bug.cgi?id=122381

Made svg/custom/large-image-pattern-crash.html assert
(Requested by ap on #webkit).

• rendering/InlineBox.cpp:

(WebCore::InlineBox::paint):

• rendering/InlineBox.h:
• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::paintBoxDecorations):
(WebCore::InlineFlowBox::paintMask):

• rendering/InlineTextBox.cpp:

(WebCore::InlineTextBox::paint):

• rendering/PaintInfo.h:

(WebCore::PaintInfo::shouldPaintWithinRoot):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paint):

• rendering/RenderBox.cpp:

(WebCore::RenderBox::paint):
(WebCore::RenderBox::paintBoxDecorations):
(WebCore::RenderBox::paintMask):

• rendering/RenderBox.h:
• rendering/RenderElement.h:
• rendering/RenderFieldset.cpp:

(WebCore::RenderFieldset::paintBoxDecorations):

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::paint):

• rendering/RenderLineBreak.h:
• rendering/RenderObject.cpp:

(WebCore::RenderObject::paint):

• rendering/RenderObject.h:
• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::paint):
(WebCore::RenderReplaced::shouldPaint):

• rendering/RenderTable.cpp:

(WebCore::RenderTable::paintObject):
(WebCore::RenderTable::paintBoxDecorations):

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::paintCollapsedBorders):
(WebCore::RenderTableCell::paintBackgroundsBehindCell):
(WebCore::RenderTableCell::paintBoxDecorations):

• rendering/RenderTableCol.h:
• rendering/RenderText.h:
• rendering/RenderView.cpp:

(WebCore::RenderView::paint):
(WebCore::RenderView::paintBoxDecorations):

• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::paintEllipsisBox):
(WebCore::RootInlineBox::paintCustomHighlight):

• rendering/svg/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::paint):

• rendering/svg/RenderSVGGradientStop.h:
• rendering/svg/RenderSVGResourceClipper.cpp:

(WebCore::RenderSVGResourceClipper::drawContentIntoMaskImage):

• rendering/svg/RenderSVGResourceMasker.cpp:

(WebCore::RenderSVGResourceMasker::drawContentIntoMaskImage):

• rendering/svg/RenderSVGResourcePattern.cpp:

(WebCore::RenderSVGResourcePattern::createTileImage):

• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::paintReplaced):

• rendering/svg/SVGInlineTextBox.cpp:

(WebCore::SVGInlineTextBox::paintSelectionBackground):
(WebCore::SVGInlineTextBox::paint):

• rendering/svg/SVGRenderingContext.cpp:

(WebCore::SVGRenderingContext::renderSubtreeToImageBuffer):

• rendering/svg/SVGRenderingContext.h:
• svg/SVGUseElement.cpp:

(WebCore::SVGUseElement::rendererClipChild):

• svg/SVGUseElement.h:
• svg/graphics/filters/SVGFEImage.cpp:

(WebCore::FEImage::platformApplySoftware):

File:

• trunk/Source/WebCore/rendering/RenderBox.cpp (modified) (3 diffs)

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1095 +1095 @@
 // --------------------- painting stuff -------------------------------
 
+void RenderBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
+{
+    LayoutPoint adjustedPaintOffset = paintOffset + location();
+    // default implementation. Just pass paint through to the children
+    PaintInfo childInfo(paintInfo);
+    childInfo.updateSubtreePaintRootForChildren(this);
+    for (RenderObject* child = firstChild(); child; child = child->nextSibling())
+        child->paint(childInfo, adjustedPaintOffset);
+}
+
 void RenderBox::paintRootBoxFillLayers(const PaintInfo& paintInfo)
 {
@@ -1145 +1155 @@
 void RenderBox::paintBoxDecorations(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    if (!paintInfo.shouldPaintWithinRoot(*this))
+    if (!paintInfo.shouldPaintWithinRoot(this))
         return;
 
@@ -1366 +1376 @@
 void RenderBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    if (!paintInfo.shouldPaintWithinRoot(*this) || style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask || paintInfo.context->paintingDisabled())
+    if (!paintInfo.shouldPaintWithinRoot(this) || style()->visibility() != VISIBLE || paintInfo.phase != PaintPhaseMask || paintInfo.context->paintingDisabled())
         return;