Changeset 80276 in webkit


Ignore:
Timestamp:
Mar 3, 2011 1:19:23 PM (13 years ago)
Author:
Dimitri Glazkov
Message:

2011-03-03 Dimitri Glazkov <Dimitri Glazkov>

Reviewed by Darin Adler.

Use RenderBox in volumeSliderOffsetFromMuteButton, since that's what is actually being used.
​https://bugs.webkit.org/show_bug.cgi?id=55099

Cleanup, no behavior change.

  • html/shadow/MediaControls.cpp: (WebCore::MediaControls::updateVolumeSliderContainer): Changed to pass RenderBox

instead of Node.

  • rendering/RenderMediaControls.cpp: (WebCore::RenderMediaControls::volumeSliderOffsetFromMuteButton): Changed

to use RenderBox as argument.

  • rendering/RenderMediaControls.h: Ditto.
  • rendering/RenderTheme.cpp: (WebCore::RenderTheme::volumeSliderOffsetFromMuteButton): Ditto.
  • rendering/RenderTheme.h: Ditto.
  • rendering/RenderThemeChromiumMac.h: Ditto.
  • rendering/RenderThemeChromiumMac.mm: (WebCore::RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton): Ditto.
  • rendering/RenderThemeMac.h: Ditto.
  • rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::volumeSliderOffsetFromMuteButton): Ditto.
  • rendering/RenderThemeWin.cpp: (WebCore::RenderThemeWin::volumeSliderOffsetFromMuteButton): Ditto.
Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r80274 r80276  
     12011-03-03  Dimitri Glazkov  <dglazkov@chromium.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Use RenderBox in volumeSliderOffsetFromMuteButton, since that's what is actually being used.
     6        https://bugs.webkit.org/show_bug.cgi?id=55099
     7
     8        Cleanup, no behavior change.
     9
     10        * html/shadow/MediaControls.cpp:
     11        (WebCore::MediaControls::updateVolumeSliderContainer): Changed to pass RenderBox
     12            instead of Node.
     13        * rendering/RenderMediaControls.cpp:
     14        (WebCore::RenderMediaControls::volumeSliderOffsetFromMuteButton): Changed
     15            to use RenderBox as argument.
     16        * rendering/RenderMediaControls.h: Ditto.
     17        * rendering/RenderTheme.cpp:
     18        (WebCore::RenderTheme::volumeSliderOffsetFromMuteButton): Ditto.
     19        * rendering/RenderTheme.h: Ditto.
     20        * rendering/RenderThemeChromiumMac.h: Ditto.
     21        * rendering/RenderThemeChromiumMac.mm:
     22        (WebCore::RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton): Ditto.
     23        * rendering/RenderThemeMac.h: Ditto.
     24        * rendering/RenderThemeMac.mm:
     25        (WebCore::RenderThemeMac::volumeSliderOffsetFromMuteButton): Ditto.
     26        * rendering/RenderThemeWin.cpp:
     27        (WebCore::RenderThemeWin::volumeSliderOffsetFromMuteButton): Ditto.
     28
    1292011-03-03  Alexis Menard  <alexis.menard@openbossa.org>
    230

  • trunk/Source/WebCore/html/shadow/MediaControls.cpp

    r80242 r80276  
    468468        int height = s->height().isPercent() ? 0 : s->height().value();
    469469        int width = s->width().isPercent() ? 0 : s->width().value();
    470         IntPoint offset = m_mediaElement->document()->page()->theme()->volumeSliderOffsetFromMuteButton(m_muteButton->renderer()->node(), IntSize(width, height));
     470        IntPoint offset = m_mediaElement->document()->page()->theme()->volumeSliderOffsetFromMuteButton(m_muteButton->renderBox(), IntSize(width, height));
    471471        int x = offset.x() + m_muteButton->renderBox()->offsetLeft();
    472472        int y = offset.y() + m_muteButton->renderBox()->offsetTop();

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

    r79613 r80276  
    180180#endif
    181181
    182 IntPoint RenderMediaControls::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size)
     182IntPoint RenderMediaControls::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size)
    183183{
    184184    static const int xOffset = -4;
    185185    static const int yOffset = 5;
    186186
    187     float zoomLevel = muteButton->renderer()->style()->effectiveZoom();
    188     int y = yOffset * zoomLevel + muteButton->renderBox()->offsetHeight() - size.height();
    189     FloatPoint absPoint = muteButton->renderer()->localToAbsolute(FloatPoint(muteButton->renderBox()->offsetLeft(), y), true, true);
     187    float zoomLevel = muteButtonBox->style()->effectiveZoom();
     188    int y = yOffset * zoomLevel + muteButtonBox->offsetHeight() - size.height();
     189    FloatPoint absPoint = muteButtonBox->localToAbsolute(FloatPoint(muteButtonBox->offsetLeft(), y), true, true);
    190190    if (absPoint.y() < 0)
    191         y = muteButton->renderBox()->height();
     191        y = muteButtonBox->height();
    192192    return IntPoint(xOffset * zoomLevel, y);
    193193}

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

    r79613 r80276  
    4343    static void adjustMediaSliderThumbSize(RenderObject*);
    4444#endif
    45     static IntPoint volumeSliderOffsetFromMuteButton(Node*, const IntSize&);
     45    static IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&);
    4646};
    4747

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

    r79613 r80276  
    538538}
    539539
    540 IntPoint RenderTheme::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
     540IntPoint RenderTheme::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
    541541{
    542542    int y = -size.height();
    543     FloatPoint absPoint = muteButton->renderer()->localToAbsolute(FloatPoint(muteButton->renderBox()->offsetLeft(), y), true, true);
     543    FloatPoint absPoint = muteButtonBox->localToAbsolute(FloatPoint(muteButtonBox->offsetLeft(), y), true, true);
    544544    if (absPoint.y() < 0)
    545         y = muteButton->renderBox()->height();
     545        y = muteButtonBox->height();
    546546    return IntPoint(0, y);
    547547}

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

    r79613 r80276  
    189189   
    190190    // Returns the media volume slider container's offset from the mute button.
    191     virtual IntPoint volumeSliderOffsetFromMuteButton(Node*, const IntSize&) const;
     191    virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const;
    192192#endif
    193193

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

    r79613 r80276  
    4646    virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
    4747    virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
    48     virtual IntPoint volumeSliderOffsetFromMuteButton(Node*, const IntSize&) const;
     48    virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const;
    4949    virtual bool usesMediaControlStatusDisplay() { return false; }
    5050

  • trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm

    r79613 r80276  
    156156}
    157157
    158 IntPoint RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
     158IntPoint RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
    159159{
    160     return RenderTheme::volumeSliderOffsetFromMuteButton(muteButton, size);
     160    return RenderTheme::volumeSliderOffsetFromMuteButton(muteButtonBox, size);
    161161}
    162162#endif

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

    r79613 r80276  
    167167    virtual bool usesMediaControlStatusDisplay();
    168168    virtual void adjustMediaSliderThumbSize(RenderObject*) const;
    169     virtual IntPoint volumeSliderOffsetFromMuteButton(Node*, const IntSize&) const;
     169    virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const;
    170170#endif
    171171   

  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r79613 r80276  
    19881988}
    19891989
    1990 IntPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
    1991 {
    1992     return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButton, size);
     1990IntPoint RenderThemeMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
     1991{
     1992    return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButtonBox, size);
    19931993}
    19941994

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

    r79613 r80276  
    11091109}
    11101110
    1111 IntPoint RenderThemeWin::volumeSliderOffsetFromMuteButton(Node* muteButton, const IntSize& size) const
    1112 {
    1113     return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButton, size);
     1111IntPoint RenderThemeWin::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
     1112{
     1113    return RenderMediaControls::volumeSliderOffsetFromMuteButton(muteButtonBox, size);
    11141114}
    11151115
Note: See TracChangeset for help on using the changeset viewer.