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

Side by Side Diff: Source/core/html/forms/WeekInputType.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
OLDNEW
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 DateComponents::Type WeekInputType::dateType() const 66 DateComponents::Type WeekInputType::dateType() const
67 { 67 {
68 return DateComponents::Week; 68 return DateComponents::Week;
69 } 69 }
70 70
71 StepRange WeekInputType::createStepRange(AnyStepHandling anyStepHandling) const 71 StepRange WeekInputType::createStepRange(AnyStepHandling anyStepHandling) const
72 { 72 {
73 DEFINE_STATIC_LOCAL(const StepRange::StepDescription, stepDescription, (week DefaultStep, weekDefaultStepBase, weekStepScaleFactor, StepRange::ParsedStepValu eShouldBeInteger)); 73 DEFINE_STATIC_LOCAL(const StepRange::StepDescription, stepDescription, (week DefaultStep, weekDefaultStepBase, weekStepScaleFactor, StepRange::ParsedStepValu eShouldBeInteger));
74 74
75 const Decimal stepBase = parseToNumber(element().fastGetAttribute(minAttr), weekDefaultStepBase); 75 const Decimal stepBase = findStepBase(weekDefaultStepBase);
76 const Decimal minimum = parseToNumber(element().fastGetAttribute(minAttr), D ecimal::fromDouble(DateComponents::minimumWeek())); 76 const Decimal minimum = parseToNumber(element().fastGetAttribute(minAttr), D ecimal::fromDouble(DateComponents::minimumWeek()));
77 const Decimal maximum = parseToNumber(element().fastGetAttribute(maxAttr), D ecimal::fromDouble(DateComponents::maximumWeek())); 77 const Decimal maximum = parseToNumber(element().fastGetAttribute(maxAttr), D ecimal::fromDouble(DateComponents::maximumWeek()));
78 const Decimal step = StepRange::parseStep(anyStepHandling, stepDescription, element().fastGetAttribute(stepAttr)); 78 const Decimal step = StepRange::parseStep(anyStepHandling, stepDescription, element().fastGetAttribute(stepAttr));
79 return StepRange(stepBase, minimum, maximum, step, stepDescription); 79 return StepRange(stepBase, minimum, maximum, step, stepDescription);
80 } 80 }
81 81
82 bool WeekInputType::parseToDateComponentsInternal(const String& string, DateComp onents* out) const 82 bool WeekInputType::parseToDateComponentsInternal(const String& string, DateComp onents* out) const
83 { 83 {
84 ASSERT(out); 84 ASSERT(out);
85 unsigned end; 85 unsigned end;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 layoutParameters.placeholderForYear = "----"; 117 layoutParameters.placeholderForYear = "----";
118 } 118 }
119 119
120 bool WeekInputType::isValidFormat(bool hasYear, bool hasMonth, bool hasWeek, boo l hasDay, bool hasAMPM, bool hasHour, bool hasMinute, bool hasSecond) const 120 bool WeekInputType::isValidFormat(bool hasYear, bool hasMonth, bool hasWeek, boo l hasDay, bool hasAMPM, bool hasHour, bool hasMinute, bool hasSecond) const
121 { 121 {
122 return hasYear && hasWeek; 122 return hasYear && hasWeek;
123 } 123 }
124 #endif 124 #endif
125 125
126 } // namespace WebCore 126 } // namespace WebCore
OLDNEW
« Source/core/html/forms/InputType.cpp ('K') | « Source/core/html/forms/TimeInputType.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698