Changeset 88405 in webkit


Ignore:
Timestamp:
Jun 8, 2011 4:45:55 PM (13 years ago)
Author:
tkent@chromium.org
Message:

2011-06-08 Kent Tamura <tkent@chromium.org>

Reviewed by Dimitri Glazkov.

Change the argument of RenderTheme::adjustSliderThumbSize(): RenderObject* -> RenderStyle*
https://bugs.webkit.org/show_bug.cgi?id=62208

Change the argument type of RenderTheme::adjustSliderThumbSize() and
RenderMediaControls::adjustMediaSliderThumbSize() from RenderObject* to RenderStyle*.

Also, each of adjustSliderThumbStyle() overrides calls RenderTheme
adjustSliderThumbStyle() for future changes.

No new tests. This is a refactoring and should not change any behavior.

  • html/shadow/SliderThumbElement.cpp: (WebCore::RenderSliderThumb::layout): Passing RenderStyle* and remove a FIXME comment.
  • platform/efl/RenderThemeEfl.cpp: (WebCore::RenderThemeEfl::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle().
  • platform/gtk/RenderThemeGtk.cpp: (WebCore::RenderThemeGtk::adjustSliderThumbStyle): ditto. (WebCore::RenderThemeGtk::adjustMediaSliderThumbSize):
  • platform/gtk/RenderThemeGtk.h:
  • platform/gtk/RenderThemeGtk2.cpp: (WebCore::RenderThemeGtk::adjustSliderThumbSize):
  • platform/gtk/RenderThemeGtk3.cpp: (WebCore::RenderThemeGtk::adjustSliderThumbSize):
  • platform/qt/RenderThemeQt.cpp: (WebCore::RenderThemeQt::adjustSliderThumbStyle): ditto. (WebCore::RenderThemeQt::adjustSliderThumbSize):
  • rendering/RenderMediaControls.cpp: (WebCore::RenderMediaControls::adjustMediaSliderThumbSize):
  • rendering/RenderMediaControls.h:
  • rendering/RenderMediaControlsChromium.cpp: (WebCore::RenderMediaControlsChromium::adjustMediaSliderThumbSize):
  • rendering/RenderMediaControlsChromium.h:
  • rendering/RenderSlider.cpp: (WebCore::RenderSlider::layout): Passing RenderStyle* and remove a FIXME comment.
  • rendering/RenderTheme.cpp: (WebCore::RenderTheme::adjustSliderThumbStyle): Add a comment. (WebCore::RenderTheme::adjustSliderThumbSize):
  • rendering/RenderTheme.h:
  • rendering/RenderThemeChromiumLinux.cpp: (WebCore::RenderThemeChromiumLinux::adjustSliderThumbSize):
  • rendering/RenderThemeChromiumLinux.h:
  • rendering/RenderThemeChromiumMac.h:
  • rendering/RenderThemeChromiumMac.mm: (WebCore::RenderThemeChromiumMac::adjustMediaSliderThumbSize):
  • rendering/RenderThemeChromiumSkia.cpp: (WebCore::RenderThemeChromiumSkia::adjustSliderThumbSize):
  • rendering/RenderThemeChromiumSkia.h:
  • rendering/RenderThemeChromiumWin.cpp: (WebCore::RenderThemeChromiumWin::adjustSliderThumbSize):
  • rendering/RenderThemeChromiumWin.h:
  • rendering/RenderThemeMac.h:
  • rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle(). (WebCore::RenderThemeMac::adjustSliderThumbSize): (WebCore::RenderThemeMac::adjustMediaSliderThumbSize):
  • rendering/RenderThemeSafari.cpp: (WebCore::RenderThemeSafari::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle(). (WebCore::RenderThemeSafari::adjustSliderThumbSize):
  • rendering/RenderThemeSafari.h:
  • rendering/RenderThemeWin.cpp: (WebCore::RenderThemeWin::adjustSliderThumbSize):
  • rendering/RenderThemeWin.h:
  • rendering/RenderThemeWinCE.cpp: (WebCore::RenderThemeWinCE::adjustSliderThumbSize):
  • rendering/RenderThemeWinCE.h:
Location:
trunk/Source/WebCore
Files:
31 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r88403 r88405  
     12011-06-08  Kent Tamura  <tkent@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        Change the argument of RenderTheme::adjustSliderThumbSize(): RenderObject* -> RenderStyle*
     6        https://bugs.webkit.org/show_bug.cgi?id=62208
     7
     8        Change the argument type of RenderTheme::adjustSliderThumbSize() and
     9        RenderMediaControls::adjustMediaSliderThumbSize() from RenderObject* to RenderStyle*.
     10
     11        Also, each of adjustSliderThumbStyle() overrides calls RenderTheme::
     12        adjustSliderThumbStyle() for future changes.
     13
     14        No new tests. This is a refactoring and should not change any behavior.
     15
     16        * html/shadow/SliderThumbElement.cpp:
     17        (WebCore::RenderSliderThumb::layout): Passing RenderStyle* and remove a FIXME comment.
     18        * platform/efl/RenderThemeEfl.cpp:
     19        (WebCore::RenderThemeEfl::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle().
     20        * platform/gtk/RenderThemeGtk.cpp:
     21        (WebCore::RenderThemeGtk::adjustSliderThumbStyle): ditto.
     22        (WebCore::RenderThemeGtk::adjustMediaSliderThumbSize):
     23        * platform/gtk/RenderThemeGtk.h:
     24        * platform/gtk/RenderThemeGtk2.cpp:
     25        (WebCore::RenderThemeGtk::adjustSliderThumbSize):
     26        * platform/gtk/RenderThemeGtk3.cpp:
     27        (WebCore::RenderThemeGtk::adjustSliderThumbSize):
     28        * platform/qt/RenderThemeQt.cpp:
     29        (WebCore::RenderThemeQt::adjustSliderThumbStyle): ditto.
     30        (WebCore::RenderThemeQt::adjustSliderThumbSize):
     31        * rendering/RenderMediaControls.cpp:
     32        (WebCore::RenderMediaControls::adjustMediaSliderThumbSize):
     33        * rendering/RenderMediaControls.h:
     34        * rendering/RenderMediaControlsChromium.cpp:
     35        (WebCore::RenderMediaControlsChromium::adjustMediaSliderThumbSize):
     36        * rendering/RenderMediaControlsChromium.h:
     37        * rendering/RenderSlider.cpp:
     38        (WebCore::RenderSlider::layout): Passing RenderStyle* and remove a FIXME comment.
     39        * rendering/RenderTheme.cpp:
     40        (WebCore::RenderTheme::adjustSliderThumbStyle): Add a comment.
     41        (WebCore::RenderTheme::adjustSliderThumbSize):
     42        * rendering/RenderTheme.h:
     43        * rendering/RenderThemeChromiumLinux.cpp:
     44        (WebCore::RenderThemeChromiumLinux::adjustSliderThumbSize):
     45        * rendering/RenderThemeChromiumLinux.h:
     46        * rendering/RenderThemeChromiumMac.h:
     47        * rendering/RenderThemeChromiumMac.mm:
     48        (WebCore::RenderThemeChromiumMac::adjustMediaSliderThumbSize):
     49        * rendering/RenderThemeChromiumSkia.cpp:
     50        (WebCore::RenderThemeChromiumSkia::adjustSliderThumbSize):
     51        * rendering/RenderThemeChromiumSkia.h:
     52        * rendering/RenderThemeChromiumWin.cpp:
     53        (WebCore::RenderThemeChromiumWin::adjustSliderThumbSize):
     54        * rendering/RenderThemeChromiumWin.h:
     55        * rendering/RenderThemeMac.h:
     56        * rendering/RenderThemeMac.mm:
     57        (WebCore::RenderThemeMac::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle().
     58        (WebCore::RenderThemeMac::adjustSliderThumbSize):
     59        (WebCore::RenderThemeMac::adjustMediaSliderThumbSize):
     60        * rendering/RenderThemeSafari.cpp:
     61        (WebCore::RenderThemeSafari::adjustSliderThumbStyle): Calls RenderTheme::adjustSliderThumbStyle().
     62        (WebCore::RenderThemeSafari::adjustSliderThumbSize):
     63        * rendering/RenderThemeSafari.h:
     64        * rendering/RenderThemeWin.cpp:
     65        (WebCore::RenderThemeWin::adjustSliderThumbSize):
     66        * rendering/RenderThemeWin.h:
     67        * rendering/RenderThemeWinCE.cpp:
     68        (WebCore::RenderThemeWinCE::adjustSliderThumbSize):
     69        * rendering/RenderThemeWinCE.h:
     70
    1712011-06-08  Brian Salomon  <bsalomon@google.com>
    272
  • trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

    r83256 r88405  
    7676        style()->setAppearance(MediaVolumeSliderThumbPart);
    7777
    78     if (style()->hasAppearance()) {
    79         // FIXME: This should pass the style, not the renderer, to the theme.
    80         theme()->adjustSliderThumbSize(this);
    81     }
     78    if (style()->hasAppearance())
     79        theme()->adjustSliderThumbSize(style());
    8280    RenderBlock::layout();
    8381}
  • trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp

    r88333 r88405  
    835835void RenderThemeEfl::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
    836836{
     837    RenderTheme::adjustSliderThumbStyle(selector, style, element);
    837838    adjustSliderTrackStyle(selector, style, element);
    838839}
  • trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp

    r87055 r88405  
    397397}
    398398
    399 void RenderThemeGtk::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
    400 {
     399void RenderThemeGtk::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     400{
     401    RenderTheme::adjustSliderThumbStyle(selector, style, element);
    401402    style->setBoxShadow(nullptr);
    402403}
     
    473474}
    474475
    475 void RenderThemeGtk::adjustMediaSliderThumbSize(RenderObject* renderObject) const
    476 {
    477     ASSERT(renderObject->style()->appearance() == MediaSliderThumbPart);
    478     renderObject->style()->setWidth(Length(m_mediaSliderThumbWidth, Fixed));
    479     renderObject->style()->setHeight(Length(m_mediaSliderThumbHeight, Fixed));
     476void RenderThemeGtk::adjustMediaSliderThumbSize(RenderStyle* style) const
     477{
     478    ASSERT(style->appearance() == MediaSliderThumbPart);
     479    style->setWidth(Length(m_mediaSliderThumbWidth, Fixed));
     480    style->setHeight(Length(m_mediaSliderThumbHeight, Fixed));
    480481}
    481482
  • trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h

    r85773 r88405  
    143143    virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
    144144
    145     virtual void adjustSliderThumbSize(RenderObject* object) const;
     145    virtual void adjustSliderThumbSize(RenderStyle*) const;
    146146
    147147#if ENABLE(VIDEO)
    148148    void initMediaColors();
    149149    void initMediaButtons();
    150     void adjustMediaSliderThumbSize(RenderObject*) const;
     150    void adjustMediaSliderThumbSize(RenderStyle*) const;
    151151    virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; }
    152152    virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&);
  • trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp

    r85773 r88405  
    525525}
    526526
    527 void RenderThemeGtk::adjustSliderThumbSize(RenderObject* o) const
    528 {
    529     ControlPart part = o->style()->appearance();
     527void RenderThemeGtk::adjustSliderThumbSize(RenderStyle* style) const
     528{
     529    ControlPart part = style->appearance();
    530530#if ENABLE(VIDEO)
    531531    if (part == MediaSliderThumbPart) {
    532         adjustMediaSliderThumbSize(o);
     532        adjustMediaSliderThumbSize(style);
    533533        return;
    534534    }
     
    543543
    544544    if (part == SliderThumbHorizontalPart) {
    545         o->style()->setWidth(Length(length, Fixed));
    546         o->style()->setHeight(Length(width, Fixed));
     545        style->setWidth(Length(length, Fixed));
     546        style->setHeight(Length(width, Fixed));
    547547        return;
    548548    }
    549549    ASSERT(part == SliderThumbVerticalPart || part == MediaVolumeSliderThumbPart);
    550     o->style()->setWidth(Length(width, Fixed));
    551     o->style()->setHeight(Length(length, Fixed));
     550    style->setWidth(Length(width, Fixed));
     551    style->setHeight(Length(length, Fixed));
    552552}
    553553
  • trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp

    r85773 r88405  
    664664}
    665665
    666 void RenderThemeGtk::adjustSliderThumbSize(RenderObject* renderObject) const
    667 {
    668     ControlPart part = renderObject->style()->appearance();
     666void RenderThemeGtk::adjustSliderThumbSize(RenderStyle* style) const
     667{
     668    ControlPart part = style->appearance();
    669669#if ENABLE(VIDEO)
    670670    if (part == MediaSliderThumbPart) {
    671         adjustMediaSliderThumbSize(renderObject);
     671        adjustMediaSliderThumbSize(style);
    672672        return;
    673673    }
     
    680680                                NULL);
    681681    if (part == SliderThumbHorizontalPart) {
    682         renderObject->style()->setWidth(Length(sliderLength, Fixed));
    683         renderObject->style()->setHeight(Length(sliderWidth, Fixed));
     682        style->setWidth(Length(sliderLength, Fixed));
     683        style->setHeight(Length(sliderWidth, Fixed));
    684684        return;
    685685    }
    686686    ASSERT(part == SliderThumbVerticalPart || part == MediaVolumeSliderThumbPart);
    687     renderObject->style()->setWidth(Length(sliderWidth, Fixed));
    688     renderObject->style()->setHeight(Length(sliderLength, Fixed));
     687    style->setWidth(Length(sliderWidth, Fixed));
     688    style->setHeight(Length(sliderLength, Fixed));
    689689}
    690690
  • trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp

    r88294 r88405  
    962962}
    963963
    964 void RenderThemeQt::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
    965 {
     964void RenderThemeQt::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     965{
     966    RenderTheme::adjustSliderThumbStyle(selector, style, element);
    966967    style->setBoxShadow(nullptr);
    967968}
     
    14641465#endif
    14651466
    1466 void RenderThemeQt::adjustSliderThumbSize(RenderObject* o) const
     1467void RenderThemeQt::adjustSliderThumbSize(RenderStyle* style) const
    14671468{
    14681469    // timelineThumbHeight should match the height property of -webkit-media-controls-timeline in mediaControlsQt.css.
     
    14721473    const int volumeThumbWidth = 12;
    14731474    const int volumeThumbHeight = volumeThumbWidth / 3;
    1474     ControlPart part = o->style()->appearance();
     1475    ControlPart part = style->appearance();
    14751476
    14761477    if (part == MediaSliderThumbPart) {
    1477         o->style()->setWidth(Length(timelineThumbWidth, Fixed));
    1478         o->style()->setHeight(Length(timelineThumbHeight, Fixed));
     1478        style->setWidth(Length(timelineThumbWidth, Fixed));
     1479        style->setHeight(Length(timelineThumbHeight, Fixed));
    14791480    } else if (part == MediaVolumeSliderThumbPart) {
    1480         o->style()->setHeight(Length(volumeThumbHeight, Fixed));
    1481         o->style()->setWidth(Length(volumeThumbWidth, Fixed));
     1481        style->setHeight(Length(volumeThumbHeight, Fixed));
     1482        style->setWidth(Length(volumeThumbWidth, Fixed));
    14821483    } else if (part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart) {
    14831484        QStyleOptionSlider option;
     
    14851486            option.orientation = Qt::Vertical;
    14861487
    1487         QStyle* style = qStyle();
    1488 
    1489         int width = style->pixelMetric(QStyle::PM_SliderLength, &option);
    1490         int height = style->pixelMetric(QStyle::PM_SliderThickness, &option);
    1491         o->style()->setWidth(Length(width, Fixed));
    1492         o->style()->setHeight(Length(height, Fixed));
     1488        QStyle* qstyle = qStyle();
     1489
     1490        int width = qstyle->pixelMetric(QStyle::PM_SliderLength, &option);
     1491        int height = qstyle->pixelMetric(QStyle::PM_SliderThickness, &option);
     1492        style->setWidth(Length(width, Fixed));
     1493        style->setHeight(Length(height, Fixed));
    14931494    }
    14941495}
  • trunk/Source/WebCore/rendering/RenderMediaControls.cpp

    r87363 r88405  
    8989static const int mediaSliderThumbHeight = 14;
    9090
    91 void RenderMediaControls::adjustMediaSliderThumbSize(RenderObject* o)
    92 {
    93     ControlPart part = o->style()->appearance();
    94 
     91void RenderMediaControls::adjustMediaSliderThumbSize(RenderStyle* style)
     92{
     93    ControlPart part = style->appearance();
    9594    if (part != MediaSliderThumbPart && part != MediaVolumeSliderThumbPart)
    9695        return;
     
    9998    wkMeasureMediaUIPart(part == MediaSliderThumbPart ? MediaSliderThumb : MediaVolumeSliderThumb, WKMediaControllerThemeQuickTime, 0, &size);
    10099
    101     float zoomLevel = o->style()->effectiveZoom();
    102     o->style()->setWidth(Length(static_cast<int>(size.width * zoomLevel), Fixed));
    103     o->style()->setHeight(Length(static_cast<int>(size.height * zoomLevel), Fixed));
     100    float zoomLevel = style->effectiveZoom();
     101    style->setWidth(Length(static_cast<int>(size.width * zoomLevel), Fixed));
     102    style->setHeight(Length(static_cast<int>(size.height * zoomLevel), Fixed));
    104103}
    105104
  • trunk/Source/WebCore/rendering/RenderMediaControls.h

    r80276 r88405  
    4141#if PLATFORM(WIN)
    4242    static bool paintMediaControlsPart(MediaControlElementType, RenderObject*, const PaintInfo&, const IntRect&);
    43     static void adjustMediaSliderThumbSize(RenderObject*);
     43    static void adjustMediaSliderThumbSize(RenderStyle*);
    4444#endif
    4545    static IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&);
  • trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp

    r83397 r88405  
    281281}
    282282
    283 void RenderMediaControlsChromium::adjustMediaSliderThumbSize(RenderObject* object)
     283void RenderMediaControlsChromium::adjustMediaSliderThumbSize(RenderStyle* style)
    284284{
    285285    static Image* mediaSliderThumb = platformResource("mediaSliderThumb");
     
    287287
    288288    Image* thumbImage = 0;
    289     if (object->style()->appearance() == MediaSliderThumbPart)
     289    if (style->appearance() == MediaSliderThumbPart)
    290290        thumbImage = mediaSliderThumb;
    291     else if (object->style()->appearance() == MediaVolumeSliderThumbPart)
     291    else if (style->appearance() == MediaVolumeSliderThumbPart)
    292292        thumbImage = mediaVolumeSliderThumb;
    293293
    294     float zoomLevel = object->style()->effectiveZoom();
     294    float zoomLevel = style->effectiveZoom();
    295295    if (thumbImage) {
    296         object->style()->setWidth(Length(static_cast<int>(thumbImage->width() * zoomLevel), Fixed));
    297         object->style()->setHeight(Length(static_cast<int>(thumbImage->height() * zoomLevel), Fixed));
     296        style->setWidth(Length(static_cast<int>(thumbImage->width() * zoomLevel), Fixed));
     297        style->setHeight(Length(static_cast<int>(thumbImage->height() * zoomLevel), Fixed));
    298298    }
    299299}
  • trunk/Source/WebCore/rendering/RenderMediaControlsChromium.h

    r83397 r88405  
    3838public:
    3939    static bool paintMediaControlsPart(MediaControlElementType, RenderObject*, const PaintInfo&, const IntRect&);
    40     static void adjustMediaSliderThumbSize(RenderObject*);
     40    static void adjustMediaSliderThumbSize(RenderStyle*);
    4141};
    4242
  • trunk/Source/WebCore/rendering/RenderSlider.cpp

    r87168 r88405  
    137137    if (thumb) {
    138138        // Allow the theme to set the size of the thumb.
    139         if (thumb->style()->hasAppearance()) {
    140             // FIXME: This should pass the style, not the renderer, to the theme.
    141             theme()->adjustSliderThumbSize(thumb);
    142         }
     139        if (thumb->style()->hasAppearance())
     140            theme()->adjustSliderThumbSize(thumb->style());
    143141
    144142        baseSize.expand(thumb->style()->width().calcMinValue(0), thumb->style()->height().calcMinValue(0));
  • trunk/Source/WebCore/rendering/RenderTheme.cpp

    r87881 r88405  
    970970void RenderTheme::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const
    971971{
    972 }
    973 
    974 void RenderTheme::adjustSliderThumbSize(RenderObject*) const
     972    // FIXME: Should call adjustSliderThumbSize().
     973}
     974
     975void RenderTheme::adjustSliderThumbSize(RenderStyle*) const
    975976{
    976977}
  • trunk/Source/WebCore/rendering/RenderTheme.h

    r87881 r88405  
    161161    virtual int minimumMenuListSize(RenderStyle*) const { return 0; }
    162162
    163     virtual void adjustSliderThumbSize(RenderObject*) const;
     163    virtual void adjustSliderThumbSize(RenderStyle*) const;
    164164
    165165    virtual int popupInternalPaddingLeft(RenderStyle*) const { return 0; }
  • trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp

    r83930 r88405  
    144144}
    145145
    146 void RenderThemeChromiumLinux::adjustSliderThumbSize(RenderObject* o) const
     146void RenderThemeChromiumLinux::adjustSliderThumbSize(RenderStyle* style) const
    147147{
    148148    IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartSliderThumb);
    149149
    150     if (o->style()->appearance() == SliderThumbHorizontalPart) {
    151         o->style()->setWidth(Length(size.width(), Fixed));
    152         o->style()->setHeight(Length(size.height(), Fixed));
    153     } else if (o->style()->appearance() == SliderThumbVerticalPart) {
    154         o->style()->setWidth(Length(size.height(), Fixed));
    155         o->style()->setHeight(Length(size.width(), Fixed));
     150    if (style->appearance() == SliderThumbHorizontalPart) {
     151        style->setWidth(Length(size.width(), Fixed));
     152        style->setHeight(Length(size.height(), Fixed));
     153    } else if (style->appearance() == SliderThumbVerticalPart) {
     154        style->setWidth(Length(size.height(), Fixed));
     155        style->setHeight(Length(size.width(), Fixed));
    156156    } else
    157         RenderThemeChromiumSkia::adjustSliderThumbSize(o);
     157        RenderThemeChromiumSkia::adjustSliderThumbSize(style);
    158158}
    159159
  • trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.h

    r76379 r88405  
    5555        virtual Color platformInactiveSelectionForegroundColor() const;
    5656
    57         virtual void adjustSliderThumbSize(RenderObject*) const;
     57        virtual void adjustSliderThumbSize(RenderStyle*) const;
    5858
    5959        static void setCaretBlinkInterval(double interval);
  • trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h

    r84640 r88405  
    3434protected:
    3535#if ENABLE(VIDEO)
    36     virtual void adjustMediaSliderThumbSize(RenderObject*) const;
     36    virtual void adjustMediaSliderThumbSize(RenderStyle*) const;
    3737    virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&);
    3838    virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&);
  • trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm

    r84640 r88405  
    123123#if ENABLE(VIDEO)
    124124
    125 void RenderThemeChromiumMac::adjustMediaSliderThumbSize(RenderObject* o) const
     125void RenderThemeChromiumMac::adjustMediaSliderThumbSize(RenderStyle* style) const
    126126{
    127     RenderMediaControlsChromium::adjustMediaSliderThumbSize(o);
     127    RenderMediaControlsChromium::adjustMediaSliderThumbSize(style);
    128128}
    129129
  • trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp

    r83397 r88405  
    408408}
    409409
    410 void RenderThemeChromiumSkia::adjustSliderThumbSize(RenderObject* object) const
    411 {
    412 #if ENABLE(VIDEO)
    413     RenderMediaControlsChromium::adjustMediaSliderThumbSize(object);
    414 #else
    415     UNUSED_PARAM(object);
     410void RenderThemeChromiumSkia::adjustSliderThumbSize(RenderStyle* style) const
     411{
     412#if ENABLE(VIDEO)
     413    RenderMediaControlsChromium::adjustMediaSliderThumbSize(style);
     414#else
     415    UNUSED_PARAM(style);
    416416#endif
    417417}
  • trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h

    r83397 r88405  
    9292        virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
    9393        virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
    94         virtual void adjustSliderThumbSize(RenderObject*) const;
     94        virtual void adjustSliderThumbSize(RenderStyle*) const;
    9595        virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
    9696        virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
  • trunk/Source/WebCore/rendering/RenderThemeChromiumWin.cpp

    r80688 r88405  
    398398}
    399399
    400 void RenderThemeChromiumWin::adjustSliderThumbSize(RenderObject* o) const
     400void RenderThemeChromiumWin::adjustSliderThumbSize(RenderStyle* style) const
    401401{
    402402    // These sizes match what WinXP draws for various menus.
    403403    const int sliderThumbAlongAxis = 11;
    404404    const int sliderThumbAcrossAxis = 21;
    405     if (o->style()->appearance() == SliderThumbHorizontalPart) {
    406         o->style()->setWidth(Length(sliderThumbAlongAxis, Fixed));
    407         o->style()->setHeight(Length(sliderThumbAcrossAxis, Fixed));
    408     } else if (o->style()->appearance() == SliderThumbVerticalPart) {
    409         o->style()->setWidth(Length(sliderThumbAcrossAxis, Fixed));
    410         o->style()->setHeight(Length(sliderThumbAlongAxis, Fixed));
     405    if (style->appearance() == SliderThumbHorizontalPart) {
     406        style->setWidth(Length(sliderThumbAlongAxis, Fixed));
     407        style->setHeight(Length(sliderThumbAcrossAxis, Fixed));
     408    } else if (style->appearance() == SliderThumbVerticalPart) {
     409        style->setWidth(Length(sliderThumbAcrossAxis, Fixed));
     410        style->setHeight(Length(sliderThumbAlongAxis, Fixed));
    411411    } else
    412         RenderThemeChromiumSkia::adjustSliderThumbSize(o);
     412        RenderThemeChromiumSkia::adjustSliderThumbSize(style);
    413413}
    414414
  • trunk/Source/WebCore/rendering/RenderThemeChromiumWin.h

    r63589 r88405  
    6262        virtual Color systemColor(int cssValueId) const;
    6363
    64         virtual void adjustSliderThumbSize(RenderObject*) const;
     64        virtual void adjustSliderThumbSize(RenderStyle*) const;
    6565
    6666        // Various paint functions.
  • trunk/Source/WebCore/rendering/RenderThemeMac.h

    r83397 r88405  
    7272    virtual int minimumMenuListSize(RenderStyle*) const;
    7373
    74     virtual void adjustSliderThumbSize(RenderObject*) const;
     74    virtual void adjustSliderThumbSize(RenderStyle*) const;
    7575   
    7676    virtual int popupInternalPaddingLeft(RenderStyle*) const;
     
    171171    virtual bool usesMediaControlStatusDisplay();
    172172    virtual bool usesMediaControlVolumeSlider() const;
    173     virtual void adjustMediaSliderThumbSize(RenderObject*) const;
     173    virtual void adjustMediaSliderThumbSize(RenderStyle*) const;
    174174    virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const;
    175175#endif
  • trunk/Source/WebCore/rendering/RenderThemeMac.mm

    r87881 r88405  
    12901290}
    12911291
    1292 void RenderThemeMac::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
    1293 {
     1292void RenderThemeMac::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const
     1293{
     1294    RenderTheme::adjustSliderThumbStyle(selector, style, element);
    12941295    style->setBoxShadow(nullptr);
    12951296}
     
    16441645const int mediaSliderThumbHeight = 14;
    16451646
    1646 void RenderThemeMac::adjustSliderThumbSize(RenderObject* o) const
    1647 {
    1648     float zoomLevel = o->style()->effectiveZoom();
    1649     if (o->style()->appearance() == SliderThumbHorizontalPart || o->style()->appearance() == SliderThumbVerticalPart) {
    1650         o->style()->setWidth(Length(static_cast<int>(sliderThumbWidth * zoomLevel), Fixed));
    1651         o->style()->setHeight(Length(static_cast<int>(sliderThumbHeight * zoomLevel), Fixed));
     1647void RenderThemeMac::adjustSliderThumbSize(RenderStyle* style) const
     1648{
     1649    float zoomLevel = style->effectiveZoom();
     1650    if (style->appearance() == SliderThumbHorizontalPart || style->appearance() == SliderThumbVerticalPart) {
     1651        style->setWidth(Length(static_cast<int>(sliderThumbWidth * zoomLevel), Fixed));
     1652        style->setHeight(Length(static_cast<int>(sliderThumbHeight * zoomLevel), Fixed));
    16521653    }
    16531654
    16541655#if ENABLE(VIDEO)
    1655     adjustMediaSliderThumbSize(o);
     1656    adjustMediaSliderThumbSize(style);
    16561657#endif
    16571658}
     
    16591660#if ENABLE(VIDEO)
    16601661
    1661 void RenderThemeMac::adjustMediaSliderThumbSize(RenderObject* o) const
    1662 {
    1663     ControlPart part = o->style()->appearance();
     1662void RenderThemeMac::adjustMediaSliderThumbSize(RenderStyle* style) const
     1663{
     1664    ControlPart part = style->appearance();
    16641665
    16651666    if (part == MediaSliderThumbPart || part == MediaVolumeSliderThumbPart) {
     
    16681669       
    16691670        if (mediaControllerTheme() == MediaControllerThemeQuickTime) {
    1670             CGSize  size;
     1671            CGSize size;
    16711672           
    16721673            wkMeasureMediaUIPart(part == MediaSliderThumbPart ? MediaSliderThumb : MediaVolumeSliderThumb, MediaControllerThemeQuickTime, NULL, &size);
     
    16751676        }
    16761677
    1677         float zoomLevel = o->style()->effectiveZoom();
    1678         o->style()->setWidth(Length(static_cast<int>(width * zoomLevel), Fixed));
    1679         o->style()->setHeight(Length(static_cast<int>(height * zoomLevel), Fixed));
     1678        float zoomLevel = style->effectiveZoom();
     1679        style->setWidth(Length(static_cast<int>(width * zoomLevel), Fixed));
     1680        style->setHeight(Length(static_cast<int>(height * zoomLevel), Fixed));
    16801681    }
    16811682}
  • trunk/Source/WebCore/rendering/RenderThemeSafari.cpp

    r86135 r88405  
    991991void RenderThemeSafari::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
    992992{
     993    RenderTheme::adjustSliderThumbStyle(selector, style, e);
    993994    style->setBoxShadow(nullptr);
    994995}
     
    10151016const int sliderThumbHeight = 15;
    10161017
    1017 void RenderThemeSafari::adjustSliderThumbSize(RenderObject* o) const
    1018 {
    1019     if (o->style()->appearance() == SliderThumbHorizontalPart || o->style()->appearance() == SliderThumbVerticalPart) {
    1020         o->style()->setWidth(Length(sliderThumbWidth, Fixed));
    1021         o->style()->setHeight(Length(sliderThumbHeight, Fixed));
     1018void RenderThemeSafari::adjustSliderThumbSize(RenderStyle* style) const
     1019{
     1020    if (style->appearance() == SliderThumbHorizontalPart || style->appearance() == SliderThumbVerticalPart) {
     1021        style->setWidth(Length(sliderThumbWidth, Fixed));
     1022        style->setHeight(Length(sliderThumbHeight, Fixed));
    10221023    }
    10231024#if ENABLE(VIDEO)
    1024     else if (o->style()->appearance() == MediaSliderThumbPart)
    1025         RenderMediaControls::adjustMediaSliderThumbSize(o);
     1025    else if (style->appearance() == MediaSliderThumbPart)
     1026        RenderMediaControls::adjustMediaSliderThumbSize(style);
    10261027#endif
    10271028}
  • trunk/Source/WebCore/rendering/RenderThemeSafari.h

    r62104 r88405  
    7777    virtual int minimumMenuListSize(RenderStyle*) const;
    7878
    79     virtual void adjustSliderThumbSize(RenderObject*) const;
     79    virtual void adjustSliderThumbSize(RenderStyle*) const;
    8080    virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
    8181   
  • trunk/Source/WebCore/rendering/RenderThemeWin.cpp

    r83397 r88405  
    834834const int sliderThumbHeight = 15;
    835835
    836 void RenderThemeWin::adjustSliderThumbSize(RenderObject* o) const
    837 {
    838     ControlPart part = o->style()->appearance();
     836void RenderThemeWin::adjustSliderThumbSize(RenderStyle* style) const
     837{
     838    ControlPart part = style->appearance();
    839839    if (part == SliderThumbVerticalPart) {
    840         o->style()->setWidth(Length(sliderThumbHeight, Fixed));
    841         o->style()->setHeight(Length(sliderThumbWidth, Fixed));
     840        style->setWidth(Length(sliderThumbHeight, Fixed));
     841        style->setHeight(Length(sliderThumbWidth, Fixed));
    842842    } else if (part == SliderThumbHorizontalPart) {
    843         o->style()->setWidth(Length(sliderThumbWidth, Fixed));
    844         o->style()->setHeight(Length(sliderThumbHeight, Fixed));
     843        style->setWidth(Length(sliderThumbWidth, Fixed));
     844        style->setHeight(Length(sliderThumbHeight, Fixed));
    845845    }
    846846#if ENABLE(VIDEO)
    847847    else if (part == MediaSliderThumbPart || part == MediaVolumeSliderThumbPart)
    848         RenderMediaControls::adjustMediaSliderThumbSize(o);
     848        RenderMediaControls::adjustMediaSliderThumbSize(style);
    849849#endif
    850850}
  • trunk/Source/WebCore/rendering/RenderThemeWin.h

    r83397 r88405  
    9494    virtual bool paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r);
    9595    virtual bool paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r);
    96     virtual void adjustSliderThumbSize(RenderObject*) const;
     96    virtual void adjustSliderThumbSize(RenderStyle*) const;
    9797
    9898    virtual bool popupOptionSupportsTextIndent() const { return true; }
  • trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp

    r77437 r88405  
    332332const int sliderThumbHeight = 15;
    333333
    334 void RenderThemeWinCE::adjustSliderThumbSize(RenderObject* o) const
    335 {
    336     if (o->style()->appearance() == SliderThumbVerticalPart) {
    337         o->style()->setWidth(Length(sliderThumbHeight, Fixed));
    338         o->style()->setHeight(Length(sliderThumbWidth, Fixed));
    339     } else if (o->style()->appearance() == SliderThumbHorizontalPart) {
    340         o->style()->setWidth(Length(sliderThumbWidth, Fixed));
    341         o->style()->setHeight(Length(sliderThumbHeight, Fixed));
     334void RenderThemeWinCE::adjustSliderThumbSize(RenderStyle* style) const
     335{
     336    if (style->appearance() == SliderThumbVerticalPart) {
     337        style->setWidth(Length(sliderThumbHeight, Fixed));
     338        style->setHeight(Length(sliderThumbWidth, Fixed));
     339    } else if (style->appearance() == SliderThumbHorizontalPart) {
     340        style->setWidth(Length(sliderThumbWidth, Fixed));
     341        style->setHeight(Length(sliderThumbHeight, Fixed));
    342342    }
    343343}
  • trunk/Source/WebCore/rendering/RenderThemeWinCE.h

    r67788 r88405  
    9090        virtual bool paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r);
    9191        virtual bool paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r);
    92         virtual void adjustSliderThumbSize(RenderObject*) const;
     92        virtual void adjustSliderThumbSize(RenderStyle*) const;
    9393
    9494        virtual bool popupOptionSupportsTextIndent() const { return true; }
Note: See TracChangeset for help on using the changeset viewer.