Changeset 88405 in webkit
- Timestamp:
- Jun 8, 2011 4:45:55 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r88403 r88405 1 2011-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 1 71 2011-06-08 Brian Salomon <bsalomon@google.com> 2 72 -
trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp
r83256 r88405 76 76 style()->setAppearance(MediaVolumeSliderThumbPart); 77 77 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()); 82 80 RenderBlock::layout(); 83 81 } -
trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp
r88333 r88405 835 835 void RenderThemeEfl::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const 836 836 { 837 RenderTheme::adjustSliderThumbStyle(selector, style, element); 837 838 adjustSliderTrackStyle(selector, style, element); 838 839 } -
trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp
r87055 r88405 397 397 } 398 398 399 void RenderThemeGtk::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style, Element*) const 400 { 399 void RenderThemeGtk::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const 400 { 401 RenderTheme::adjustSliderThumbStyle(selector, style, element); 401 402 style->setBoxShadow(nullptr); 402 403 } … … 473 474 } 474 475 475 void RenderThemeGtk::adjustMediaSliderThumbSize(Render Object* renderObject) const476 { 477 ASSERT( renderObject->style()->appearance() == MediaSliderThumbPart);478 renderObject->style()->setWidth(Length(m_mediaSliderThumbWidth, Fixed));479 renderObject->style()->setHeight(Length(m_mediaSliderThumbHeight, Fixed));476 void 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)); 480 481 } 481 482 -
trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h
r85773 r88405 143 143 virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const; 144 144 145 virtual void adjustSliderThumbSize(Render Object* object) const;145 virtual void adjustSliderThumbSize(RenderStyle*) const; 146 146 147 147 #if ENABLE(VIDEO) 148 148 void initMediaColors(); 149 149 void initMediaButtons(); 150 void adjustMediaSliderThumbSize(Render Object*) const;150 void adjustMediaSliderThumbSize(RenderStyle*) const; 151 151 virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; } 152 152 virtual bool paintMediaFullscreenButton(RenderObject*, const PaintInfo&, const IntRect&); -
trunk/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
r85773 r88405 525 525 } 526 526 527 void RenderThemeGtk::adjustSliderThumbSize(Render Object* o) const528 { 529 ControlPart part = o->style()->appearance();527 void RenderThemeGtk::adjustSliderThumbSize(RenderStyle* style) const 528 { 529 ControlPart part = style->appearance(); 530 530 #if ENABLE(VIDEO) 531 531 if (part == MediaSliderThumbPart) { 532 adjustMediaSliderThumbSize( o);532 adjustMediaSliderThumbSize(style); 533 533 return; 534 534 } … … 543 543 544 544 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)); 547 547 return; 548 548 } 549 549 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)); 552 552 } 553 553 -
trunk/Source/WebCore/platform/gtk/RenderThemeGtk3.cpp
r85773 r88405 664 664 } 665 665 666 void RenderThemeGtk::adjustSliderThumbSize(Render Object* renderObject) const667 { 668 ControlPart part = renderObject->style()->appearance();666 void RenderThemeGtk::adjustSliderThumbSize(RenderStyle* style) const 667 { 668 ControlPart part = style->appearance(); 669 669 #if ENABLE(VIDEO) 670 670 if (part == MediaSliderThumbPart) { 671 adjustMediaSliderThumbSize( renderObject);671 adjustMediaSliderThumbSize(style); 672 672 return; 673 673 } … … 680 680 NULL); 681 681 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)); 684 684 return; 685 685 } 686 686 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)); 689 689 } 690 690 -
trunk/Source/WebCore/platform/qt/RenderThemeQt.cpp
r88294 r88405 962 962 } 963 963 964 void RenderThemeQt::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style, Element*) const 965 { 964 void RenderThemeQt::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const 965 { 966 RenderTheme::adjustSliderThumbStyle(selector, style, element); 966 967 style->setBoxShadow(nullptr); 967 968 } … … 1464 1465 #endif 1465 1466 1466 void RenderThemeQt::adjustSliderThumbSize(Render Object* o) const1467 void RenderThemeQt::adjustSliderThumbSize(RenderStyle* style) const 1467 1468 { 1468 1469 // timelineThumbHeight should match the height property of -webkit-media-controls-timeline in mediaControlsQt.css. … … 1472 1473 const int volumeThumbWidth = 12; 1473 1474 const int volumeThumbHeight = volumeThumbWidth / 3; 1474 ControlPart part = o->style()->appearance();1475 ControlPart part = style->appearance(); 1475 1476 1476 1477 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)); 1479 1480 } 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)); 1482 1483 } else if (part == SliderThumbHorizontalPart || part == SliderThumbVerticalPart) { 1483 1484 QStyleOptionSlider option; … … 1485 1486 option.orientation = Qt::Vertical; 1486 1487 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)); 1493 1494 } 1494 1495 } -
trunk/Source/WebCore/rendering/RenderMediaControls.cpp
r87363 r88405 89 89 static const int mediaSliderThumbHeight = 14; 90 90 91 void RenderMediaControls::adjustMediaSliderThumbSize(RenderObject* o) 92 { 93 ControlPart part = o->style()->appearance(); 94 91 void RenderMediaControls::adjustMediaSliderThumbSize(RenderStyle* style) 92 { 93 ControlPart part = style->appearance(); 95 94 if (part != MediaSliderThumbPart && part != MediaVolumeSliderThumbPart) 96 95 return; … … 99 98 wkMeasureMediaUIPart(part == MediaSliderThumbPart ? MediaSliderThumb : MediaVolumeSliderThumb, WKMediaControllerThemeQuickTime, 0, &size); 100 99 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)); 104 103 } 105 104 -
trunk/Source/WebCore/rendering/RenderMediaControls.h
r80276 r88405 41 41 #if PLATFORM(WIN) 42 42 static bool paintMediaControlsPart(MediaControlElementType, RenderObject*, const PaintInfo&, const IntRect&); 43 static void adjustMediaSliderThumbSize(Render Object*);43 static void adjustMediaSliderThumbSize(RenderStyle*); 44 44 #endif 45 45 static IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&); -
trunk/Source/WebCore/rendering/RenderMediaControlsChromium.cpp
r83397 r88405 281 281 } 282 282 283 void RenderMediaControlsChromium::adjustMediaSliderThumbSize(Render Object* object)283 void RenderMediaControlsChromium::adjustMediaSliderThumbSize(RenderStyle* style) 284 284 { 285 285 static Image* mediaSliderThumb = platformResource("mediaSliderThumb"); … … 287 287 288 288 Image* thumbImage = 0; 289 if ( object->style()->appearance() == MediaSliderThumbPart)289 if (style->appearance() == MediaSliderThumbPart) 290 290 thumbImage = mediaSliderThumb; 291 else if ( object->style()->appearance() == MediaVolumeSliderThumbPart)291 else if (style->appearance() == MediaVolumeSliderThumbPart) 292 292 thumbImage = mediaVolumeSliderThumb; 293 293 294 float zoomLevel = object->style()->effectiveZoom();294 float zoomLevel = style->effectiveZoom(); 295 295 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)); 298 298 } 299 299 } -
trunk/Source/WebCore/rendering/RenderMediaControlsChromium.h
r83397 r88405 38 38 public: 39 39 static bool paintMediaControlsPart(MediaControlElementType, RenderObject*, const PaintInfo&, const IntRect&); 40 static void adjustMediaSliderThumbSize(Render Object*);40 static void adjustMediaSliderThumbSize(RenderStyle*); 41 41 }; 42 42 -
trunk/Source/WebCore/rendering/RenderSlider.cpp
r87168 r88405 137 137 if (thumb) { 138 138 // 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()); 143 141 144 142 baseSize.expand(thumb->style()->width().calcMinValue(0), thumb->style()->height().calcMinValue(0)); -
trunk/Source/WebCore/rendering/RenderTheme.cpp
r87881 r88405 970 970 void RenderTheme::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const 971 971 { 972 } 973 974 void RenderTheme::adjustSliderThumbSize(RenderObject*) const 972 // FIXME: Should call adjustSliderThumbSize(). 973 } 974 975 void RenderTheme::adjustSliderThumbSize(RenderStyle*) const 975 976 { 976 977 } -
trunk/Source/WebCore/rendering/RenderTheme.h
r87881 r88405 161 161 virtual int minimumMenuListSize(RenderStyle*) const { return 0; } 162 162 163 virtual void adjustSliderThumbSize(Render Object*) const;163 virtual void adjustSliderThumbSize(RenderStyle*) const; 164 164 165 165 virtual int popupInternalPaddingLeft(RenderStyle*) const { return 0; } -
trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.cpp
r83930 r88405 144 144 } 145 145 146 void RenderThemeChromiumLinux::adjustSliderThumbSize(Render Object* o) const146 void RenderThemeChromiumLinux::adjustSliderThumbSize(RenderStyle* style) const 147 147 { 148 148 IntSize size = PlatformBridge::getThemePartSize(PlatformBridge::PartSliderThumb); 149 149 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)); 156 156 } else 157 RenderThemeChromiumSkia::adjustSliderThumbSize( o);157 RenderThemeChromiumSkia::adjustSliderThumbSize(style); 158 158 } 159 159 -
trunk/Source/WebCore/rendering/RenderThemeChromiumLinux.h
r76379 r88405 55 55 virtual Color platformInactiveSelectionForegroundColor() const; 56 56 57 virtual void adjustSliderThumbSize(Render Object*) const;57 virtual void adjustSliderThumbSize(RenderStyle*) const; 58 58 59 59 static void setCaretBlinkInterval(double interval); -
trunk/Source/WebCore/rendering/RenderThemeChromiumMac.h
r84640 r88405 34 34 protected: 35 35 #if ENABLE(VIDEO) 36 virtual void adjustMediaSliderThumbSize(Render Object*) const;36 virtual void adjustMediaSliderThumbSize(RenderStyle*) const; 37 37 virtual bool paintMediaPlayButton(RenderObject*, const PaintInfo&, const IntRect&); 38 38 virtual bool paintMediaMuteButton(RenderObject*, const PaintInfo&, const IntRect&); -
trunk/Source/WebCore/rendering/RenderThemeChromiumMac.mm
r84640 r88405 123 123 #if ENABLE(VIDEO) 124 124 125 void RenderThemeChromiumMac::adjustMediaSliderThumbSize(Render Object* o) const125 void RenderThemeChromiumMac::adjustMediaSliderThumbSize(RenderStyle* style) const 126 126 { 127 RenderMediaControlsChromium::adjustMediaSliderThumbSize( o);127 RenderMediaControlsChromium::adjustMediaSliderThumbSize(style); 128 128 } 129 129 -
trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
r83397 r88405 408 408 } 409 409 410 void RenderThemeChromiumSkia::adjustSliderThumbSize(Render Object* object) const411 { 412 #if ENABLE(VIDEO) 413 RenderMediaControlsChromium::adjustMediaSliderThumbSize( object);414 #else 415 UNUSED_PARAM( object);410 void RenderThemeChromiumSkia::adjustSliderThumbSize(RenderStyle* style) const 411 { 412 #if ENABLE(VIDEO) 413 RenderMediaControlsChromium::adjustMediaSliderThumbSize(style); 414 #else 415 UNUSED_PARAM(style); 416 416 #endif 417 417 } -
trunk/Source/WebCore/rendering/RenderThemeChromiumSkia.h
r83397 r88405 92 92 virtual bool paintMediaSliderTrack(RenderObject*, const PaintInfo&, const IntRect&); 93 93 virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&); 94 virtual void adjustSliderThumbSize(Render Object*) const;94 virtual void adjustSliderThumbSize(RenderStyle*) const; 95 95 virtual bool paintMediaSliderThumb(RenderObject*, const PaintInfo&, const IntRect&); 96 96 virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&); -
trunk/Source/WebCore/rendering/RenderThemeChromiumWin.cpp
r80688 r88405 398 398 } 399 399 400 void RenderThemeChromiumWin::adjustSliderThumbSize(Render Object* o) const400 void RenderThemeChromiumWin::adjustSliderThumbSize(RenderStyle* style) const 401 401 { 402 402 // These sizes match what WinXP draws for various menus. 403 403 const int sliderThumbAlongAxis = 11; 404 404 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)); 411 411 } else 412 RenderThemeChromiumSkia::adjustSliderThumbSize( o);412 RenderThemeChromiumSkia::adjustSliderThumbSize(style); 413 413 } 414 414 -
trunk/Source/WebCore/rendering/RenderThemeChromiumWin.h
r63589 r88405 62 62 virtual Color systemColor(int cssValueId) const; 63 63 64 virtual void adjustSliderThumbSize(Render Object*) const;64 virtual void adjustSliderThumbSize(RenderStyle*) const; 65 65 66 66 // Various paint functions. -
trunk/Source/WebCore/rendering/RenderThemeMac.h
r83397 r88405 72 72 virtual int minimumMenuListSize(RenderStyle*) const; 73 73 74 virtual void adjustSliderThumbSize(Render Object*) const;74 virtual void adjustSliderThumbSize(RenderStyle*) const; 75 75 76 76 virtual int popupInternalPaddingLeft(RenderStyle*) const; … … 171 171 virtual bool usesMediaControlStatusDisplay(); 172 172 virtual bool usesMediaControlVolumeSlider() const; 173 virtual void adjustMediaSliderThumbSize(Render Object*) const;173 virtual void adjustMediaSliderThumbSize(RenderStyle*) const; 174 174 virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const; 175 175 #endif -
trunk/Source/WebCore/rendering/RenderThemeMac.mm
r87881 r88405 1290 1290 } 1291 1291 1292 void RenderThemeMac::adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle* style, Element*) const 1293 { 1292 void RenderThemeMac::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* element) const 1293 { 1294 RenderTheme::adjustSliderThumbStyle(selector, style, element); 1294 1295 style->setBoxShadow(nullptr); 1295 1296 } … … 1644 1645 const int mediaSliderThumbHeight = 14; 1645 1646 1646 void RenderThemeMac::adjustSliderThumbSize(Render Object* o) const1647 { 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));1647 void 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)); 1652 1653 } 1653 1654 1654 1655 #if ENABLE(VIDEO) 1655 adjustMediaSliderThumbSize( o);1656 adjustMediaSliderThumbSize(style); 1656 1657 #endif 1657 1658 } … … 1659 1660 #if ENABLE(VIDEO) 1660 1661 1661 void RenderThemeMac::adjustMediaSliderThumbSize(Render Object* o) const1662 { 1663 ControlPart part = o->style()->appearance();1662 void RenderThemeMac::adjustMediaSliderThumbSize(RenderStyle* style) const 1663 { 1664 ControlPart part = style->appearance(); 1664 1665 1665 1666 if (part == MediaSliderThumbPart || part == MediaVolumeSliderThumbPart) { … … 1668 1669 1669 1670 if (mediaControllerTheme() == MediaControllerThemeQuickTime) { 1670 CGSize 1671 CGSize size; 1671 1672 1672 1673 wkMeasureMediaUIPart(part == MediaSliderThumbPart ? MediaSliderThumb : MediaVolumeSliderThumb, MediaControllerThemeQuickTime, NULL, &size); … … 1675 1676 } 1676 1677 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)); 1680 1681 } 1681 1682 } -
trunk/Source/WebCore/rendering/RenderThemeSafari.cpp
r86135 r88405 991 991 void RenderThemeSafari::adjustSliderThumbStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const 992 992 { 993 RenderTheme::adjustSliderThumbStyle(selector, style, e); 993 994 style->setBoxShadow(nullptr); 994 995 } … … 1015 1016 const int sliderThumbHeight = 15; 1016 1017 1017 void RenderThemeSafari::adjustSliderThumbSize(Render Object* o) const1018 { 1019 if ( o->style()->appearance() == SliderThumbHorizontalPart || o->style()->appearance() == SliderThumbVerticalPart) {1020 o->style()->setWidth(Length(sliderThumbWidth, Fixed));1021 o->style()->setHeight(Length(sliderThumbHeight, Fixed));1018 void 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)); 1022 1023 } 1023 1024 #if ENABLE(VIDEO) 1024 else if ( o->style()->appearance() == MediaSliderThumbPart)1025 RenderMediaControls::adjustMediaSliderThumbSize( o);1025 else if (style->appearance() == MediaSliderThumbPart) 1026 RenderMediaControls::adjustMediaSliderThumbSize(style); 1026 1027 #endif 1027 1028 } -
trunk/Source/WebCore/rendering/RenderThemeSafari.h
r62104 r88405 77 77 virtual int minimumMenuListSize(RenderStyle*) const; 78 78 79 virtual void adjustSliderThumbSize(Render Object*) const;79 virtual void adjustSliderThumbSize(RenderStyle*) const; 80 80 virtual void adjustSliderThumbStyle(CSSStyleSelector*, RenderStyle*, Element*) const; 81 81 -
trunk/Source/WebCore/rendering/RenderThemeWin.cpp
r83397 r88405 834 834 const int sliderThumbHeight = 15; 835 835 836 void RenderThemeWin::adjustSliderThumbSize(Render Object* o) const837 { 838 ControlPart part = o->style()->appearance();836 void RenderThemeWin::adjustSliderThumbSize(RenderStyle* style) const 837 { 838 ControlPart part = style->appearance(); 839 839 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)); 842 842 } 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)); 845 845 } 846 846 #if ENABLE(VIDEO) 847 847 else if (part == MediaSliderThumbPart || part == MediaVolumeSliderThumbPart) 848 RenderMediaControls::adjustMediaSliderThumbSize( o);848 RenderMediaControls::adjustMediaSliderThumbSize(style); 849 849 #endif 850 850 } -
trunk/Source/WebCore/rendering/RenderThemeWin.h
r83397 r88405 94 94 virtual bool paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r); 95 95 virtual bool paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r); 96 virtual void adjustSliderThumbSize(Render Object*) const;96 virtual void adjustSliderThumbSize(RenderStyle*) const; 97 97 98 98 virtual bool popupOptionSupportsTextIndent() const { return true; } -
trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp
r77437 r88405 332 332 const int sliderThumbHeight = 15; 333 333 334 void RenderThemeWinCE::adjustSliderThumbSize(Render Object* o) const335 { 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));334 void 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)); 342 342 } 343 343 } -
trunk/Source/WebCore/rendering/RenderThemeWinCE.h
r67788 r88405 90 90 virtual bool paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r); 91 91 virtual bool paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r); 92 virtual void adjustSliderThumbSize(Render Object*) const;92 virtual void adjustSliderThumbSize(RenderStyle*) const; 93 93 94 94 virtual bool popupOptionSupportsTextIndent() const { return true; }
Note: See TracChangeset
for help on using the changeset viewer.