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

Side by Side Diff: third_party/WebKit/LayoutTests/imagecapture/MediaStreamTrack-getSettings.html

Issue 2795923003: Image Capture: remove MediaSettingsRange.current (Closed)
Patch Set: bugfix: getMediaTrackSettings() should merge dictionaries, not override the input parameter; Layout… 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 unified diff | Download patch
OLDNEW
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <script src="../resources/testharness.js"></script> 2 <script src="../resources/testharness.js"></script>
3 <script src="../resources/testharnessreport.js"></script> 3 <script src="../resources/testharnessreport.js"></script>
4 <script src="../resources/mojo-helpers.js"></script> 4 <script src="../resources/mojo-helpers.js"></script>
5 <script src="resources/mock-imagecapture.js"></script> 5 <script src="resources/mock-imagecapture.js"></script>
6 <body> 6 <body>
7 <canvas id='canvas' width=10 height=10/> 7 <canvas id='canvas' width=10 height=10/>
8 </body> 8 </body>
9 <script> 9 <script>
10 10
(...skipping 27 matching lines...) Expand all
38 assert_equals(typeof settings, 'object'); 38 assert_equals(typeof settings, 'object');
39 39
40 assert_equals(settings.whiteBalanceMode, 40 assert_equals(settings.whiteBalanceMode,
41 meteringModeNames[mock_settings.white_balance_mode], 41 meteringModeNames[mock_settings.white_balance_mode],
42 'whiteBalanceMode'); 42 'whiteBalanceMode');
43 assert_equals(settings.exposureMode, 43 assert_equals(settings.exposureMode,
44 meteringModeNames[mock_settings.exposure_mode], 'exposureMode;'); 44 meteringModeNames[mock_settings.exposure_mode], 'exposureMode;');
45 assert_equals(settings.focusMode, 45 assert_equals(settings.focusMode,
46 meteringModeNames[mock_settings.focus_mode], 'focusMode'); 46 meteringModeNames[mock_settings.focus_mode], 'focusMode');
47 47
48 assert_equals(settings.pointsOfInterest.length,
49 mock_settings.points_of_interest.length,
50 'pointsOfInterest');
51 for (i = 0; i < settings.pointsOfInterest.length; ++i) {
52 assert_approx_equals(settings.pointsOfInterest[i].x,
53 mock_settings.points_of_interest[i].x, 0.01,
54 'pointsOfInterest x');
55 assert_approx_equals(settings.pointsOfInterest[i].y,
56 mock_settings.points_of_interest[i].y, 0.01,
57 'pointsOfInterest y');
58 }
59
48 assert_equals(settings.exposureCompensation, 60 assert_equals(settings.exposureCompensation,
49 mock_settings.exposure_compensation.current); 61 mock_settings.exposure_compensation.current);
50 assert_equals(settings.colorTemperature, 62 assert_equals(settings.colorTemperature,
51 mock_settings.color_temperature.current); 63 mock_settings.color_temperature.current);
52 assert_equals(settings.iso, mock_settings.iso.current); 64 assert_equals(settings.iso, mock_settings.iso.current);
53 65
54 assert_equals(settings.brightness, mock_settings.brightness.current); 66 assert_equals(settings.brightness, mock_settings.brightness.current);
55 assert_equals(settings.contrast, mock_settings.contrast.current); 67 assert_equals(settings.contrast, mock_settings.contrast.current);
56 assert_equals(settings.saturation, mock_settings.saturation.current); 68 assert_equals(settings.saturation, mock_settings.saturation.current);
57 assert_equals(settings.sharpness, mock_settings.sharpness.current); 69 assert_equals(settings.sharpness, mock_settings.sharpness.current);
58 70
59 assert_equals(settings.zoom, mock_settings.zoom.current); 71 assert_equals(settings.zoom, mock_settings.zoom.current);
60 72
61 assert_equals(settings.torch, mock_settings.torch); 73 // TODO(mcasas): do |torch| when the mojom interface is updated,
74 // https://crbug.com/700607.
62 75
63 t.done(); 76 t.done();
64 }, 100); 77 }, 100);
65 }, 78 },
66 error => { 79 error => {
67 assert_unreached("Error creating MockImageCapture: " + error); 80 assert_unreached("Error creating MockImageCapture: " + error);
68 }); 81 });
69 82
70 }, 'exercises MediaStreamTrack.getSettings()'); 83 }, 'exercises MediaStreamTrack.getSettings()');
71 84
72 </script> 85 </script>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698