Bug 61860 – Remove duplicated code in various computeReplacedLogical*() functions

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

[Nikolas Zimmermann]

Remove duplicated code in various computeReplacedLogical*() functions. In the recent RenderPart work (bug 10526) we noticed that some code is duplicated, fix that.

[Nikolas Zimmermann]

Created attachment 95595 [details]
Patch

[Nikolas Zimmermann]

Created attachment 95597 [details]
Patch v2

Oops, uploaded the wrong patch.

[Rob Buis]

Comment on attachment 95597 [details]
Patch v2

LGTM

[Nikolas Zimmermann]

Landed in r87801.

[Eric Seidel (no email)]

Comment on attachment 95597 [details]
Patch v2

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

> Source/WebCore/rendering/RenderPart.h:53
> +    int computeEmbeddedDocumentReplacedWidth(RenderSVGRoot* contentRenderer, bool includeMaxWidth) const;
> +    int computeEmbeddedDocumentReplacedHeight(RenderSVGRoot* contentRenderer) const;

Seems odd to make RenderPart depend on REnderSVGRoot for these generic sounding functions.  I guess you plan to fix that later?

[Nikolas Zimmermann]

(In reply to comment #5)
> (From update of attachment 95597 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=95597&action=review
> 
> > Source/WebCore/rendering/RenderPart.h:53
> > +    int computeEmbeddedDocumentReplacedWidth(RenderSVGRoot* contentRenderer, bool includeMaxWidth) const;
> > +    int computeEmbeddedDocumentReplacedHeight(RenderSVGRoot* contentRenderer) const;
> 
> Seems odd to make RenderPart depend on REnderSVGRoot for these generic sounding functions.  I guess you plan to fix that later?

This is completely correct, all code related to size-negotiation will be generalized into RenderReplaced, which is the base for RenderImage/RenderPart (through RenderWidget). The current RenderPart stuff for embedding SVG documents covers size-negotiation for object/embed and iframe.

RenderImage still contains its own code for size-negotiation which is broken in some cases (SVG as image problems with relative sizes etc.) - that code shall die and join with the new code in RenderPart, which will then be refactored into RenderReplaced. I'm working on this as we speak.