Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Unified Diff: Source/core/rendering/RenderThemeChromiumDefault.cpp

Issue 14859003: Remove the compile time flag for DATALIST Element. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebasing after r150849 Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumDefault.h ('k') | Source/core/rendering/RenderThemeChromiumMac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderThemeChromiumDefault.cpp
diff --git a/Source/core/rendering/RenderThemeChromiumDefault.cpp b/Source/core/rendering/RenderThemeChromiumDefault.cpp
index 267f189100b1f8fbe2819c3f44a947ac8774f4e2..8ed6f663a20ee39b6d22aba44a3850086c1a9cfd 100644
--- a/Source/core/rendering/RenderThemeChromiumDefault.cpp
+++ b/Source/core/rendering/RenderThemeChromiumDefault.cpp
@@ -104,10 +104,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 +158,6 @@ Color RenderThemeChromiumDefault::platformInactiveSelectionForegroundColor() con
return m_inactiveSelectionForegroundColor;
}
-#if ENABLE(DATALIST_ELEMENT)
IntSize RenderThemeChromiumDefault::sliderTickSize() const
{
return IntSize(1, 6);
@@ -166,7 +167,6 @@ int RenderThemeChromiumDefault::sliderTickOffsetFromTrackCenter() const
{
return -16;
}
-#endif
void RenderThemeChromiumDefault::adjustSliderThumbSize(RenderStyle* style, Element* element) const
{
@@ -337,9 +337,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);
« no previous file with comments | « Source/core/rendering/RenderThemeChromiumDefault.h ('k') | Source/core/rendering/RenderThemeChromiumMac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698