Bug 131180 – Merge ShapeInfo & ShapeOutsideInfo now that ShapeInsideInfo is no more

• Component: Layout and Rendering
• Status: RESOLVED FIXED

[Bem Jones-Bey]

Merge ShapeInfo & ShapeOutsideInfo now that ShapeInsideInfo is no more

[Bem Jones-Bey]

Created attachment 228533 [details]
Patch

[Zoltan Horvath]

Comment on attachment 228533 [details]
Patch

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

> Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp:123
> +bool checkShapeImageOrigin(Document& document, CachedImage& cachedImage)

This function is only used by ShapeOutsideInfo::isEnabledFor. Can we just make it static?

> Source/WebCore/rendering/shapes/ShapeOutsideInfo.h:125
> +bool checkShapeImageOrigin(Document&, CachedImage&);

...and we won't need this.

> Source/WebCore/rendering/shapes/ShapeOutsideInfo.cpp:197
> +inline LayoutUnit borderBeforeInWritingMode(const RenderBox& renderer, WritingMode writingMode)

We have some inlines like this, would it make sense to make it inline statics?

[Bem Jones-Bey]

Created attachment 228545 [details]
Patch

Updated for comments

[Andreas Kling]

Comment on attachment 228545 [details]
Patch

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

r=me

> Source/WebCore/rendering/shapes/ShapeOutsideInfo.h:93
> +        InfoMap::AddResult result = infoMap.add(&key, std::make_unique<ShapeOutsideInfo>(key));

I'd use "auto" here.

[Bem Jones-Bey]

Created attachment 228548 [details]
Patch

Patch for landing

[WebKit Commit Bot]

Comment on attachment 228548 [details]
Patch

Clearing flags on attachment: 228548

Committed r166752: <http://trac.webkit.org/changeset/166752>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.