Source/core/html/forms/DateInputType.cpp - Issue 83413002: Derive the step base for an input element as (now) specified.

Side by Side Diff: Source/core/html/forms/DateInputType.cpp

Issue 83413002: Derive the step base for an input element as (now) specified. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Perform step base derivation via InputType::findStepBase() instead Created 7 years 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 unified diff | Download patch

« no previous file with comments | « LayoutTests/fast/forms/suggestion-picker/week-suggestion-picker-step-attribute.html ('k') | Source/core/html/forms/DateTimeLocalInputType.cpp » ('j') | Source/core/html/forms/InputType.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2010 Google Inc. All rights reserved.	2 * Copyright (C) 2010 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
70	70

71 DateComponents::Type DateInputType::dateType() const	71 DateComponents::Type DateInputType::dateType() const

72 {	72 {

73 return DateComponents::Date;	73 return DateComponents::Date;

74 }	74 }

75	75

76 StepRange DateInputType::createStepRange(AnyStepHandling anyStepHandling) const	76 StepRange DateInputType::createStepRange(AnyStepHandling anyStepHandling) const

77 {	77 {

78 DEFINE_STATIC_LOCAL(const StepRange::StepDescription, stepDescription, (date DefaultStep, dateDefaultStepBase, dateStepScaleFactor, StepRange::ParsedStepValu eShouldBeInteger));	78 DEFINE_STATIC_LOCAL(const StepRange::StepDescription, stepDescription, (date DefaultStep, dateDefaultStepBase, dateStepScaleFactor, StepRange::ParsedStepValu eShouldBeInteger));

79	79

80 const Decimal stepBase = parseToNumber(element().fastGetAttribute(minAttr), 0);	80 const Decimal stepBase = findStepBase(0);

81 const Decimal minimum = parseToNumber(element().fastGetAttribute(minAttr), D ecimal::fromDouble(DateComponents::minimumDate()));	81 const Decimal minimum = parseToNumber(element().fastGetAttribute(minAttr), D ecimal::fromDouble(DateComponents::minimumDate()));

82 const Decimal maximum = parseToNumber(element().fastGetAttribute(maxAttr), D ecimal::fromDouble(DateComponents::maximumDate()));	82 const Decimal maximum = parseToNumber(element().fastGetAttribute(maxAttr), D ecimal::fromDouble(DateComponents::maximumDate()));

83 const Decimal step = StepRange::parseStep(anyStepHandling, stepDescription, element().fastGetAttribute(stepAttr));	83 const Decimal step = StepRange::parseStep(anyStepHandling, stepDescription, element().fastGetAttribute(stepAttr));

84 return StepRange(stepBase, minimum, maximum, step, stepDescription);	84 return StepRange(stepBase, minimum, maximum, step, stepDescription);

85 }	85 }

86	86

87 bool DateInputType::parseToDateComponentsInternal(const String& string, DateComp onents* out) const	87 bool DateInputType::parseToDateComponentsInternal(const String& string, DateComp onents* out) const

88 {	88 {

89 ASSERT(out);	89 ASSERT(out);

90 unsigned end;	90 unsigned end;

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124 layoutParameters.placeholderForYear = locale().queryString(WebLocalizedStrin g::PlaceholderForYearField);	124 layoutParameters.placeholderForYear = locale().queryString(WebLocalizedStrin g::PlaceholderForYearField);

125 }	125 }

126	126

127 bool DateInputType::isValidFormat(bool hasYear, bool hasMonth, bool hasWeek, boo l hasDay, bool hasAMPM, bool hasHour, bool hasMinute, bool hasSecond) const	127 bool DateInputType::isValidFormat(bool hasYear, bool hasMonth, bool hasWeek, boo l hasDay, bool hasAMPM, bool hasHour, bool hasMinute, bool hasSecond) const

128 {	128 {

129 return hasYear && hasMonth && hasDay;	129 return hasYear && hasMonth && hasDay;

130 }	130 }

131 #endif	131 #endif

132	132

133 } // namespace WebCore	133 } // namespace WebCore

OLD	NEW