Bug 184356 – Tighten ImageSource to have BitmapImage pointer instead of Image

• Component: Images
• Status: RESOLVED FIXED

[Antti Koivisto]

ImageSource is an implementation detail of BitmapImage, not a generic type.

[Antti Koivisto]

Created attachment 337356 [details]
patch

[Radar WebKit Bug Importer]

<rdar://problem/39236223>

[Antti Koivisto]

Created attachment 337360 [details]
patch

[Said Abou-Hallawa]

Comment on attachment 337360 [details]
patch

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

> Source/WebCore/loader/ImageLoader.cpp:422
> -    if (!image->isBitmapImage()) {
> +    if (!is<BitmapImage>(image)) {

There are places of the code which use isBitmapImage() and others use is<BitmapImage>(). I do not know the rule here and I don't know which way is more preferable. But I think we should be consistent and use one way or the other all over the code.

> Source/WebCore/platform/graphics/BitmapImage.h:142
> +    void decode(WTF::Function<void()>&&);

I think we can remove WTF:: here.

> Source/WebCore/platform/graphics/Image.h:-142
> -    virtual void decode(WTF::Function<void()>&&) { }
> -    virtual void imageFrameAvailableAtIndex(size_t) { }
> -

Shouldn't we do the same thing for the other methods which are related to multi-frame images only?

    virtual NativeImagePtr nativeImageForCurrentFrame(const GraphicsContext* = nullptr) { return nullptr; }
    virtual ImageOrientation orientationForCurrentFrame() const { return ImageOrientation(); }
    virtual Vector<NativeImagePtr> framesNativeImages() { return { }; }

[Antti Koivisto]

> There are places of the code which use isBitmapImage() and others use
> is<BitmapImage>(). I do not know the rule here and I don't know which way is
> more preferable. But I think we should be consistent and use one way or the
> other all over the code.

I think it is good to always use is<> when paired with downcast<>. The safety of the code is then immediately obvious.

[Antti Koivisto]

> Shouldn't we do the same thing for the other methods which are related to
> multi-frame images only?
> 
>     virtual NativeImagePtr nativeImageForCurrentFrame(const GraphicsContext*
> = nullptr) { return nullptr; }
>     virtual ImageOrientation orientationForCurrentFrame() const { return
> ImageOrientation(); }
>     virtual Vector<NativeImagePtr> framesNativeImages() { return { }; }


nativeImageForCurrentFrame has SVGImage implementation too. Did the rest.

[Antti Koivisto]

Created attachment 337365 [details]
patch

[WebKit Commit Bot]

Comment on attachment 337365 [details]
patch

Clearing flags on attachment: 337365

Committed r230334: <https://trac.webkit.org/changeset/230334>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.