Changeset 109776 in webkit


Ignore:
Timestamp:
Mar 5, 2012 11:38:04 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Add media control css for chromium on android
​https://bugs.webkit.org/show_bug.cgi?id=79550

Patch by Min Qin <​qinmin@google.com> on 2012-03-05
Reviewed by Adam Barth.

This should not change the any test results as it does not affect the any current bots. New test expectations will be added if we have a android bot on webkit.

  • WebCore.gyp/WebCore.gyp:
  • css/mediaControlsChromiumAndroid.css: Added.

(body:-webkit-full-page-media):
(audio):
(audio:-webkit-full-page-media, video:-webkit-full-page-media):
(audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
(video:-webkit-full-page-media::-webkit-media-controls-panel):
(audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
(audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button):
(audio::-webkit-media-controls-timeline-container):
(video::-webkit-media-controls-timeline-container):
(audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display):
(audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
(video::-webkit-media-controls-fullscreen-button):
(audio::-webkit-media-controls-fullscreen-button):
(audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
(audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider):

  • rendering/RenderMediaControlsChromium.cpp:

(WebCore::paintMediaFullscreenButton):
(WebCore):
(WebCore::RenderMediaControlsChromium::paintMediaControlsPart):

  • rendering/RenderThemeChromiumAndroid.cpp:

(WebCore::RenderThemeChromiumAndroid::extraMediaControlsStyleSheet):
(WebCore):
(WebCore::RenderThemeChromiumAndroid::paintMediaFullscreenButton):

  • rendering/RenderThemeChromiumAndroid.h:
Location:
trunk/Source/WebCore
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r109775 r109776  
     12012-03-05  Min Qin  <qinmin@google.com>
     2
     3        Add media control css for chromium on android
     4        https://bugs.webkit.org/show_bug.cgi?id=79550
     5
     6        Reviewed by Adam Barth.
     7
     8        This should not change the any test results as it does not affect the any current bots. New test expectations will be added if we have a android bot on webkit.
     9
     10        * WebCore.gyp/WebCore.gyp:
     11        * css/mediaControlsChromiumAndroid.css: Added.
     12        (body:-webkit-full-page-media):
     13        (audio):
     14        (audio:-webkit-full-page-media, video:-webkit-full-page-media):
     15        (audio::-webkit-media-controls-panel, video::-webkit-media-controls-panel):
     16        (video:-webkit-full-page-media::-webkit-media-controls-panel):
     17        (audio::-webkit-media-controls-mute-button, video::-webkit-media-controls-mute-button):
     18        (audio::-webkit-media-controls-play-button, video::-webkit-media-controls-play-button):
     19        (audio::-webkit-media-controls-timeline-container):
     20        (video::-webkit-media-controls-timeline-container):
     21        (audio::-webkit-media-controls-current-time-display, video::-webkit-media-controls-current-time-display):
     22        (audio::-webkit-media-controls-timeline, video::-webkit-media-controls-timeline):
     23        (video::-webkit-media-controls-fullscreen-button):
     24        (audio::-webkit-media-controls-fullscreen-button):
     25        (audio::-webkit-media-controls-volume-slider-container, video::-webkit-media-controls-volume-slider-container):
     26        (audio::-webkit-media-controls-volume-slider, video::-webkit-media-controls-volume-slider):
     27        * rendering/RenderMediaControlsChromium.cpp:
     28        (WebCore::paintMediaFullscreenButton):
     29        (WebCore):
     30        (WebCore::RenderMediaControlsChromium::paintMediaControlsPart):
     31        * rendering/RenderThemeChromiumAndroid.cpp:
     32        (WebCore::RenderThemeChromiumAndroid::extraMediaControlsStyleSheet):
     33        (WebCore):
     34        (WebCore::RenderThemeChromiumAndroid::paintMediaFullscreenButton):
     35        * rendering/RenderThemeChromiumAndroid.h:
     36
    1372012-03-05  Anders Carlsson  <andersca@apple.com>
    238

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r109538 r109776  
    828828              '../css/mediaControls.css',
    829829              '../css/mediaControlsChromium.css',
     830              '../css/mediaControlsChromiumAndroid.css',
    830831              '../css/fullscreen.css',
    831832              # Skip fullscreenQuickTime.

  • trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp

    r109231 r109776  
    239239}
    240240
     241static bool paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
     242{
     243    HTMLMediaElement* mediaElement = toParentMediaElement(object);
     244    if (!mediaElement)
     245        return false;
     246
     247    DEFINE_STATIC_LOCAL(Image*, mediaFullscreen, (platformResource("mediaFullscreen")));
     248    return paintMediaButton(paintInfo.context, rect, mediaFullscreen);
     249}
     250
    241251bool RenderMediaControlsChromium::paintMediaControlsPart(MediaControlElementType part, RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
    242252{
    … …  
    258268    case MediaTimelineContainer:
    259269        return paintMediaTimelineContainer(object, paintInfo, rect);
     270    case MediaFullscreenButton:
     271        return paintMediaFullscreenButton(object, paintInfo, rect);
    260272    case MediaVolumeSliderMuteButton:
    261     case MediaFullscreenButton:
    262273    case MediaSeekBackButton:
    263274    case MediaSeekForwardButton:

  • trunk/Source/WebCore/rendering/RenderThemeChromiumAndroid.cpp

    r107998 r109776  
    3131#include "PaintInfo.h"
    3232#include "PlatformSupport.h"
     33#include "RenderMediaControlsChromium.h"
    3334#include "RenderObject.h"
    3435#include "RenderProgress.h"
    … …  
    6465}
    6566
     67String RenderThemeChromiumAndroid::extraMediaControlsStyleSheet()
     68{
     69    return String(mediaControlsChromiumAndroidUserAgentStyleSheet, sizeof(mediaControlsChromiumAndroidUserAgentStyleSheet));
     70}
     71
    6672String RenderThemeChromiumAndroid::extraDefaultStyleSheet()
    6773{
    … …  
    8288}
    8389
     90bool RenderThemeChromiumAndroid::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
     91{
     92#if ENABLE(VIDEO)
     93    return RenderMediaControlsChromium::paintMediaControlsPart(MediaFullscreenButton, object, paintInfo, rect);
     94#else
     95    UNUSED_PARAM(object);
     96    UNUSED_PARAM(paintInfo);
     97    UNUSED_PARAM(rect);
     98    return false;
     99#endif
     100}
     101
    84102} // namespace WebCore

  • trunk/Source/WebCore/rendering/RenderThemeChromiumAndroid.h

    r107998 r109776  
    4242    virtual bool delegatesMenuListRendering() const OVERRIDE { return true; }
    4343
     44    virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
     45
     46#if ENABLE(VIDEO)
     47    virtual String extraMediaControlsStyleSheet() OVERRIDE;
     48#endif
     49
    4450#if ENABLE(TOUCH_EVENTS)
    4551    virtual Color platformTapHighlightColor() const OVERRIDE
Note: See TracChangeset for help on using the changeset viewer.