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

Side by Side Diff: third_party/WebKit/Source/core/html/shadow/DateTimeFieldElements.cpp

Issue 2259173002: Fix style errors in core/html/shadow/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } 152 }
153 // ---------------------------- 153 // ----------------------------
154 154
155 DateTimeHour11FieldElement::DateTimeHour11FieldElement(Document& document, Field Owner& fieldOwner, const Range& range, const Step& step) 155 DateTimeHour11FieldElement::DateTimeHour11FieldElement(Document& document, Field Owner& fieldOwner, const Range& range, const Step& step)
156 : DateTimeHourFieldElementBase(document, fieldOwner, range, Range(0, 11), st ep) 156 : DateTimeHourFieldElementBase(document, fieldOwner, range, Range(0, 11), st ep)
157 { 157 {
158 } 158 }
159 159
160 DateTimeHour11FieldElement* DateTimeHour11FieldElement::create(Document& documen t, FieldOwner& fieldOwner, const Range& hour23Range, const Step& step) 160 DateTimeHour11FieldElement* DateTimeHour11FieldElement::create(Document& documen t, FieldOwner& fieldOwner, const Range& hour23Range, const Step& step)
161 { 161 {
162 ASSERT(hour23Range.minimum >= 0); 162 DCHECK_GE(hour23Range.minimum, 0);
163 ASSERT(hour23Range.maximum <= 23); 163 DCHECK_LE(hour23Range.maximum, 23);
164 ASSERT(hour23Range.minimum <= hour23Range.maximum); 164 DCHECK_LE(hour23Range.minimum, hour23Range.maximum);
165 Range range(0, 11); 165 Range range(0, 11);
166 if (hour23Range.maximum < 12) 166 if (hour23Range.maximum < 12) {
167 range = hour23Range; 167 range = hour23Range;
168 else if (hour23Range.minimum >= 12) { 168 } else if (hour23Range.minimum >= 12) {
169 range.minimum = hour23Range.minimum - 12; 169 range.minimum = hour23Range.minimum - 12;
170 range.maximum = hour23Range.maximum - 12; 170 range.maximum = hour23Range.maximum - 12;
171 } 171 }
172 172
173 DateTimeHour11FieldElement* field = new DateTimeHour11FieldElement(document, fieldOwner, range, step); 173 DateTimeHour11FieldElement* field = new DateTimeHour11FieldElement(document, fieldOwner, range, step);
174 field->initialize(); 174 field->initialize();
175 return field; 175 return field;
176 } 176 }
177 177
178 void DateTimeHour11FieldElement::populateDateTimeFieldsState(DateTimeFieldsState & dateTimeFieldsState) 178 void DateTimeHour11FieldElement::populateDateTimeFieldsState(DateTimeFieldsState & dateTimeFieldsState)
(...skipping 14 matching lines...) Expand all
193 193
194 // ---------------------------- 194 // ----------------------------
195 195
196 DateTimeHour12FieldElement::DateTimeHour12FieldElement(Document& document, Field Owner& fieldOwner, const Range& range, const Step& step) 196 DateTimeHour12FieldElement::DateTimeHour12FieldElement(Document& document, Field Owner& fieldOwner, const Range& range, const Step& step)
197 : DateTimeHourFieldElementBase(document, fieldOwner, range, Range(1, 12), st ep) 197 : DateTimeHourFieldElementBase(document, fieldOwner, range, Range(1, 12), st ep)
198 { 198 {
199 } 199 }
200 200
201 DateTimeHour12FieldElement* DateTimeHour12FieldElement::create(Document& documen t, FieldOwner& fieldOwner, const Range& hour23Range, const Step& step) 201 DateTimeHour12FieldElement* DateTimeHour12FieldElement::create(Document& documen t, FieldOwner& fieldOwner, const Range& hour23Range, const Step& step)
202 { 202 {
203 ASSERT(hour23Range.minimum >= 0); 203 DCHECK_GE(hour23Range.minimum, 0);
204 ASSERT(hour23Range.maximum <= 23); 204 DCHECK_LE(hour23Range.maximum, 23);
205 ASSERT(hour23Range.minimum <= hour23Range.maximum); 205 DCHECK_LE(hour23Range.minimum, hour23Range.maximum);
206 Range range(1, 12); 206 Range range(1, 12);
207 if (hour23Range.maximum < 12) 207 if (hour23Range.maximum < 12) {
208 range = hour23Range; 208 range = hour23Range;
209 else if (hour23Range.minimum >= 12) { 209 } else if (hour23Range.minimum >= 12) {
210 range.minimum = hour23Range.minimum - 12; 210 range.minimum = hour23Range.minimum - 12;
211 range.maximum = hour23Range.maximum - 12; 211 range.maximum = hour23Range.maximum - 12;
212 } 212 }
213 if (!range.minimum) 213 if (!range.minimum)
214 range.minimum = 12; 214 range.minimum = 12;
215 if (!range.maximum) 215 if (!range.maximum)
216 range.maximum = 12; 216 range.maximum = 12;
217 if (range.minimum > range.maximum) { 217 if (range.minimum > range.maximum) {
218 range.minimum = 1; 218 range.minimum = 1;
219 range.maximum = 12; 219 range.maximum = 12;
(...skipping 16 matching lines...) Expand all
236 236
237 // ---------------------------- 237 // ----------------------------
238 238
239 DateTimeHour23FieldElement::DateTimeHour23FieldElement(Document& document, Field Owner& fieldOwner, const Range& range, const Step& step) 239 DateTimeHour23FieldElement::DateTimeHour23FieldElement(Document& document, Field Owner& fieldOwner, const Range& range, const Step& step)
240 : DateTimeHourFieldElementBase(document, fieldOwner, range, Range(0, 23), st ep) 240 : DateTimeHourFieldElementBase(document, fieldOwner, range, Range(0, 23), st ep)
241 { 241 {
242 } 242 }
243 243
244 DateTimeHour23FieldElement* DateTimeHour23FieldElement::create(Document& documen t, FieldOwner& fieldOwner, const Range& hour23Range, const Step& step) 244 DateTimeHour23FieldElement* DateTimeHour23FieldElement::create(Document& documen t, FieldOwner& fieldOwner, const Range& hour23Range, const Step& step)
245 { 245 {
246 ASSERT(hour23Range.minimum >= 0); 246 DCHECK_GE(hour23Range.minimum, 0);
247 ASSERT(hour23Range.maximum <= 23); 247 DCHECK_LE(hour23Range.maximum, 23);
248 ASSERT(hour23Range.minimum <= hour23Range.maximum); 248 DCHECK_LE(hour23Range.minimum, hour23Range.maximum);
249 DateTimeHour23FieldElement* field = new DateTimeHour23FieldElement(document, fieldOwner, hour23Range, step); 249 DateTimeHour23FieldElement* field = new DateTimeHour23FieldElement(document, fieldOwner, hour23Range, step);
250 field->initialize(); 250 field->initialize();
251 return field; 251 return field;
252 } 252 }
253 253
254 void DateTimeHour23FieldElement::populateDateTimeFieldsState(DateTimeFieldsState & dateTimeFieldsState) 254 void DateTimeHour23FieldElement::populateDateTimeFieldsState(DateTimeFieldsState & dateTimeFieldsState)
255 { 255 {
256 if (!hasValue()) { 256 if (!hasValue()) {
257 dateTimeFieldsState.setHour(DateTimeFieldsState::emptyValue); 257 dateTimeFieldsState.setHour(DateTimeFieldsState::emptyValue);
258 return; 258 return;
(...skipping 13 matching lines...) Expand all
272 272
273 // ---------------------------- 273 // ----------------------------
274 274
275 DateTimeHour24FieldElement::DateTimeHour24FieldElement(Document& document, Field Owner& fieldOwner, const Range& range, const Step& step) 275 DateTimeHour24FieldElement::DateTimeHour24FieldElement(Document& document, Field Owner& fieldOwner, const Range& range, const Step& step)
276 : DateTimeHourFieldElementBase(document, fieldOwner, range, Range(1, 24), st ep) 276 : DateTimeHourFieldElementBase(document, fieldOwner, range, Range(1, 24), st ep)
277 { 277 {
278 } 278 }
279 279
280 DateTimeHour24FieldElement* DateTimeHour24FieldElement::create(Document& documen t, FieldOwner& fieldOwner, const Range& hour23Range, const Step& step) 280 DateTimeHour24FieldElement* DateTimeHour24FieldElement::create(Document& documen t, FieldOwner& fieldOwner, const Range& hour23Range, const Step& step)
281 { 281 {
282 ASSERT(hour23Range.minimum >= 0); 282 DCHECK_GE(hour23Range.minimum, 0);
283 ASSERT(hour23Range.maximum <= 23); 283 DCHECK_LE(hour23Range.maximum, 23);
284 ASSERT(hour23Range.minimum <= hour23Range.maximum); 284 DCHECK_LE(hour23Range.minimum, hour23Range.maximum);
285 Range range(hour23Range.minimum ? hour23Range.minimum : 24, hour23Range.maxi mum ? hour23Range.maximum : 24); 285 Range range(hour23Range.minimum ? hour23Range.minimum : 24, hour23Range.maxi mum ? hour23Range.maximum : 24);
286 if (range.minimum > range.maximum) { 286 if (range.minimum > range.maximum) {
287 range.minimum = 1; 287 range.minimum = 1;
288 range.maximum = 24; 288 range.maximum = 24;
289 } 289 }
290 290
291 DateTimeHour24FieldElement* field = new DateTimeHour24FieldElement(document, fieldOwner, range, step); 291 DateTimeHour24FieldElement* field = new DateTimeHour24FieldElement(document, fieldOwner, range, step);
292 field->initialize(); 292 field->initialize();
293 return field; 293 return field;
294 } 294 }
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 DEFINE_STATIC_LOCAL(AtomicString, monthPseudoId, ("-webkit-datetime-edit-mon th-field")); 493 DEFINE_STATIC_LOCAL(AtomicString, monthPseudoId, ("-webkit-datetime-edit-mon th-field"));
494 DateTimeSymbolicMonthFieldElement* field = new DateTimeSymbolicMonthFieldEle ment(document, fieldOwner, labels, minimum, maximum); 494 DateTimeSymbolicMonthFieldElement* field = new DateTimeSymbolicMonthFieldEle ment(document, fieldOwner, labels, minimum, maximum);
495 field->initialize(monthPseudoId, queryString(WebLocalizedString::AXMonthFiel dText)); 495 field->initialize(monthPseudoId, queryString(WebLocalizedString::AXMonthFiel dText));
496 return field; 496 return field;
497 } 497 }
498 498
499 void DateTimeSymbolicMonthFieldElement::populateDateTimeFieldsState(DateTimeFiel dsState& dateTimeFieldsState) 499 void DateTimeSymbolicMonthFieldElement::populateDateTimeFieldsState(DateTimeFiel dsState& dateTimeFieldsState)
500 { 500 {
501 if (!hasValue()) 501 if (!hasValue())
502 dateTimeFieldsState.setMonth(DateTimeFieldsState::emptyValue); 502 dateTimeFieldsState.setMonth(DateTimeFieldsState::emptyValue);
503 ASSERT(valueAsInteger() < static_cast<int>(symbolsSize())); 503 DCHECK_LT(valueAsInteger(), static_cast<int>(symbolsSize()));
504 dateTimeFieldsState.setMonth(valueAsInteger() + 1); 504 dateTimeFieldsState.setMonth(valueAsInteger() + 1);
505 } 505 }
506 506
507 void DateTimeSymbolicMonthFieldElement::setValueAsDate(const DateComponents& dat e) 507 void DateTimeSymbolicMonthFieldElement::setValueAsDate(const DateComponents& dat e)
508 { 508 {
509 setValueAsInteger(date.month()); 509 setValueAsInteger(date.month());
510 } 510 }
511 511
512 void DateTimeSymbolicMonthFieldElement::setValueAsDateTimeFieldsState(const Date TimeFieldsState& dateTimeFieldsState) 512 void DateTimeSymbolicMonthFieldElement::setValueAsDateTimeFieldsState(const Date TimeFieldsState& dateTimeFieldsState)
513 { 513 {
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 setEmptyValue(); 566 setEmptyValue();
567 } 567 }
568 568
569 // ---------------------------- 569 // ----------------------------
570 570
571 DateTimeYearFieldElement::DateTimeYearFieldElement(Document& document, FieldOwne r& fieldOwner, const DateTimeYearFieldElement::Parameters& parameters) 571 DateTimeYearFieldElement::DateTimeYearFieldElement(Document& document, FieldOwne r& fieldOwner, const DateTimeYearFieldElement::Parameters& parameters)
572 : DateTimeNumericFieldElement(document, fieldOwner, Range(parameters.minimum Year, parameters.maximumYear), Range(DateComponents::minimumYear(), DateComponen ts::maximumYear()), parameters.placeholder.isEmpty() ? "----" : parameters.place holder) 572 : DateTimeNumericFieldElement(document, fieldOwner, Range(parameters.minimum Year, parameters.maximumYear), Range(DateComponents::minimumYear(), DateComponen ts::maximumYear()), parameters.placeholder.isEmpty() ? "----" : parameters.place holder)
573 , m_minIsSpecified(parameters.minIsSpecified) 573 , m_minIsSpecified(parameters.minIsSpecified)
574 , m_maxIsSpecified(parameters.maxIsSpecified) 574 , m_maxIsSpecified(parameters.maxIsSpecified)
575 { 575 {
576 ASSERT(parameters.minimumYear >= DateComponents::minimumYear()); 576 DCHECK_GE(parameters.minimumYear, DateComponents::minimumYear());
577 ASSERT(parameters.maximumYear <= DateComponents::maximumYear()); 577 DCHECK_LE(parameters.maximumYear, DateComponents::maximumYear());
578 } 578 }
579 579
580 DateTimeYearFieldElement* DateTimeYearFieldElement::create(Document& document, F ieldOwner& fieldOwner, const DateTimeYearFieldElement::Parameters& parameters) 580 DateTimeYearFieldElement* DateTimeYearFieldElement::create(Document& document, F ieldOwner& fieldOwner, const DateTimeYearFieldElement::Parameters& parameters)
581 { 581 {
582 DEFINE_STATIC_LOCAL(AtomicString, yearPseudoId, ("-webkit-datetime-edit-year -field")); 582 DEFINE_STATIC_LOCAL(AtomicString, yearPseudoId, ("-webkit-datetime-edit-year -field"));
583 DateTimeYearFieldElement* field = new DateTimeYearFieldElement(document, fie ldOwner, parameters); 583 DateTimeYearFieldElement* field = new DateTimeYearFieldElement(document, fie ldOwner, parameters);
584 field->initialize(yearPseudoId, queryString(WebLocalizedString::AXYearFieldT ext)); 584 field->initialize(yearPseudoId, queryString(WebLocalizedString::AXYearFieldT ext));
585 return field; 585 return field;
586 } 586 }
587 587
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 const unsigned value = dateTimeFieldsState.year(); 622 const unsigned value = dateTimeFieldsState.year();
623 if (range().isInRange(static_cast<int>(value))) { 623 if (range().isInRange(static_cast<int>(value))) {
624 setValueAsInteger(value); 624 setValueAsInteger(value);
625 return; 625 return;
626 } 626 }
627 627
628 setEmptyValue(); 628 setEmptyValue();
629 } 629 }
630 630
631 } // namespace blink 631 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698