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

Side by Side Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from Kent; merge. Created 4 years, 6 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 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/imagecapture/ImageCapture.h" 5 #include "modules/imagecapture/ImageCapture.h"
6 6
7 #include "bindings/core/v8/CallbackPromiseAdapter.h" 7 #include "bindings/core/v8/CallbackPromiseAdapter.h"
8 #include "bindings/core/v8/ScriptPromiseResolver.h" 8 #include "bindings/core/v8/ScriptPromiseResolver.h"
9 #include "core/dom/DOMException.h" 9 #include "core/dom/DOMException.h"
10 #include "core/dom/ExceptionCode.h" 10 #include "core/dom/ExceptionCode.h"
11 #include "core/fileapi/Blob.h" 11 #include "core/fileapi/Blob.h"
12 #include "core/frame/ImageBitmap.h" 12 #include "core/frame/ImageBitmap.h"
13 #include "modules/EventTargetModules.h" 13 #include "modules/EventTargetModules.h"
14 #include "modules/imagecapture/MediaSettingsRange.h" 14 #include "modules/imagecapture/MediaSettingsRange.h"
15 #include "modules/imagecapture/PhotoCapabilities.h" 15 #include "modules/imagecapture/PhotoCapabilities.h"
16 #include "modules/mediastream/MediaStreamTrack.h" 16 #include "modules/mediastream/MediaStreamTrack.h"
17 #include "platform/mojo/MojoHelper.h" 17 #include "platform/mojo/MojoHelper.h"
18 #include "public/platform/Platform.h" 18 #include "public/platform/Platform.h"
19 #include "public/platform/ServiceRegistry.h" 19 #include "public/platform/ServiceRegistry.h"
20 #include "public/platform/WebImageCaptureFrameGrabber.h" 20 #include "public/platform/WebImageCaptureFrameGrabber.h"
21 #include "public/platform/WebMediaStreamTrack.h" 21 #include "public/platform/WebMediaStreamTrack.h"
22 #include "wtf/PtrUtil.h"
22 23
23 namespace blink { 24 namespace blink {
24 25
25 namespace { 26 namespace {
26 27
27 const char kNoServiceError[] = "ImageCapture service unavailable."; 28 const char kNoServiceError[] = "ImageCapture service unavailable.";
28 29
29 bool trackIsInactive(const MediaStreamTrack& track) 30 bool trackIsInactive(const MediaStreamTrack& track)
30 { 31 {
31 // Spec instructs to return an exception if the Track's readyState() is not 32 // Spec instructs to return an exception if the Track's readyState() is not
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 127 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
127 ScriptPromise promise = resolver->promise(); 128 ScriptPromise promise = resolver->promise();
128 129
129 if (trackIsInactive(*m_streamTrack)) { 130 if (trackIsInactive(*m_streamTrack)) {
130 resolver->reject(DOMException::create(InvalidStateError, "The associated Track is in an invalid state.")); 131 resolver->reject(DOMException::create(InvalidStateError, "The associated Track is in an invalid state."));
131 return promise; 132 return promise;
132 } 133 }
133 134
134 // Create |m_frameGrabber| the first time. 135 // Create |m_frameGrabber| the first time.
135 if (!m_frameGrabber) 136 if (!m_frameGrabber)
136 m_frameGrabber = adoptPtr(Platform::current()->createImageCaptureFrameGr abber()); 137 m_frameGrabber = wrapUnique(Platform::current()->createImageCaptureFrame Grabber());
137 138
138 if (!m_frameGrabber) { 139 if (!m_frameGrabber) {
139 resolver->reject(DOMException::create(UnknownError, "Couldn't create pla tform resources")); 140 resolver->reject(DOMException::create(UnknownError, "Couldn't create pla tform resources"));
140 return promise; 141 return promise;
141 } 142 }
142 143
143 // The platform does not know about MediaStreamTrack, so we wrap it up. 144 // The platform does not know about MediaStreamTrack, so we wrap it up.
144 WebMediaStreamTrack track(m_streamTrack->component()); 145 WebMediaStreamTrack track(m_streamTrack->component());
145 m_frameGrabber->grabFrame(&track, new CallbackPromiseAdapter<ImageBitmap, vo id>(resolver)); 146 m_frameGrabber->grabFrame(&track, new CallbackPromiseAdapter<ImageBitmap, vo id>(resolver));
146 147
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 203
203 DEFINE_TRACE(ImageCapture) 204 DEFINE_TRACE(ImageCapture)
204 { 205 {
205 visitor->trace(m_streamTrack); 206 visitor->trace(m_streamTrack);
206 visitor->trace(m_serviceRequests); 207 visitor->trace(m_serviceRequests);
207 EventTargetWithInlineData::trace(visitor); 208 EventTargetWithInlineData::trace(visitor);
208 ContextLifecycleObserver::trace(visitor); 209 ContextLifecycleObserver::trace(visitor);
209 } 210 }
210 211
211 } // namespace blink 212 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698