Chromium Code Reviews| Index: Source/core/rendering/RenderThemeChromiumDefault.cpp |
| diff --git a/Source/core/rendering/RenderThemeChromiumDefault.cpp b/Source/core/rendering/RenderThemeChromiumDefault.cpp |
| index 267f189100b1f8fbe2819c3f44a947ac8774f4e2..b306f3847275cbcf25462f60d435a9648b7846b8 100644 |
| --- a/Source/core/rendering/RenderThemeChromiumDefault.cpp |
| +++ b/Source/core/rendering/RenderThemeChromiumDefault.cpp |
| @@ -26,6 +26,7 @@ |
| #include "core/rendering/RenderThemeChromiumDefault.h" |
| #include "CSSValueKeywords.h" |
| +#include "RuntimeEnabledFeatures.h" |
|
tkent
2013/05/21 21:05:44
You don't need to include this.
|
| #include "UserAgentStyleSheets.h" |
| #include "core/platform/ScrollbarTheme.h" |
| #include "core/platform/graphics/Color.h" |
| @@ -104,10 +105,12 @@ Color RenderThemeChromiumDefault::systemColor(int cssValueId) const |
| String RenderThemeChromiumDefault::extraDefaultStyleSheet() |
| { |
| #if !OS(WINDOWS) |
| - return RenderThemeChromiumSkia::extraDefaultStyleSheet() + |
| - String(themeChromiumLinuxUserAgentStyleSheet, sizeof(themeChromiumLinuxUserAgentStyleSheet)); |
| + return RenderTheme::extraDefaultStyleSheet() + |
| + RenderThemeChromiumSkia::extraDefaultStyleSheet() + |
| + String(themeChromiumLinuxUserAgentStyleSheet, sizeof(themeChromiumLinuxUserAgentStyleSheet)); |
| #else |
| - return RenderThemeChromiumSkia::extraDefaultStyleSheet(); |
| + return RenderTheme::extraDefaultStyleSheet() + |
| + RenderThemeChromiumSkia::extraDefaultStyleSheet(); |
| #endif |
| } |
| @@ -156,7 +159,6 @@ Color RenderThemeChromiumDefault::platformInactiveSelectionForegroundColor() con |
| return m_inactiveSelectionForegroundColor; |
| } |
| -#if ENABLE(DATALIST_ELEMENT) |
| IntSize RenderThemeChromiumDefault::sliderTickSize() const |
| { |
| return IntSize(1, 6); |
| @@ -166,7 +168,6 @@ int RenderThemeChromiumDefault::sliderTickOffsetFromTrackCenter() const |
| { |
| return -16; |
| } |
| -#endif |
| void RenderThemeChromiumDefault::adjustSliderThumbSize(RenderStyle* style, Element* element) const |
| { |
| @@ -337,9 +338,7 @@ bool RenderThemeChromiumDefault::paintSliderTrack(RenderObject* o, const PaintIn |
| WebKit::WebCanvas* canvas = i.context->canvas(); |
| extraParams.slider.vertical = o->style()->appearance() == SliderVerticalPart; |
| -#if ENABLE(DATALIST_ELEMENT) |
| paintSliderTicks(o, i, rect); |
| -#endif |
| float zoomLevel = o->style()->effectiveZoom(); |
| GraphicsContextStateSaver stateSaver(*i.context); |