Bug 60596 – Switch paintFillLayer and its progeny to use IntRect instead of four ints

• Status: RESOLVED
• Resolution: FIXED
• Component: Layout and Rendering

[Levi Weintraub]

paintFillLayer, paintFillLayers, and paintFillLayerExtended (deep breaths) all take four ints instead of an IntRect.

[Eric Seidel (no email)]

Amen, brother.  Amen.

[Levi Weintraub]

Also switching paintFillLayersExtended's InlineBox width and height parameters to an IntSize (duh! :)

[Levi Weintraub]

Created attachment 93200 [details]
Patch

[Eric Seidel (no email)]

Comment on attachment 93200 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=93200&action=review

OK.

> Source/WebCore/rendering/InlineFlowBox.cpp:1061
> +        paintInfo.context->clip(IntRect(rect.x(), rect.y(), width(), height()));

rect.location(), size()?

> Source/WebCore/rendering/InlineFlowBox.cpp:1062
> +        boxModelObject()->paintFillLayerExtended(paintInfo, c, fillLayer, IntRect(stripX, stripY, stripWidth, stripHeight), BackgroundBleedNone, this, rect.size(), op);

looks like stripRect is gonna be next. :)

[Levi Weintraub]

Comment on attachment 93200 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=93200&action=review

>> Source/WebCore/rendering/InlineFlowBox.cpp:1061
>> +        paintInfo.context->clip(IntRect(rect.x(), rect.y(), width(), height()));
> 
> rect.location(), size()?

It's weird, but because width() and height() look at if we're horizontal, and because there's currently no size() function for InlineBox I had to go with this. One could be added tho ;)

[Levi Weintraub]

(In reply to comment #4)
> (From update of attachment 93200 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=93200&action=review
> 
> OK.
> 
> > Source/WebCore/rendering/InlineFlowBox.cpp:1061
> > +        paintInfo.context->clip(IntRect(rect.x(), rect.y(), width(), height()));
> 
> rect.location(), size()?
> 
> > Source/WebCore/rendering/InlineFlowBox.cpp:1062
> > +        boxModelObject()->paintFillLayerExtended(paintInfo, c, fillLayer, IntRect(stripX, stripY, stripWidth, stripHeight), BackgroundBleedNone, this, rect.size(), op);
> 
> looks like stripRect is gonna be next. :)

Also major thanks for all the reviewing work, dude! You're really keeping us clipping along.

[Levi Weintraub]

Created attachment 93210 [details]
Patch for landing

[WebKit Commit Bot]

Comment on attachment 93210 [details]
Patch for landing

Clearing flags on attachment: 93210

Committed r86303: <http://trac.webkit.org/changeset/86303>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.