third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp - Issue 2027023002: ImageCapture: move mojom from WebKit/public to media/

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 2027023002: ImageCapture: move mojom from WebKit/public to media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 7 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/capture/imagecapture/image_capture.mojom ('K') | « third_party/WebKit/Source/modules/imagecapture/ImageCapture.h ('k') | third_party/WebKit/Source/modules/modules.gyp » ('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 43cf02e343219e86a14bb1577c0fecfd9cfc0a16..721eb200dc2099f32d5c30e6830fdd2ae5e6eca9 100644

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

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

@@ -92,7 +92,7 @@ ScriptPromise ImageCapture::getPhotoCapabilities(ScriptState* scriptState, Excep

// m_streamTrack->component()->source()->id() is the renderer "name" of the camera;

// TODO(mcasas) consider sending the security origin as well:

// scriptState->getExecutionContext()->getSecurityOrigin()->toString()

- m_service->GetCapabilities(m_streamTrack->component()->source()->id(), createBaseCallback(bind<mojom::blink::PhotoCapabilitiesPtr>(&ImageCapture::onCapabilities, this, resolver)));

+ m_service->GetCapabilities(m_streamTrack->component()->source()->id(), createBaseCallback(bind<media::mojom::blink::PhotoCapabilitiesPtr>(&ImageCapture::onCapabilities, this, resolver)));

return promise;

}

@@ -161,7 +161,7 @@ ImageCapture::ImageCapture(ExecutionContext* context, MediaStreamTrack* track)

}

-void ImageCapture::onCapabilities(ScriptPromiseResolver* resolver, mojom::blink::PhotoCapabilitiesPtr capabilities)

+void ImageCapture::onCapabilities(ScriptPromiseResolver* resolver, media::mojom::blink::PhotoCapabilitiesPtr capabilities)

{

DVLOG(1) << __FUNCTION__;

if (!m_serviceRequests.contains(resolver))