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

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: Add <datalist> display:none rule in RenderTheme::extraDefaultStyleSheet depending on the runtime fl… 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
Index: Source/core/rendering/RenderThemeChromiumDefault.cpp
diff --git a/Source/core/rendering/RenderThemeChromiumDefault.cpp b/Source/core/rendering/RenderThemeChromiumDefault.cpp
index 267f189100b1f8fbe2819c3f44a947ac8774f4e2..17da6851e6de9e3102064d44d07aed9ef743d92b 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"
#include "UserAgentStyleSheets.h"
#include "core/platform/ScrollbarTheme.h"
#include "core/platform/graphics/Color.h"
@@ -103,11 +104,15 @@ Color RenderThemeChromiumDefault::systemColor(int cssValueId) const
String RenderThemeChromiumDefault::extraDefaultStyleSheet()
{
+ static String datalistCss = (RuntimeEnabledFeatures::datalistEnabled()) ?
tkent 2013/05/20 21:32:11 RenderThemeChromiumDefault is used only in Chromiu
+ "datalist {display: none ;}" : "";
#if !OS(WINDOWS)
return RenderThemeChromiumSkia::extraDefaultStyleSheet() +
- String(themeChromiumLinuxUserAgentStyleSheet, sizeof(themeChromiumLinuxUserAgentStyleSheet));
+ String(themeChromiumLinuxUserAgentStyleSheet, sizeof(themeChromiumLinuxUserAgentStyleSheet)) +
+ datalistCss;
#else
- return RenderThemeChromiumSkia::extraDefaultStyleSheet();
+ return RenderThemeChromiumSkia::extraDefaultStyleSheet() +
+ datalistCss;
#endif
}
@@ -156,7 +161,6 @@ Color RenderThemeChromiumDefault::platformInactiveSelectionForegroundColor() con
return m_inactiveSelectionForegroundColor;
}
-#if ENABLE(DATALIST_ELEMENT)
IntSize RenderThemeChromiumDefault::sliderTickSize() const
{
return IntSize(1, 6);
@@ -166,7 +170,6 @@ int RenderThemeChromiumDefault::sliderTickOffsetFromTrackCenter() const
{
return -16;
}
-#endif
void RenderThemeChromiumDefault::adjustSliderThumbSize(RenderStyle* style, Element* element) const
{
@@ -337,9 +340,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);

Powered by Google App Engine
This is Rietveld 408576698