Changeset 129687 in webkit


Ignore:
Timestamp:
Sep 26, 2012 12:43:20 PM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[EFL] Volume button should not be shown for videos without audio
​https://bugs.webkit.org/show_bug.cgi?id=97574

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

Source/WebCore:

The volume control is no longer shown for videos with
no audio.

No new tests, already tested by media/video-no-audio.html.

  • platform/efl/RenderThemeEfl.cpp:

(WebCore::RenderThemeEfl::hasOwnDisabledStateHandlingFor):
(WebCore):

  • platform/efl/RenderThemeEfl.h:

(RenderThemeEfl):

LayoutTests:

Generate baseline for media/video-no-audio.html and unskip
it now that the volume control is no longer shown for
videos with no audio track.

Rebaseline several other media tests whose output changed
due to the fix.

  • platform/efl/Skipped:
  • platform/efl/media/media-controls-clone-expected.png:
  • platform/efl/media/media-controls-clone-expected.txt:
  • platform/efl/media/video-empty-source-expected.png:
  • platform/efl/media/video-empty-source-expected.txt:
  • platform/efl/media/video-no-audio-expected.png: Added.
  • platform/efl/media/video-no-audio-expected.txt: Added.
Location:
trunk
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r129680 r129687  
     12012-09-26  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [EFL] Volume button should not be shown for videos without audio
     4        https://bugs.webkit.org/show_bug.cgi?id=97574
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Generate baseline for media/video-no-audio.html and unskip
     9        it now that the volume control is no longer shown for
     10        videos with no audio track.
     11
     12        Rebaseline several other media tests whose output changed
     13        due to the fix.
     14
     15        * platform/efl/Skipped:
     16        * platform/efl/media/media-controls-clone-expected.png:
     17        * platform/efl/media/media-controls-clone-expected.txt:
     18        * platform/efl/media/video-empty-source-expected.png:
     19        * platform/efl/media/video-empty-source-expected.txt:
     20        * platform/efl/media/video-no-audio-expected.png: Added.
     21        * platform/efl/media/video-no-audio-expected.txt: Added.
     22
    1232012-09-26  Zan Dobersek  <zandobersek@gmail.com>
    224

  • trunk/LayoutTests/platform/efl/Skipped

    r129614 r129687  
    225225fast/text/international/bidi-menulist.html
    226226fast/text/international/pop-up-button-text-alignment-and-direction.html
    227 
    228 # BUG: volume control rendered when there is no audio
    229 media/video-no-audio.html
    230227
    231228# BUG: video sizes not being set properly

  • trunk/LayoutTests/platform/efl/media/media-controls-clone-expected.txt

    r129646 r129687  
    1717  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,130) size 300x20
    1818    RenderButton {INPUT} at (0,0) size 20x20
    19     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
     19    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
    2020      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
    2121        RenderBlock (anonymous) at (4,4) size 55x20
    2222          RenderText {#text} at (0,0) size 55x12
    2323            text run at (0,0) width 55: "00:00 / 00:00"
    24       RenderSlider {INPUT} at (63,0) size 157x20
    25         RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
    26           RenderBlock {DIV} at (0,4) size 141x12
    27           RenderBlock {DIV} at (141,4) size 12x12
    28     RenderButton {INPUT} at (240,0) size 20x20
     24      RenderSlider {INPUT} at (63,0) size 177x20
     25        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 173x20
     26          RenderBlock {DIV} at (0,4) size 161x12
     27          RenderBlock {DIV} at (161,4) size 12x12
    2928    RenderButton {INPUT} at (260,0) size 20x20
    30     RenderBlock {DIV} at (280,0) size 20x20
     29    RenderButton {INPUT} at (280,0) size 20x20
     30    RenderBlock {DIV} at (300,10) size 0x0
    3131layer at (93,142) size 12x12
    3232  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    33 layer at (288,138) size 20x20
    34   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
    3533layer at (308,138) size 300x20
    3634  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
    … …  
    3836  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
    3937    RenderButton {INPUT} at (0,0) size 20x20
    40     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
     38    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
    4139      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
    4240        RenderBlock (anonymous) at (4,4) size 55x20
    4341          RenderText {#text} at (0,0) size 55x12
    4442            text run at (0,0) width 55: "00:00 / 00:00"
    45       RenderSlider {INPUT} at (63,0) size 157x20
    46         RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
    47           RenderBlock {DIV} at (0,4) size 141x12
    48           RenderBlock {DIV} at (141,4) size 12x12
    49     RenderButton {INPUT} at (240,0) size 20x20
     43      RenderSlider {INPUT} at (63,0) size 177x20
     44        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 173x20
     45          RenderBlock {DIV} at (0,4) size 161x12
     46          RenderBlock {DIV} at (161,4) size 12x12
    5047    RenderButton {INPUT} at (260,0) size 20x20
    51     RenderBlock {DIV} at (280,0) size 20x20
     48    RenderButton {INPUT} at (280,0) size 20x20
     49    RenderBlock {DIV} at (300,10) size 0x0
    5250layer at (393,142) size 12x12
    5351  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    54 layer at (588,138) size 20x20
    55   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
    5652layer at (8,161) size 300x150
    5753  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
    … …  
    5955  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,130) size 300x20
    6056    RenderButton {INPUT} at (0,0) size 20x20
    61     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
     57    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
    6258      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
    6359        RenderBlock (anonymous) at (4,4) size 55x20
    6460          RenderText {#text} at (0,0) size 55x12
    6561            text run at (0,0) width 55: "00:00 / 00:00"
    66       RenderSlider {INPUT} at (63,0) size 157x20
    67         RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
    68           RenderBlock {DIV} at (0,4) size 141x12
    69           RenderBlock {DIV} at (141,4) size 12x12
    70     RenderButton {INPUT} at (240,0) size 20x20
     62      RenderSlider {INPUT} at (63,0) size 177x20
     63        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 173x20
     64          RenderBlock {DIV} at (0,4) size 161x12
     65          RenderBlock {DIV} at (161,4) size 12x12
    7166    RenderButton {INPUT} at (260,0) size 20x20
    72     RenderBlock {DIV} at (280,0) size 20x20
     67    RenderButton {INPUT} at (280,0) size 20x20
     68    RenderBlock {DIV} at (300,10) size 0x0
    7369layer at (93,295) size 12x12
    7470  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    75 layer at (288,291) size 20x20
    76   RenderButton zI: 2 {INPUT} at (0,0) size 20x20
    7771layer at (308,291) size 300x20
    7872  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
    … …  
    8074  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,0) size 300x20
    8175    RenderButton {INPUT} at (0,0) size 20x20
    82     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
     76    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
    8377      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
    8478        RenderBlock (anonymous) at (4,4) size 55x20
    8579          RenderText {#text} at (0,0) size 55x12
    8680            text run at (0,0) width 55: "00:00 / 00:00"
    87       RenderSlider {INPUT} at (63,0) size 157x20
    88         RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
    89           RenderBlock {DIV} at (0,4) size 141x12
    90           RenderBlock {DIV} at (141,4) size 12x12
    91     RenderButton {INPUT} at (240,0) size 20x20
     81      RenderSlider {INPUT} at (63,0) size 177x20
     82        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 173x20
     83          RenderBlock {DIV} at (0,4) size 161x12
     84          RenderBlock {DIV} at (161,4) size 12x12
    9285    RenderButton {INPUT} at (260,0) size 20x20
    93     RenderBlock {DIV} at (280,0) size 20x20
     86    RenderButton {INPUT} at (280,0) size 20x20
     87    RenderBlock {DIV} at (300,10) size 0x0
    9488layer at (393,295) size 12x12
    9589  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    96 layer at (588,291) size 20x20
    97   RenderButton zI: 2 {INPUT} at (0,0) size 20x20

  • trunk/LayoutTests/platform/efl/media/video-empty-source-expected.txt

    r129646 r129687  
    1616  RenderDeprecatedFlexibleBox (relative positioned) {DIV} at (0,130) size 300x20
    1717    RenderButton {INPUT} at (0,0) size 20x20
    18     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
     18    RenderDeprecatedFlexibleBox {DIV} at (20,0) size 240x20
    1919      RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
    2020        RenderBlock (anonymous) at (4,4) size 55x20
    2121          RenderText {#text} at (0,0) size 55x12
    2222            text run at (0,0) width 55: "00:00 / 00:00"
    23       RenderSlider {INPUT} at (63,0) size 157x20
    24         RenderDeprecatedFlexibleBox {DIV} at (2,0) size 153x20
    25           RenderBlock {DIV} at (0,4) size 141x12
    26           RenderBlock {DIV} at (141,4) size 12x12
    27     RenderButton {INPUT} at (240,0) size 20x20
     23      RenderSlider {INPUT} at (63,0) size 177x20
     24        RenderDeprecatedFlexibleBox {DIV} at (2,0) size 173x20
     25          RenderBlock {DIV} at (0,4) size 161x12
     26          RenderBlock {DIV} at (161,4) size 12x12
    2827    RenderButton {INPUT} at (260,0) size 20x20
    29     RenderBlock {DIV} at (280,0) size 20x20
     28    RenderButton {INPUT} at (280,0) size 20x20
     29    RenderBlock {DIV} at (300,10) size 0x0
    3030layer at (94,177) size 12x12
    3131  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
    32 layer at (289,173) size 20x20
    33   RenderButton zI: 2 {INPUT} at (0,0) size 20x20

  • trunk/Source/WebCore/ChangeLog

    r129685 r129687  
     12012-09-26  Christophe Dumez  <christophe.dumez@intel.com>
     2
     3        [EFL] Volume button should not be shown for videos without audio
     4        https://bugs.webkit.org/show_bug.cgi?id=97574
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        The volume control is no longer shown for videos with
     9        no audio.
     10
     11        No new tests, already tested by media/video-no-audio.html.
     12
     13        * platform/efl/RenderThemeEfl.cpp:
     14        (WebCore::RenderThemeEfl::hasOwnDisabledStateHandlingFor):
     15        (WebCore):
     16        * platform/efl/RenderThemeEfl.h:
     17        (RenderThemeEfl):
     18
    1192012-09-26  Gavin Barraclough  <barraclough@apple.com>
    220

  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

    r129329 r129687  
    10941094}
    10951095
     1096bool RenderThemeEfl::hasOwnDisabledStateHandlingFor(ControlPart part) const
     1097{
     1098    return (part != MediaMuteButtonPart);
     1099}
     1100
    10961101bool RenderThemeEfl::paintMediaFullscreenButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
    10971102{

  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.h

    r128573 r129687  
    191191#endif
    192192    virtual String formatMediaControlsCurrentTime(float currentTime, float duration) const;
    193     virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; }
     193    virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const;
    194194
    195195    virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
Note: See TracChangeset for help on using the changeset viewer.