| 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/BarcodeDetector.h" | 5 #include "modules/shapedetection/BarcodeDetector.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/frame/LocalFrame.h" | |
| 10 #include "core/html/canvas/CanvasImageSource.h" | 9 #include "core/html/canvas/CanvasImageSource.h" |
| 11 #include "modules/imagecapture/Point2D.h" | 10 #include "modules/imagecapture/Point2D.h" |
| 12 #include "modules/shapedetection/DetectedBarcode.h" | 11 #include "modules/shapedetection/DetectedBarcode.h" |
| 13 #include "public/platform/InterfaceProvider.h" | 12 #include "public/platform/InterfaceProvider.h" |
| 13 #include "public/platform/Platform.h" |
| 14 | 14 |
| 15 namespace blink { | 15 namespace blink { |
| 16 | 16 |
| 17 BarcodeDetector* BarcodeDetector::create(Document& document) { | 17 BarcodeDetector* BarcodeDetector::create() { |
| 18 return new BarcodeDetector(*document.frame()); | 18 return new BarcodeDetector(); |
| 19 } | 19 } |
| 20 | 20 |
| 21 BarcodeDetector::BarcodeDetector(LocalFrame& frame) : ShapeDetector(frame) { | 21 BarcodeDetector::BarcodeDetector() : ShapeDetector() { |
| 22 frame.interfaceProvider()->getInterface(mojo::MakeRequest(&m_barcodeService)); | 22 Platform::current()->interfaceProvider()->getInterface( |
| 23 mojo::MakeRequest(&m_barcodeService)); |
| 23 m_barcodeService.set_connection_error_handler(convertToBaseCallback( | 24 m_barcodeService.set_connection_error_handler(convertToBaseCallback( |
| 24 WTF::bind(&BarcodeDetector::onBarcodeServiceConnectionError, | 25 WTF::bind(&BarcodeDetector::onBarcodeServiceConnectionError, |
| 25 wrapWeakPersistent(this)))); | 26 wrapWeakPersistent(this)))); |
| 26 } | 27 } |
| 27 | 28 |
| 28 ScriptPromise BarcodeDetector::doDetect( | 29 ScriptPromise BarcodeDetector::doDetect( |
| 29 ScriptPromiseResolver* resolver, | 30 ScriptPromiseResolver* resolver, |
| 30 mojo::ScopedSharedBufferHandle sharedBufferHandle, | 31 mojo::ScopedSharedBufferHandle sharedBufferHandle, |
| 31 int imageWidth, | 32 int imageWidth, |
| 32 int imageHeight) { | 33 int imageHeight) { |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 m_barcodeServiceRequests.clear(); | 81 m_barcodeServiceRequests.clear(); |
| 81 m_barcodeService.reset(); | 82 m_barcodeService.reset(); |
| 82 } | 83 } |
| 83 | 84 |
| 84 DEFINE_TRACE(BarcodeDetector) { | 85 DEFINE_TRACE(BarcodeDetector) { |
| 85 ShapeDetector::trace(visitor); | 86 ShapeDetector::trace(visitor); |
| 86 visitor->trace(m_barcodeServiceRequests); | 87 visitor->trace(m_barcodeServiceRequests); |
| 87 } | 88 } |
| 88 | 89 |
| 89 } // namespace blink | 90 } // namespace blink |
| OLD | NEW |