Bug 119910 – [Windows] Update RenderMediaControls for new API

• Status: RESOLVED
• Resolution: FIXED
• Component: Media

[Brent Fulgham]

The RenderMediaControls::paintMediaControlsPart and RenderMediaControls::adjustMediaSliderThumbSize implementations need to be updated to match the new WebKitSystemInterface API for drawing rendering controls.

[Brent Fulgham]

Created attachment 208955 [details]
Patch

[Eric Carlson]

Comment on attachment 208955 [details]
Patch

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

> Source/WebCore/rendering/RenderMediaControls.cpp:57
> +#if HAVE(AVCF_LEGIBLE_OUTPUT) // i.e., the new media controls
> +#define wkHitTestMediaUIPart(part, bounds, point) WKHitTestMediaUIPart(part, bounds, point)
> +#define wkMeasureMediaUIPart(part, bounds, naturalSize) WKMeasureMediaUIPart(part, bounds, naturalSize)
> +#define wkDrawMediaUIPart(part, context, rect, state) WKDrawMediaUIPart(part, context, rect, state)
> +#define wkDrawMediaSliderTrack(context, rect, timeLoaded, currentTime, duration, state) WKDrawMediaSliderTrack(context, rect, timeLoaded, currentTime, duration, state)
> +#else
> +// This is needed until WebKitSystemInterface is updated on the build machines
> +#define wkHitTestMediaUIPart(part, bounds, point) WKHitTestMediaUIPart(part, WKMediaControllerThemeQuickTime, bounds, point)
> +#define wkMeasureMediaUIPart(part, bounds, naturalSize) WKMeasureMediaUIPart(part, WKMediaControllerThemeQuickTime, bounds, naturalSize)
> +#define wkDrawMediaUIPart(part, context, rect, state) WKDrawMediaUIPart(part, WKMediaControllerThemeQuickTime, context, rect, state)
> +#define wkDrawMediaSliderTrack(context, rect, timeLoaded, currentTime, duration, state) WKDrawMediaSliderTrack(WKMediaControllerThemeQuickTime, context, rect, timeLoaded, currentTime, duration, state)
> +#endif

This might be slightly cleaner as inline functions instead of #defines.

[Brent Fulgham]

Created attachment 208960 [details]
Patch

[Eric Carlson]

Comment on attachment 208960 [details]
Patch

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

Thank you!

> Source/WebCore/rendering/RenderMediaControls.cpp:48
> +#if HAVE(AVCF_LEGIBLE_OUTPUT) // i.e., the new media controls

The comment isn't necessary, here or in the other the functions.

[Brent Fulgham]

Committed r154205: <http://trac.webkit.org/changeset/154205>