Bug 162977 – [Win][Direct2D] Disable some CoreGraphics and CoreAnimation-based logic when building for D2D

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Brent Fulgham]

Currently the Direct2D implementation does not support some of the accelerated compositing features that require CoreAnimation. During this bring-up, we want to disable these routines so that we can build and run in (mostly) unaccelerated drawing.

This change should have no impact on non-Direct2D ports.

[Brent Fulgham]

This patch also contains a few minor clean-ups and drive-by fixes I identified in initial D2D web browsing.

[Brent Fulgham]

Created attachment 290738 [details]
Patch

[Alex Christensen]

Comment on attachment 290738 [details]
Patch

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

> Source/WebCore/page/win/FrameWinDirect2D.cpp:44
> +GDIObject<HBITMAP> imageFromRect(const Frame* frame, IntRect& ir)

const Frame& or null check

> Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:57
> +    UNUSED_PARAM(mimeType);

this can be outside the if.

> Source/WebCore/platform/win/DragImageDirect2D.cpp:77
> +    IntSize dstSize(static_cast<int>(srcSize.width() * scale.width()), static_cast<int>(srcSize.height() * scale.height()));

I think this is wrong.  Shouldn't it be width*scale, height*scale?

> Source/WebCore/platform/win/DragImageDirect2D.cpp:91
> +    HWndDC dc(0);

nullptr here and elsewhere.

[Brent Fulgham]

Comment on attachment 290738 [details]
Patch

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

>> Source/WebCore/page/win/FrameWinDirect2D.cpp:44
>> +GDIObject<HBITMAP> imageFromRect(const Frame* frame, IntRect& ir)
> 
> const Frame& or null check

Done. I'm stuck with the signature for now based on existing code.

>> Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:57
>> +    UNUSED_PARAM(mimeType);
> 
> this can be outside the if.

Done.

>> Source/WebCore/platform/win/DragImageDirect2D.cpp:77
>> +    IntSize dstSize(static_cast<int>(srcSize.width() * scale.width()), static_cast<int>(srcSize.height() * scale.height()));
> 
> I think this is wrong.  Shouldn't it be width*scale, height*scale?

Scale can be asymmetric, so it is passed as a FloatSize. 'width()' returns the scale in the X direction, 'height()' returns the scaling factor in the Y direction.

>> Source/WebCore/platform/win/DragImageDirect2D.cpp:91
>> +    HWndDC dc(0);
> 
> nullptr here and elsewhere.

Done!

[Brent Fulgham]

Committed r206830: <http://trac.webkit.org/changeset/206830>