OLD | NEW |
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/shapedetection/FaceDetector.h" | 5 #include "modules/shapedetection/FaceDetector.h" |
6 | 6 |
7 #include "core/dom/DOMException.h" | 7 #include "core/dom/DOMException.h" |
8 #include "core/dom/DOMRect.h" | 8 #include "core/dom/DOMRect.h" |
9 #include "core/html/canvas/CanvasImageSource.h" | 9 #include "core/html/canvas/CanvasImageSource.h" |
10 #include "modules/shapedetection/DetectedFace.h" | 10 #include "modules/shapedetection/DetectedFace.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 shape_detection::mojom::blink::FaceDetectionProviderPtr provider; | 28 shape_detection::mojom::blink::FaceDetectionProviderPtr provider; |
29 Platform::current()->interfaceProvider()->getInterface( | 29 Platform::current()->interfaceProvider()->getInterface( |
30 mojo::MakeRequest(&provider)); | 30 mojo::MakeRequest(&provider)); |
31 provider->CreateFaceDetection(mojo::MakeRequest(&m_faceService), | 31 provider->CreateFaceDetection(mojo::MakeRequest(&m_faceService), |
32 std::move(faceDetectorOptions)); | 32 std::move(faceDetectorOptions)); |
33 | 33 |
34 m_faceService.set_connection_error_handler(convertToBaseCallback(WTF::bind( | 34 m_faceService.set_connection_error_handler(convertToBaseCallback(WTF::bind( |
35 &FaceDetector::onFaceServiceConnectionError, wrapWeakPersistent(this)))); | 35 &FaceDetector::onFaceServiceConnectionError, wrapWeakPersistent(this)))); |
36 } | 36 } |
37 | 37 |
38 ScriptPromise FaceDetector::doDetect(ScriptPromiseResolver* resolver, | 38 ScriptPromise FaceDetector::doDetect( |
39 skia::mojom::blink::BitmapPtr bitmap) { | 39 ScriptPromiseResolver* resolver, |
| 40 mojo::ScopedSharedBufferHandle sharedBufferHandle, |
| 41 int imageWidth, |
| 42 int imageHeight) { |
40 ScriptPromise promise = resolver->promise(); | 43 ScriptPromise promise = resolver->promise(); |
41 if (!m_faceService) { | 44 if (!m_faceService) { |
42 resolver->reject(DOMException::create( | 45 resolver->reject(DOMException::create( |
43 NotSupportedError, "Face detection service unavailable.")); | 46 NotSupportedError, "Face detection service unavailable.")); |
44 return promise; | 47 return promise; |
45 } | 48 } |
46 m_faceServiceRequests.insert(resolver); | 49 m_faceServiceRequests.insert(resolver); |
47 m_faceService->Detect(std::move(bitmap), | 50 m_faceService->Detect(std::move(sharedBufferHandle), imageWidth, imageHeight, |
48 convertToBaseCallback(WTF::bind( | 51 convertToBaseCallback(WTF::bind( |
49 &FaceDetector::onDetectFaces, wrapPersistent(this), | 52 &FaceDetector::onDetectFaces, wrapPersistent(this), |
50 wrapPersistent(resolver)))); | 53 wrapPersistent(resolver)))); |
51 return promise; | 54 return promise; |
52 } | 55 } |
53 | 56 |
54 void FaceDetector::onDetectFaces( | 57 void FaceDetector::onDetectFaces( |
55 ScriptPromiseResolver* resolver, | 58 ScriptPromiseResolver* resolver, |
56 shape_detection::mojom::blink::FaceDetectionResultPtr faceDetectionResult) { | 59 shape_detection::mojom::blink::FaceDetectionResultPtr faceDetectionResult) { |
57 DCHECK(m_faceServiceRequests.contains(resolver)); | 60 DCHECK(m_faceServiceRequests.contains(resolver)); |
(...skipping 17 matching lines...) Expand all Loading... |
75 m_faceServiceRequests.clear(); | 78 m_faceServiceRequests.clear(); |
76 m_faceService.reset(); | 79 m_faceService.reset(); |
77 } | 80 } |
78 | 81 |
79 DEFINE_TRACE(FaceDetector) { | 82 DEFINE_TRACE(FaceDetector) { |
80 ShapeDetector::trace(visitor); | 83 ShapeDetector::trace(visitor); |
81 visitor->trace(m_faceServiceRequests); | 84 visitor->trace(m_faceServiceRequests); |
82 } | 85 } |
83 | 86 |
84 } // namespace blink | 87 } // namespace blink |
OLD | NEW |