commit e52495584422c5edb5b2944981473a2e208da323
author Torne (Richard Coles) <torne@google.com> Wed May 15 11:35:13 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 15 11:35:13 2013 +0100
tree 707b85435adfb2c67b9ca3d346769564c41566fd
parent 8521fccd3e39d65a1f2ac1f360f5ead86fcb7dae

Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I52995489013675af682cee321f417f624396b584

Source/core/html/shadow/DateTimeEditElement.cpp

diff --git a/Source/core/html/shadow/DateTimeEditElement.cpp b/Source/core/html/shadow/DateTimeEditElement.cpp
index 678f58e..f17244d 100644
--- a/Source/core/html/shadow/DateTimeEditElement.cpp
+++ b/Source/core/html/shadow/DateTimeEditElement.cpp
@@ -94,9 +94,7 @@
     , m_secondRange(0, 59)
     , m_millisecondRange(0, 999)
 {
-    if (m_dateValue.type() == DateComponents::Date
-        || m_dateValue.type() == DateComponents::DateTimeLocal
-        || m_dateValue.type() == DateComponents::DateTime) {
+    if (m_dateValue.type() == DateComponents::Date || m_dateValue.type() == DateComponents::DateTimeLocal) {
         if (m_parameters.minimum.type() != DateComponents::Invalid
             && m_parameters.maximum.type() != DateComponents::Invalid
             && m_parameters.minimum.fullYear() == m_parameters.maximum.fullYear()
@@ -352,7 +350,7 @@
 
     if (m_dateValue.type() == DateComponents::Time)
         return false;
-    ASSERT(m_dateValue.type() == DateComponents::DateTimeLocal || m_dateValue.type() == DateComponents::DateTime);
+    ASSERT(m_dateValue.type() == DateComponents::DateTimeLocal);
 
     if (shouldDayOfMonthFieldDisabled()) {
         ASSERT(m_parameters.minimum.fullYear() == m_parameters.maximum.fullYear());