| Index: third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.cpp
|
| diff --git a/third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.cpp b/third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.cpp
|
| index a78d39b6a019b5361e625f7d25576a391ae07491..6e9abeb5811c4dac9efb8eb1650458c2588ff571 100644
|
| --- a/third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.cpp
|
| +++ b/third_party/WebKit/Source/modules/shapedetection/BarcodeDetector.cpp
|
| @@ -26,11 +26,8 @@ BarcodeDetector::BarcodeDetector() : ShapeDetector() {
|
| wrapWeakPersistent(this))));
|
| }
|
|
|
| -ScriptPromise BarcodeDetector::doDetect(
|
| - ScriptPromiseResolver* resolver,
|
| - mojo::ScopedSharedBufferHandle sharedBufferHandle,
|
| - int imageWidth,
|
| - int imageHeight) {
|
| +ScriptPromise BarcodeDetector::doDetect(ScriptPromiseResolver* resolver,
|
| + skia::mojom::blink::BitmapPtr bitmap) {
|
| ScriptPromise promise = resolver->promise();
|
| if (!m_barcodeService) {
|
| resolver->reject(DOMException::create(
|
| @@ -39,10 +36,9 @@ ScriptPromise BarcodeDetector::doDetect(
|
| }
|
| m_barcodeServiceRequests.insert(resolver);
|
| m_barcodeService->Detect(
|
| - std::move(sharedBufferHandle), imageWidth, imageHeight,
|
| - convertToBaseCallback(WTF::bind(&BarcodeDetector::onDetectBarcodes,
|
| - wrapPersistent(this),
|
| - wrapPersistent(resolver))));
|
| + std::move(bitmap), convertToBaseCallback(WTF::bind(
|
| + &BarcodeDetector::onDetectBarcodes,
|
| + wrapPersistent(this), wrapPersistent(resolver))));
|
| return promise;
|
| }
|
|
|
|
|