Changeset 128049 in webkit


Ignore:
Timestamp:
Sep 10, 2012 5:57:03 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Create a toggle button for closed captions
https://bugs.webkit.org/show_bug.cgi?id=96259

Patch by Christophe Dumez <Christophe Dumez> on 2012-09-10
Reviewed by Kenneth Rohde Christiansen.

Source/WebCore:

Add toggle button for closed captions to EFL's
RenderTheme.

Test: media/video-controls-captions.html

  • platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::edjeGroupFromFormType):
(WebCore::RenderThemeEfl::emitMediaButtonSignal):
(WebCore):
(WebCore::RenderThemeEfl::supportsClosedCaptioning):
(WebCore::RenderThemeEfl::paintMediaToggleClosedCaptionsButton):

  • platform/efl/RenderThemeEfl.h:

(RenderThemeEfl):

Source/WebKit/efl:

Add closed caption toggling button to default WebKitEFL
theme.

  • DefaultTheme/default.edc:
  • DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png: Added.
  • DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png: Added.
  • DefaultTheme/widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc: Added.

LayoutTests:

Unskip media/video-controls-captions.html test case
now that EFL has a toggle button for closed captions.

Rebaseline a few media track test cases that now
display the new closed caption toggling button.

  • platform/efl/TestExpectations:
  • platform/efl/media/track/track-cue-rendering-horizontal-expected.png:
  • platform/efl/media/track/track-cue-rendering-horizontal-expected.txt:
  • platform/efl/media/track/track-cue-rendering-vertical-expected.png:
  • platform/efl/media/track/track-cue-rendering-vertical-expected.txt:
Location:
trunk
Files:
4 added
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r128046 r128049  
     12012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [EFL] Create a toggle button for closed captions
     4        https://bugs.webkit.org/show_bug.cgi?id=96259
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Unskip media/video-controls-captions.html test case
     9        now that EFL has a toggle button for closed captions.
     10
     11        Rebaseline a few media track test cases that now
     12        display the new closed caption toggling button.
     13
     14        * platform/efl/TestExpectations:
     15        * platform/efl/media/track/track-cue-rendering-horizontal-expected.png:
     16        * platform/efl/media/track/track-cue-rendering-horizontal-expected.txt:
     17        * platform/efl/media/track/track-cue-rendering-vertical-expected.png:
     18        * platform/efl/media/track/track-cue-rendering-vertical-expected.txt:
     19
    1202012-09-10  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
    221
  • trunk/LayoutTests/platform/efl/TestExpectations

    r128032 r128049  
    10331033BUGWK77754 : fast/css/absolute-child-with-percent-height-inside-relative-parent.html = TEXT
    10341034
    1035 // Fails after r127035.
    1036 BUGWK95428 : media/video-controls-captions.html = TEXT
    1037 
    10381035// Started failing on JSC ports after r127202.
    10391036BUGWK95530 : http/tests/security/inactive-document-with-empty-security-origin.html = TEXT
  • trunk/LayoutTests/platform/efl/media/track/track-cue-rendering-horizontal-expected.txt

    r126864 r128049  
    6464  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
    6565    RenderButton {INPUT} at (0,0) size 20x20
    66     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
     66    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 200x20
    6767      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
    6868        RenderBlock (anonymous) at (4,4) size 55x20
    6969          RenderText {#text} at (0,0) size 55x12
    7070            text run at (0,0) width 55: "00:00 / 00:06"
    71       RenderSlider {INPUT} at (63,0) size 157x20
    72         RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
    73           RenderBlock {DIV} at (0,4) size 141x12
    74           RenderBlock {DIV} at (141,4) size 12x12
     71      RenderSlider {INPUT} at (63,0) size 137x20
     72        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 133x20
     73          RenderBlock {DIV} at (0,4) size 121x12
     74          RenderBlock {DIV} at (121,4) size 12x12
     75    RenderButton {INPUT} at (220,0) size 20x20
    7576    RenderButton {INPUT} at (240,0) size 20x20
    7677    RenderButton {INPUT} at (260,0) size 20x20
  • trunk/LayoutTests/platform/efl/media/track/track-cue-rendering-vertical-expected.txt

    r126864 r128049  
    6464  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,220) size 320x20
    6565    RenderButton {INPUT} at (0,0) size 20x20
    66     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
     66    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 200x20
    6767      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
    6868        RenderBlock (anonymous) at (4,4) size 55x20
    6969          RenderText {#text} at (0,0) size 55x12
    7070            text run at (0,0) width 55: "00:00 / 00:06"
    71       RenderSlider {INPUT} at (63,0) size 157x20
    72         RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
    73           RenderBlock {DIV} at (0,4) size 141x12
    74           RenderBlock {DIV} at (141,4) size 12x12
     71      RenderSlider {INPUT} at (63,0) size 137x20
     72        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 133x20
     73          RenderBlock {DIV} at (0,4) size 121x12
     74          RenderBlock {DIV} at (121,4) size 12x12
     75    RenderButton {INPUT} at (220,0) size 20x20
    7576    RenderButton {INPUT} at (240,0) size 20x20
    7677    RenderButton {INPUT} at (260,0) size 20x20
    7778    RenderButton {INPUT} at (280,0) size 20x20
    7879    RenderBlock {DIV} at (300,0) size 20x20
    79 layer at (110,232) size 12x12
     80layer at (108,232) size 12x12
    8081  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    8182layer at (308,228) size 20x20
  • trunk/Source/WebCore/ChangeLog

    r128047 r128049  
     12012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [EFL] Create a toggle button for closed captions
     4        https://bugs.webkit.org/show_bug.cgi?id=96259
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Add toggle button for closed captions to EFL's
     9        RenderTheme.
     10
     11        Test: media/video-controls-captions.html
     12
     13        * platform/efl/RenderThemeEfl.cpp:
     14        (WebCore::RenderThemeEfl::edjeGroupFromFormType):
     15        (WebCore::RenderThemeEfl::emitMediaButtonSignal):
     16        (WebCore):
     17        (WebCore::RenderThemeEfl::supportsClosedCaptioning):
     18        (WebCore::RenderThemeEfl::paintMediaToggleClosedCaptionsButton):
     19        * platform/efl/RenderThemeEfl.h:
     20        (RenderThemeEfl):
     21
    1222012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
    223
  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

    r128032 r128049  
    595595        W("mediacontrol/fullscreen_button"),
    596596#endif
     597#if ENABLE(VIDEO_TRACK)
     598        W("mediacontrol/toggle_captions_button"),
     599#endif
    597600        W("spinner"),
    598601#undef W
     
    11061109    else if (mediaElementType == MediaEnterFullscreenButton)
    11071110        edje_object_signal_emit(entry->o, "fullscreen", "");
     1111#if ENABLE(VIDEO_TRACK)
     1112    else if (mediaElementType == MediaShowClosedCaptionsButton)
     1113        edje_object_signal_emit(entry->o, "show_captions", "");
     1114    else if (mediaElementType == MediaHideClosedCaptionsButton)
     1115        edje_object_signal_emit(entry->o, "hide_captions", "");
     1116#endif
    11081117    else
    11091118        return false;
     
    12801289#endif
    12811290
     1291#if ENABLE(VIDEO_TRACK)
     1292bool RenderThemeEfl::supportsClosedCaptioning() const
     1293{
     1294    return true;
     1295}
     1296
     1297bool RenderThemeEfl::paintMediaToggleClosedCaptionsButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
     1298{
     1299    Node* mediaNode = object->node() ? object->node()->shadowHost() : 0;
     1300    if (!mediaNode)
     1301        mediaNode = object->node();
     1302    if (!mediaNode || (!mediaNode->hasTagName(videoTag)))
     1303        return false;
     1304
     1305    HTMLMediaElement* mediaElement = static_cast<HTMLMediaElement*>(mediaNode);
     1306    if (!emitMediaButtonSignal(ToggleCaptionsButton, mediaElement->webkitClosedCaptionsVisible() ? MediaShowClosedCaptionsButton : MediaHideClosedCaptionsButton, rect))
     1307        return false;
     1308
     1309    return paintThemePart(object, ToggleCaptionsButton, info, rect);
     1310}
     1311#endif
     1312
    12821313#undef _ASSERT_ON_RELEASE_RETURN
    12831314#undef _ASSERT_ON_RELEASE_RETURN_VAL
  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

    r127786 r128049  
    6767    SeekBackwardButton,
    6868    FullScreenButton,
     69#endif
     70#if ENABLE(VIDEO_TRACK)
     71    ToggleCaptionsButton,
    6972#endif
    7073    Spinner,
     
    201204    virtual bool paintMediaCurrentTime(RenderObject*, const PaintInfo&, const IntRect&);
    202205#endif
     206#if ENABLE(VIDEO_TRACK)
     207    virtual bool supportsClosedCaptioning() const OVERRIDE;
     208    virtual bool paintMediaToggleClosedCaptionsButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
     209#endif
    203210    virtual bool shouldShowPlaceholderWhenFocused() const OVERRIDE { return true; }
    204211
  • trunk/Source/WebKit/efl/ChangeLog

    r128006 r128049  
     12012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [EFL] Create a toggle button for closed captions
     4        https://bugs.webkit.org/show_bug.cgi?id=96259
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Add closed caption toggling button to default WebKitEFL
     9        theme.
     10
     11        * DefaultTheme/default.edc:
     12        * DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption.png: Added.
     13        * DefaultTheme/widget/mediacontrol/togglecaptionsbutton/closedcaption_disabled.png: Added.
     14        * DefaultTheme/widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc: Added.
     15
    1162012-09-09  Emil A Eklund  <eae@chromium.org>
    217
  • trunk/Source/WebKit/efl/DefaultTheme/default.edc

    r123300 r128049  
    6262#include "widget/mediacontrol/seekforwardbutton/seekforward_button.edc"
    6363#include "widget/mediacontrol/seekbackwardbutton/seekbackward_button.edc"
     64#include "widget/mediacontrol/togglecaptionsbutton/toggle_captions_button.edc"
    6465#include "widget/mediacontrol/fullscreenbutton/fullscreen_button.edc"
    6566}
Note: See TracChangeset for help on using the changeset viewer.