diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/imagecapture')
7 files changed, 39 insertions, 25 deletions
diff --git a/chromium/third_party/blink/renderer/modules/imagecapture/idls.gni b/chromium/third_party/blink/renderer/modules/imagecapture/idls.gni new file mode 100644 index 00000000000..f43e97793aa --- /dev/null +++ b/chromium/third_party/blink/renderer/modules/imagecapture/idls.gni @@ -0,0 +1,15 @@ +# Copyright 2020 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +modules_idl_files = [ + "image_capture.idl", + "media_settings_range.idl", + "photo_capabilities.idl", +] + +modules_dictionary_idl_files = [ + "constrain_point_2d_parameters.idl", + "photo_settings.idl", + "point_2d.idl", +] diff --git a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.cc b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.cc index 08eeae358e3..ef476ef9818 100644 --- a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.cc +++ b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.cc @@ -12,6 +12,8 @@ #include "third_party/blink/public/platform/web_media_stream_track.h" #include "third_party/blink/renderer/bindings/core/v8/callback_promise_adapter.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h" +#include "third_party/blink/renderer/bindings/modules/v8/v8_media_track_capabilities.h" +#include "third_party/blink/renderer/bindings/modules/v8/v8_media_track_constraints.h" #include "third_party/blink/renderer/core/dom/dom_exception.h" #include "third_party/blink/renderer/core/fileapi/blob.h" #include "third_party/blink/renderer/core/frame/local_frame.h" @@ -21,8 +23,6 @@ #include "third_party/blink/renderer/modules/imagecapture/media_settings_range.h" #include "third_party/blink/renderer/modules/imagecapture/photo_capabilities.h" #include "third_party/blink/renderer/modules/mediastream/media_stream_track.h" -#include "third_party/blink/renderer/modules/mediastream/media_track_capabilities.h" -#include "third_party/blink/renderer/modules/mediastream/media_track_constraints.h" #include "third_party/blink/renderer/platform/heap/heap.h" #include "third_party/blink/renderer/platform/mojo/mojo_helper.h" #include "third_party/blink/renderer/platform/wtf/functional.h" @@ -109,14 +109,14 @@ const AtomicString& ImageCapture::InterfaceName() const { } ExecutionContext* ImageCapture::GetExecutionContext() const { - return ContextLifecycleObserver::GetExecutionContext(); + return ExecutionContextLifecycleObserver::GetExecutionContext(); } bool ImageCapture::HasPendingActivity() const { return GetExecutionContext() && HasEventListeners(); } -void ImageCapture::ContextDestroyed(ExecutionContext*) { +void ImageCapture::ContextDestroyed() { RemoveAllEventListeners(); service_requests_.clear(); DCHECK(!HasEventListeners()); @@ -689,7 +689,7 @@ void ImageCapture::GetMediaTrackSettings(MediaTrackSettings* settings) const { } ImageCapture::ImageCapture(ExecutionContext* context, MediaStreamTrack* track) - : ContextLifecycleObserver(context), + : ExecutionContextLifecycleObserver(context), stream_track_(track), capabilities_(MediaTrackCapabilities::Create()), settings_(MediaTrackSettings::Create()), @@ -955,7 +955,7 @@ void ImageCapture::ResolveWithPhotoCapabilities( resolver->Resolve(photo_capabilities_); } -void ImageCapture::Trace(blink::Visitor* visitor) { +void ImageCapture::Trace(Visitor* visitor) { visitor->Trace(stream_track_); visitor->Trace(capabilities_); visitor->Trace(settings_); @@ -964,7 +964,7 @@ void ImageCapture::Trace(blink::Visitor* visitor) { visitor->Trace(photo_capabilities_); visitor->Trace(service_requests_); EventTargetWithInlineData::Trace(visitor); - ContextLifecycleObserver::Trace(visitor); + ExecutionContextLifecycleObserver::Trace(visitor); } } // namespace blink diff --git a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.h b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.h index 34e4577d81a..ba19865ed56 100644 --- a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.h +++ b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.h @@ -10,13 +10,13 @@ #include "mojo/public/cpp/bindings/remote.h" #include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h" #include "third_party/blink/renderer/bindings/core/v8/script_promise.h" +#include "third_party/blink/renderer/bindings/modules/v8/v8_media_track_capabilities.h" +#include "third_party/blink/renderer/bindings/modules/v8/v8_media_track_constraint_set.h" +#include "third_party/blink/renderer/bindings/modules/v8/v8_media_track_settings.h" +#include "third_party/blink/renderer/bindings/modules/v8/v8_photo_settings.h" #include "third_party/blink/renderer/core/dom/events/event_target.h" -#include "third_party/blink/renderer/core/execution_context/context_lifecycle_observer.h" +#include "third_party/blink/renderer/core/execution_context/execution_context_lifecycle_observer.h" #include "third_party/blink/renderer/modules/event_target_modules.h" -#include "third_party/blink/renderer/modules/imagecapture/photo_settings.h" -#include "third_party/blink/renderer/modules/mediastream/media_track_capabilities.h" -#include "third_party/blink/renderer/modules/mediastream/media_track_constraint_set.h" -#include "third_party/blink/renderer/modules/mediastream/media_track_settings.h" #include "third_party/blink/renderer/modules/modules_export.h" namespace blink { @@ -32,7 +32,7 @@ class ScriptPromiseResolver; class MODULES_EXPORT ImageCapture final : public EventTargetWithInlineData, public ActiveScriptWrappable<ImageCapture>, - public ContextLifecycleObserver { + public ExecutionContextLifecycleObserver { USING_GARBAGE_COLLECTED_MIXIN(ImageCapture); DEFINE_WRAPPERTYPEINFO(); @@ -51,8 +51,8 @@ class MODULES_EXPORT ImageCapture final // ScriptWrappable implementation. bool HasPendingActivity() const final; - // ContextLifecycleObserver - void ContextDestroyed(ExecutionContext*) override; + // ExecutionContextLifecycleObserver + void ContextDestroyed() override; MediaStreamTrack* videoStreamTrack() const { return stream_track_.Get(); } @@ -76,7 +76,7 @@ class MODULES_EXPORT ImageCapture final void ClearMediaTrackConstraints(); void GetMediaTrackSettings(MediaTrackSettings*) const; - void Trace(blink::Visitor*) override; + void Trace(Visitor*) override; private: using PromiseResolverFunction = diff --git a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.idl b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.idl index b38692c43bf..d27b2659a99 100644 --- a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.idl +++ b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture.idl @@ -6,12 +6,9 @@ [ ActiveScriptWrappable, - ConstructorCallWith=ExecutionContext, - Constructor(MediaStreamTrack track), - MeasureAs=ImageCaptureConstructor, - RaisesException=Constructor, Exposed=Window ] interface ImageCapture { + [CallWith=ExecutionContext, RaisesException, MeasureAs=ImageCaptureConstructor] constructor(MediaStreamTrack track); [ImplementedAs=videoStreamTrack] readonly attribute MediaStreamTrack track; [CallWith=ScriptState] Promise<PhotoCapabilities> getPhotoCapabilities(); diff --git a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc index c0b3f881b0e..dfc36212876 100644 --- a/chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc +++ b/chromium/third_party/blink/renderer/modules/imagecapture/image_capture_frame_grabber.cc @@ -107,9 +107,11 @@ void ImageCaptureFrameGrabber::SingleShotFrameHandler::OnVideoFrameOnIOThread( return; } - const uint32_t destination_pixel_format = - (kN32_SkColorType == kRGBA_8888_SkColorType) ? libyuv::FOURCC_ABGR - : libyuv::FOURCC_ARGB; +#if SK_PMCOLOR_BYTE_ORDER(R, G, B, A) + const uint32_t destination_pixel_format = libyuv::FOURCC_ABGR; +#else + const uint32_t destination_pixel_format = libyuv::FOURCC_ARGB; +#endif uint8_t* destination_plane = static_cast<uint8_t*>(pixmap.writable_addr()); int destination_stride = pixmap.width() * 4; int destination_width = pixmap.width(); diff --git a/chromium/third_party/blink/renderer/modules/imagecapture/photo_capabilities.cc b/chromium/third_party/blink/renderer/modules/imagecapture/photo_capabilities.cc index 4c2beb930ac..04cea46c1d5 100644 --- a/chromium/third_party/blink/renderer/modules/imagecapture/photo_capabilities.cc +++ b/chromium/third_party/blink/renderer/modules/imagecapture/photo_capabilities.cc @@ -45,7 +45,7 @@ bool PhotoCapabilities::IsRedEyeReductionControllable() const { media::mojom::blink::RedEyeReduction::CONTROLLABLE; } -void PhotoCapabilities::Trace(blink::Visitor* visitor) { +void PhotoCapabilities::Trace(Visitor* visitor) { visitor->Trace(image_height_); visitor->Trace(image_width_); ScriptWrappable::Trace(visitor); diff --git a/chromium/third_party/blink/renderer/modules/imagecapture/photo_capabilities.h b/chromium/third_party/blink/renderer/modules/imagecapture/photo_capabilities.h index 314509c5f9b..273ec23828b 100644 --- a/chromium/third_party/blink/renderer/modules/imagecapture/photo_capabilities.h +++ b/chromium/third_party/blink/renderer/modules/imagecapture/photo_capabilities.h @@ -38,7 +38,7 @@ class PhotoCapabilities final : public ScriptWrappable { } bool IsRedEyeReductionControllable() const; - void Trace(blink::Visitor*) override; + void Trace(Visitor*) override; private: Member<MediaSettingsRange> image_height_; |