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

Side by Side Diff: Source/WebCore/html/BaseMultipleFieldsDateAndTimeInputType.cpp

Issue 11420033: Merge 134390 - Unable to set valid time value to input[type=time] with user interaction in some cas… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month 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 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 { 389 {
390 DateComponents date; 390 DateComponents date;
391 if (!parseToDateComponents(source, &date)) 391 if (!parseToDateComponents(source, &date))
392 return DateTimeEditElement::LayoutParameters::undefinedYear(); 392 return DateTimeEditElement::LayoutParameters::undefinedYear();
393 return date.fullYear(); 393 return date.fullYear();
394 } 394 }
395 395
396 bool BaseMultipleFieldsDateAndTimeInputType::shouldHaveSecondField(const DateCom ponents& date) const 396 bool BaseMultipleFieldsDateAndTimeInputType::shouldHaveSecondField(const DateCom ponents& date) const
397 { 397 {
398 StepRange stepRange = createStepRange(AnyIsDefaultStep); 398 StepRange stepRange = createStepRange(AnyIsDefaultStep);
399 return date.second() 399 return date.second() || date.millisecond()
400 || !stepRange.minimum().remainder(static_cast<int>(msPerMinute)).isZero( ) 400 || !stepRange.minimum().remainder(static_cast<int>(msPerMinute)).isZero( )
401 || !stepRange.step().remainder(static_cast<int>(msPerMinute)).isZero(); 401 || !stepRange.step().remainder(static_cast<int>(msPerMinute)).isZero();
402 } 402 }
403 403
404 } // namespace WebCore 404 } // namespace WebCore
405 405
406 #endif 406 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698