summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsamahto@cisco.com <samahto@cisco.com>2015-03-31 15:22:27 +0000
committersamahto@cisco.com <samahto@cisco.com>2015-03-31 15:22:27 +0000
commit144a2ec198b074e01a1c5b0df8b4f93a5446519a (patch)
treee369499f107193b071be810dada91dfbe4ecfb04
parentdf588ee170bd1bc3a4cb1783eaf1cf9d09fba005 (diff)
downloadchromium_src-144a2ec198b074e01a1c5b0df8b4f93a5446519a.zip
chromium_src-144a2ec198b074e01a1c5b0df8b4f93a5446519a.tar.gz
chromium_src-144a2ec198b074e01a1c5b0df8b4f93a5446519a.tar.bz2
Input datetime fields need to check with step base value not minimum value to test disablity.
Modify shouldHourFieldDisabled,shouldMillisecondFieldDisabled,shouldMinuteFieldDisabled; shouldSecondFieldDisabled to check with step base value instead minimum value. BUG=463388 TEST=Existing test. Updated expected image. Review URL: https://codereview.chromium.org/1033223003 git-svn-id: svn://svn.chromium.org/blink/trunk@192837 bbb929c8-8fbe-4397-9dbb-9b2b20218538
-rw-r--r--third_party/WebKit/LayoutTests/TestExpectations6
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html2
-rw-r--r--third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html2
-rw-r--r--third_party/WebKit/LayoutTests/platform/linux/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.pngbin0 -> 29454 bytes
-rw-r--r--third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp8
5 files changed, 11 insertions, 7 deletions
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index b172729..639503d 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -331,7 +331,6 @@ crbug.com/318980 [ Linux ] virtual/deferred/fast/images/imagemap-focus-ring.html
crbug.com/318980 [ Linux ] virtual/deferred/fast/images/imagemap-focus-ring-zoom-style.html [ ImageOnlyFailure Pass ]
crbug.com/318980 [ Linux ] virtual/deferred/fast/images/imagemap-focus-ring-zoom.html [ ImageOnlyFailure Pass ]
-crbug.com/395877 [ Mac ] fast/forms/datetimelocal/datetimelocal-appearance-l10n.html [ NeedsManualRebaseline ]
crbug.com/395877 [ Mac ] fast/forms/month/month-appearance-l10n.html [ NeedsManualRebaseline ]
# Untriaged Linux-specific Aura failures
@@ -1925,3 +1924,8 @@ crbug.com/471381 inspector-protocol/debugger/suspend-setTimeout-on-pause-in-dedi
crbug.com/471678 [ Release ] http/tests/inspector/elements/styles/selector-line.html [ Failure Pass ]
crbug.com/471984 [ Win ] http/tests/cachestorage/worker/cache-delete.html [ Failure Pass ]
+
+# These need a rebaseline after crbug.com/463388
+crbug.com/463388 fast/forms/datetimelocal/datetimelocal-appearance-basic.html [ NeedsRebaseline ]
+crbug.com/463388 fast/forms/datetimelocal/datetimelocal-appearance-l10n.html [ NeedsRebaseline ]
+crbug.com/463388 fast/forms/time/time-appearance-basic.html [ NeedsRebaseline ]
diff --git a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html
index 9df7016..8add68e 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html
@@ -4,7 +4,7 @@
<script src="../../../resources/js-test.js"></script>
</head>
<body>
-<input id="test" type="datetime-local" value="2012-10-09T12:34:56.789">
+<input id="test" type="datetime-local" step="0.001" value="2012-10-09T12:34:56.789">
<script>
description('This test checks aria-help attribute of fields in multiple fields datetime-local input UI.');
diff --git a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html
index a5d9d74..629842a 100644
--- a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html
+++ b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html
@@ -5,7 +5,7 @@
<script src="../resources/multiple-fields-ax-aria-attributes.js"></script>
</head>
<body>
-<input id=test type="time" value="12:34:56.789">
+<input id=test type="time" step="0.001" value="12:34:56.789">
<script>
description('This test checks aria-help attribute of fields in multiple fields time input UI.');
diff --git a/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.png b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.png
new file mode 100644
index 0000000..ca38d48
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/platform/linux/fast/forms/datetimelocal/datetimelocal-appearance-l10n-expected.png
Binary files differ
diff --git a/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp b/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp
index 228d55c..d4b80b9 100644
--- a/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/DateTimeEditElement.cpp
@@ -357,7 +357,7 @@ bool DateTimeEditBuilder::shouldHourFieldDisabled() const
}
const Decimal decimalMsPerDay(static_cast<int>(msPerDay));
- Decimal hourPartOfMinimum = (stepRange().minimum().abs().remainder(decimalMsPerDay) / static_cast<int>(msPerHour)).floor();
+ Decimal hourPartOfMinimum = (stepRange().stepBase().abs().remainder(decimalMsPerDay) / static_cast<int>(msPerHour)).floor();
return hourPartOfMinimum == m_dateValue.hour() && stepRange().step().remainder(decimalMsPerDay).isZero();
}
@@ -367,7 +367,7 @@ bool DateTimeEditBuilder::shouldMillisecondFieldDisabled() const
return true;
const Decimal decimalMsPerSecond(static_cast<int>(msPerSecond));
- return stepRange().minimum().abs().remainder(decimalMsPerSecond) == m_dateValue.millisecond() && stepRange().step().remainder(decimalMsPerSecond).isZero();
+ return stepRange().stepBase().abs().remainder(decimalMsPerSecond) == m_dateValue.millisecond() && stepRange().step().remainder(decimalMsPerSecond).isZero();
}
bool DateTimeEditBuilder::shouldMinuteFieldDisabled() const
@@ -376,7 +376,7 @@ bool DateTimeEditBuilder::shouldMinuteFieldDisabled() const
return true;
const Decimal decimalMsPerHour(static_cast<int>(msPerHour));
- Decimal minutePartOfMinimum = (stepRange().minimum().abs().remainder(decimalMsPerHour) / static_cast<int>(msPerMinute)).floor();
+ Decimal minutePartOfMinimum = (stepRange().stepBase().abs().remainder(decimalMsPerHour) / static_cast<int>(msPerMinute)).floor();
return minutePartOfMinimum == m_dateValue.minute() && stepRange().step().remainder(decimalMsPerHour).isZero();
}
@@ -386,7 +386,7 @@ bool DateTimeEditBuilder::shouldSecondFieldDisabled() const
return true;
const Decimal decimalMsPerMinute(static_cast<int>(msPerMinute));
- Decimal secondPartOfMinimum = (stepRange().minimum().abs().remainder(decimalMsPerMinute) / static_cast<int>(msPerSecond)).floor();
+ Decimal secondPartOfMinimum = (stepRange().stepBase().abs().remainder(decimalMsPerMinute) / static_cast<int>(msPerSecond)).floor();
return secondPartOfMinimum == m_dateValue.second() && stepRange().step().remainder(decimalMsPerMinute).isZero();
}