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

Side by Side Diff: third_party/WebKit/Source/modules/shapedetection/FaceDetector.cpp

Issue 2369693002: Shapedetection module: Blink side implementation (Closed)
Patch Set: Refactor code into getSharedBufferHandle() && Update *-expected.txt Created 4 years, 2 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/shapedetection/FaceDetector.h" 5 #include "modules/shapedetection/FaceDetector.h"
6 6
7 #include "bindings/core/v8/ScriptPromiseResolver.h"
8 #include "core/dom/DOMException.h" 7 #include "core/dom/DOMException.h"
8 #include "core/dom/DOMRect.h"
9 #include "core/dom/Document.h"
10 #include "core/fetch/ImageResource.h"
11 #include "core/frame/LocalFrame.h"
12 #include "core/html/HTMLImageElement.h"
13 #include "platform/graphics/Image.h"
14 #include "public/platform/InterfaceProvider.h"
15 #include "third_party/skia/include/core/SkImage.h"
16 #include "third_party/skia/include/core/SkImageInfo.h"
9 17
10 namespace blink { 18 namespace blink {
11 19
12 FaceDetector* FaceDetector::create() 20 namespace {
21
22 mojo::ScopedSharedBufferHandle getSharedBufferHandle(const HTMLImageElement* img )
13 { 23 {
14 return new FaceDetector(); 24 ImageResource* imgResource = img->cachedImage();
mcasas 2016/09/30 02:14:59 ImageResource* const ?
xianglu 2016/09/30 16:37:41 Done.
25 if (!imgResource) {
26 DLOG(ERROR) << "Failed to convert HTMLImageElement to ImageSource.";
27 return mojo::ScopedSharedBufferHandle();
28 }
29
30 Image* blinkImage = imgResource->getImage();
mcasas 2016/09/30 02:14:59 Image* const ?
xianglu 2016/09/30 16:37:41 Done.
31 if (!blinkImage) {
32 DLOG(ERROR) << "Failed to convert ImageSource to blink::Image.";
33 return mojo::ScopedSharedBufferHandle();
34 }
35
36 sk_sp<SkImage> skImg = blinkImage->imageForCurrentFrame();
mcasas 2016/09/30 02:14:59 const sk_sp<SkImage> skiaImage ?
xianglu 2016/09/30 16:37:40 Done.
37 if (!skImg) {
38 DLOG(ERROR) << "Failed to convert blink::Image to sk_sp<SkImage>.";
39 return mojo::ScopedSharedBufferHandle();
40 }
41
42 SkImageInfo dstInfo = SkImageInfo::MakeN32(skImg->width(), skImg->height(), skImg->alphaType());
mcasas 2016/09/30 02:14:59 const SkImageInfo skiaInfo ?
xianglu 2016/09/30 16:37:41 Done.
43
44 uint32_t allocationSize = dstInfo.getSafeSize(dstInfo.minRowBytes());
mcasas 2016/09/30 02:14:59 const
xianglu 2016/09/30 16:37:41 Done.
45 mojo::ScopedSharedBufferHandle sharedBufferHandle = mojo::SharedBufferHandle ::Create(allocationSize);
46 mojo::ScopedSharedBufferMapping mappingPtr = sharedBufferHandle->Map(allocat ionSize);
47 DCHECK(mappingPtr);
48
49 SkPixmap pixmap(dstInfo, mappingPtr.get(), dstInfo.minRowBytes());
mcasas 2016/09/30 02:14:59 const
xianglu 2016/09/30 16:37:41 Done.
50 if (!skImg->readPixels(pixmap, 0, 0)) {
51 DLOG(ERROR) << "Failed to read pixels from sk_sp<SkImage>.";
52 return mojo::ScopedSharedBufferHandle();
53 }
54
55 DCHECK_EQ(img->naturalWidth(), skImg->width());
56 DCHECK_EQ(img->naturalHeight(), skImg->height());
mcasas 2016/09/30 02:14:59 Move these two contracts/preconditions to l.37, i.
xianglu 2016/09/30 16:37:40 Done.
57 return sharedBufferHandle;
15 } 58 }
16 59
17 ScriptPromise FaceDetector::detect(ScriptState* scriptState, const HTMLImageElem ent* image) 60 } // anonymous namespace
61
62 FaceDetector* FaceDetector::create(const Document& document)
63 {
64 return new FaceDetector(*document.frame());
65 }
66
67 FaceDetector::FaceDetector(LocalFrame& frame)
68 {
69 DCHECK(!m_service.is_bound());
70 DCHECK(frame.interfaceProvider());
71 frame.interfaceProvider()->getInterface(mojo::GetProxy(&m_service));
72 }
73
74 ScriptPromise FaceDetector::detect(ScriptState* scriptState, const HTMLImageElem ent* img)
18 { 75 {
19 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ; 76 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState) ;
20 ScriptPromise promise = resolver->promise(); 77 ScriptPromise promise = resolver->promise();
21 resolver->reject(DOMException::create(NotSupportedError, "Not implemented")) ; 78
79 if (!m_service) {
80 resolver->reject(DOMException::create(NotFoundError, "Face detection ser vice unavailable."));
81 return promise;
82 }
83
84 if (!img) {
85 resolver->reject(DOMException::create(SyntaxError, "The provided HTMLIma geElement is empty."));
86 return promise;
87 }
88
89 // TODO(xianglu): Add security check when the spec is ready. https://crbug.c om/646083
90 mojo::ScopedSharedBufferHandle sharedBufferHandle = getSharedBufferHandle(im g);
91 if (!sharedBufferHandle->is_valid()) {
92 resolver->reject(DOMException::create(SyntaxError, "Failed to get shared BufferHandle."));
93 return promise;
94 }
95
96 m_serviceRequests.add(resolver);
97 DCHECK(m_service.is_bound());
98 m_service->DetectFace(
99 std::move(sharedBufferHandle),
100 img->naturalWidth(), img->naturalHeight(),
mcasas 2016/09/30 02:14:59 Strange indenting: either all parameters are in th
xianglu 2016/09/30 16:37:41 Done.
101 convertToBaseCallback(WTF::bind(&FaceDetector::onDetectFace, wrapPersist ent(this), wrapPersistent(resolver)))
102 );
103 sharedBufferHandle.reset();
22 return promise; 104 return promise;
23 } 105 }
24 106
107
108 void FaceDetector::onDetectFace(ScriptPromiseResolver* resolver, mojo::WTFArray< mojom::blink::BoundingBoxPtr> boundingBoxes)
109 {
110 if (!m_serviceRequests.contains(resolver))
111 return;
112
113 HeapVector<Member<DOMRect>> resultRects;
114 for (size_t i = 0; i < boundingBoxes.size(); i++) {
115 resultRects.append(DOMRect::create(
116 boundingBoxes.at(i)->x,
117 boundingBoxes.at(i)->y,
118 boundingBoxes.at(i)->width,
119 boundingBoxes.at(i)->height));
120 }
mcasas 2016/09/30 02:14:59 Consider for-range loop and const auto&: Hea
xianglu 2016/09/30 16:37:41 There is no begin() function in mojo::WTFArray.
121
122 resolver->resolve(resultRects);
123 m_serviceRequests.remove(resolver);
124 }
125
126 DEFINE_TRACE(FaceDetector)
127 {
128 visitor->trace(m_serviceRequests);
129 }
130
25 } // namespace blink 131 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698