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

Unified Diff: third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html

Issue 2806743003: Image Capture: split {white_balance,exposure,focus}_modes into current_ and supported_ (Closed)
Patch Set: reillyg@ comment and fix in v4l2_capture_delegate.cc Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html
diff --git a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html
index 08d4dadd4e2a8a6876d5afd4de1150130b2771c9..490d355004eb4ff08e44bf02e87ee15dddca6536 100644
--- a/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html
+++ b/third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getCapabilities.html
@@ -40,17 +40,36 @@ async_test(function(t) {
capabilities = videoTrack.getCapabilities();
assert_equals(typeof capabilities, 'object');
- // TODO(mcasas): Change the following checks when the supported modes
- // are changed to a list: https://crbug.com/700607.
- assert_equals(capabilities.focusMode[0],
- meteringModeNames[mock_capabilities.focus_mode], 'focusMode');
-
- assert_equals(capabilities.exposureMode[0],
- meteringModeNames[mock_capabilities.exposure_mode], 'exposureMode;');
-
- assert_equals(capabilities.whiteBalanceMode[0],
- meteringModeNames[mock_capabilities.white_balance_mode],
- 'whiteBalanceMode');
+ assert_equals(capabilities.whiteBalanceMode.length,
+ mock_capabilities.supported_white_balance_modes.length,
+ 'whiteBalanceMode');
+ for (i = 0; i < capabilities.whiteBalanceMode.length; ++i) {
+ assert_equals(
+ capabilities.whiteBalanceMode[i],
+ meteringModeNames[mock_capabilities
+ .supported_white_balance_modes[i]],
+ 'whiteBalanceMode');
+ }
+
+ assert_equals(capabilities.exposureMode.length,
+ mock_capabilities.supported_exposure_modes.length,
+ 'exposureMode');
+ for (i = 0; i < capabilities.exposureMode.length; ++i) {
+ assert_equals(
+ capabilities.exposureMode[i],
+ meteringModeNames[mock_capabilities.supported_exposure_modes[i]],
+ 'exposureMode');
+ }
+
+ assert_equals(capabilities.focusMode.length,
+ mock_capabilities.supported_focus_modes.length,
+ 'focusMode');
+ for (i = 0; i < capabilities.focusMode.length; ++i) {
+ assert_equals(
+ capabilities.focusMode[i],
+ meteringModeNames[mock_capabilities.supported_focus_modes[i]],
+ 'focusMode');
+ }
assert_true(capabilities.exposureCompensation instanceof
MediaSettingsRange);
@@ -61,7 +80,8 @@ async_test(function(t) {
assert_equals(capabilities.exposureCompensation.step,
mock_capabilities.exposure_compensation.step);
- assert_true(capabilities.colorTemperature instanceof MediaSettingsRange);
+ assert_true(capabilities.colorTemperature instanceof
+ MediaSettingsRange);
assert_equals(capabilities.colorTemperature.max,
mock_capabilities.color_temperature.max);
assert_equals(capabilities.colorTemperature.min,
@@ -83,8 +103,10 @@ async_test(function(t) {
mock_capabilities.brightness.step);
assert_true(capabilities.contrast instanceof MediaSettingsRange);
- assert_equals(capabilities.contrast.max, mock_capabilities.contrast.max);
- assert_equals(capabilities.contrast.min, mock_capabilities.contrast.min);
+ assert_equals(capabilities.contrast.max,
+ mock_capabilities.contrast.max);
+ assert_equals(capabilities.contrast.min,
+ mock_capabilities.contrast.min);
assert_equals(capabilities.contrast.step,
mock_capabilities.contrast.step);
@@ -109,7 +131,8 @@ async_test(function(t) {
assert_equals(capabilities.zoom.min, mock_capabilities.zoom.min);
assert_equals(capabilities.zoom.step, mock_capabilities.zoom.step);
- assert_equals(capabilities.torch, mock_capabilities.supports_torch, 'torch');
+ assert_equals(capabilities.torch, mock_capabilities.supports_torch,
+ 'torch');
t.done();
}, 100);

Powered by Google App Engine
This is Rietveld 408576698