third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp - Issue 2239583002: ImageCapture: support enhanced FocusMode getting/setting

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

Issue 2239583002: ImageCapture: support enhanced FocusMode getting/setting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reillyg@ comments Created 4 years, 4 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

« media/mojo/interfaces/image_capture.mojom ('K') | « third_party/WebKit/LayoutTests/imagecapture/setoptions.html ('k') | third_party/WebKit/Source/modules/imagecapture/PhotoCapabilities.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

index c9114129f01d1ece158f7f51db812d72132743ff..21bc9b9103e42d9dcd27ef3931f14e5ae7188b56 100644

--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

@@ -124,6 +124,17 @@ ScriptPromise ImageCapture::setOptions(ScriptState* scriptState, const PhotoSett

settings->has_width = photoSettings.hasImageWidth();

if (settings->has_width)

settings->width = photoSettings.imageWidth();

+ settings->has_focus_mode = photoSettings.hasFocusMode();

+ if (settings->has_focus_mode) {

+ if (photoSettings.focusMode() == "manual")

+ settings->focus_mode = media::mojom::blink::FocusMode::MANUAL;

+ else if (photoSettings.focusMode() == "single-shot")

+ settings->focus_mode = media::mojom::blink::FocusMode::SINGLE_SHOT;

+ else if (photoSettings.focusMode() == "continuous")

+ settings->focus_mode = media::mojom::blink::FocusMode::CONTINUOUS;

+ else

+ settings->has_focus_mode = false;

+ }

m_service->SetOptions(m_streamTrack->component()->source()->id(), std::move(settings), convertToBaseCallback(WTF::bind(&ImageCapture::onSetOptions, wrapPersistent(this), wrapPersistent(resolver))));

return promise;