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

Unified Diff: Source/core/html/shadow/SliderThumbElement.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/html/RangeInputType.cpp ('k') | Source/core/page/RuntimeEnabledFeatures.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/shadow/SliderThumbElement.cpp
diff --git a/Source/core/html/shadow/SliderThumbElement.cpp b/Source/core/html/shadow/SliderThumbElement.cpp
index 2b0cf5f2ce916484ec52884e5811bd95b851c7c5..4399621c797a411a962a74e916ac33b17f50d761 100644
--- a/Source/core/html/shadow/SliderThumbElement.cpp
+++ b/Source/core/html/shadow/SliderThumbElement.cpp
@@ -140,7 +140,6 @@ void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou
HTMLInputElement* input = node()->shadowHost()->toInputElement();
bool isVertical = hasVerticalAppearance(input);
-#if ENABLE(DATALIST_ELEMENT)
if (input->renderer()->isSlider() && !isVertical && input->list()) {
int offsetFromCenter = theme()->sliderTickOffsetFromTrackCenter();
LayoutUnit trackHeight = 0;
@@ -157,7 +156,6 @@ void RenderSliderContainer::computeLogicalHeight(LayoutUnit logicalHeight, Layou
RenderBox::computeLogicalHeight(trackHeight, logicalTop, computedValues);
return;
}
-#endif
if (isVertical)
logicalHeight = RenderSlider::defaultTrackLength;
RenderBox::computeLogicalHeight(logicalHeight, logicalTop, computedValues);
@@ -294,7 +292,6 @@ void SliderThumbElement::setPositionFromPoint(const LayoutPoint& point)
StepRange stepRange(input->createStepRange(RejectAny));
Decimal value = stepRange.clampValue(stepRange.valueFromProportion(fraction));
-#if ENABLE(DATALIST_ELEMENT)
const LayoutUnit snappingThreshold = renderer()->theme()->sliderTickSnappingThreshold();
if (snappingThreshold > 0) {
Decimal closest = input->findClosestTickMarkValue(value);
@@ -306,7 +303,6 @@ void SliderThumbElement::setPositionFromPoint(const LayoutPoint& point)
value = closest;
}
}
-#endif
String valueString = serializeForNumberType(value);
if (valueString == input->value())
« no previous file with comments | « Source/core/html/RangeInputType.cpp ('k') | Source/core/page/RuntimeEnabledFeatures.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698