Changeset 65215 in webkit


Ignore:
Timestamp:
Aug 11, 2010 8:56:40 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-08-11 Victoria Kirst <​vrk@google.com>

Reviewed by David Levin.

Fixing a regression in the UI for Mac default audio/video controls.
​https://bugs.webkit.org/show_bug.cgi?id=43750

  • rendering/RenderThemeChromiumMac.h:
  • rendering/RenderThemeChromiumMac.mm: (WebCore::RenderThemeChromiumMac::paintMediaVolumeSliderContainer): (WebCore::RenderThemeChromiumMac::paintMediaSliderThumb): (WebCore::RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton):
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r65206 r65215  
    864864// starting with the 52554->52633 merge.
    865865BUG31363 DEBUG WIN LINUX : platform/chromium/fast/dom/interval.html = TEXT PASS
     866
     867// These tests are generating the correct output, but the output currently in
     868// the repository is incorrect (regression).
     869BUG43750 MAC: media/audio-controls-rendering.html = FAIL
     870BUG43750 MAC: media/audio-no-installed-engines.html = FAIL
     871BUG43750 MAC: media/controls-after-reload.html = FAIL
     872BUG43750 MAC: media/controls-strict.html = FAIL
     873BUG43750 MAC: media/video-aspect-ratio.html = FAIL
     874BUG43750 MAC: media/video-controls-rendering.html = FAIL
     875BUG43750 MAC: media/video-display-toggle.html = FAIL
     876BUG43750 MAC: media/video-no-audio.html = FAIL
     877BUG43750 MAC: media/video-volume-slider.html = FAIL
    866878
    867879// -----------------------------------------------------------------

  • trunk/WebCore/ChangeLog

    r65213 r65215  
     12010-08-11  Victoria Kirst  <vrk@google.com>
     2
     3        Reviewed by David Levin.
     4
     5        Fixing a regression in the UI for Mac default audio/video controls.
     6        https://bugs.webkit.org/show_bug.cgi?id=43750
     7
     8        * rendering/RenderThemeChromiumMac.h:
     9        * rendering/RenderThemeChromiumMac.mm:
     10        (WebCore::RenderThemeChromiumMac::paintMediaVolumeSliderContainer):
     11        (WebCore::RenderThemeChromiumMac::paintMediaSliderThumb):
     12        (WebCore::RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton):
     13
    1142010-08-11  Adam Barth  <abarth@webkit.org>
    215

  • trunk/WebCore/rendering/RenderThemeChromiumMac.h

    r62104 r65215  
    4242    virtual String extraMediaControlsStyleSheet();
    4343
     44    virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
     45    virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&);
    4446    virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
    4547    virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
     48    virtual IntPoint volumeSliderOffsetFromMuteButton(Node*, const IntSize&) const;
    4649
    4750#endif

  • trunk/WebCore/rendering/RenderThemeChromiumMac.mm

    r62104 r65215  
    135135}
    136136
     137bool RenderThemeChromiumMac::paintMediaVolumeSliderContainer(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
     138{
     139    return true;
     140}
     141
    137142bool RenderThemeChromiumMac::paintMediaVolumeSliderTrack(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
    138143{
    … …  
    145150}
    146151
     152bool RenderThemeChromiumMac::paintMediaSliderThumb(RenderObject* object, const PaintInfo& paintInfo, const IntRect& rect)
     153{
     154    return RenderMediaControlsChromium::paintMediaControlsPart(MediaSliderThumb, object, paintInfo, rect);
     155}
     156
     157IntPoint RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
     158{
     159    return RenderTheme::volumeSliderOffsetFromMuteButton(muteButton, size);
     160}
    147161#endif
    148162
Note: See TracChangeset for help on using the changeset viewer.