third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html - Issue 2522143002: ShapeDetection: split mojom into face and barcode interfaces

Unified Diff: third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html

Issue 2522143002: ShapeDetection: split mojom into face and barcode interfaces (Closed)

Patch Set: Smart rebase to https://crrev.com/2527503003 (FaceDetectorOptions) Created 4 years, 1 month 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 side-by-side diff with in-line comments

« no previous file with comments | « content/public/app/mojo/content_browser_manifest.json ('k') | third_party/WebKit/LayoutTests/shapedetection/detection-HTMLVideoElement.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html

diff --git a/third_party/WebKit/LayoutTests/shapedetection/detectshape-HTMLImageElement.html b/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html

similarity index 70%

rename from third_party/WebKit/LayoutTests/shapedetection/detectshape-HTMLImageElement.html

rename to third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html

index 53d32ac77762e737ad130c53625e01536ac8adac..b9b3b8a2b946f7b327e318cb94be3ade34aae04f 100644

--- a/third_party/WebKit/LayoutTests/shapedetection/detectshape-HTMLImageElement.html

+++ b/third_party/WebKit/LayoutTests/shapedetection/detection-HTMLImageElement.html

@@ -2,25 +2,27 @@

-<script src="resources/mock-shapedetection.js"></script>

+<script src="resources/mock-barcodedetection.js"></script>

+<script src="resources/mock-facedetection.js"></script>

<body>

</body>

-var createTestForImageElement = function(detectorName, detectionResultTest) {

+var createTestForImageElement = function(detectorName, mockReady,

+ detectionResultTest) {

async_test(function(t) {

var img = document.getElementById("img");

var theMock = null;

- mockShapeDetectionReady

+ mockReady()

.then(mock => {

theMock = mock;

var detector = eval("new " + detectorName + "();");

return detector;

})

.catch(error => {

- assert_unreached("Error creating MockShapeDetection: " + error);

+ assert_unreached("Error creating MockFaceDetection: " + error);

})

.then(detector => {

return detector.detect(img);

@@ -51,10 +53,20 @@ function BarcodeDetectorDetectionResultTest(detectionResult, mock) {

}

// These tests verify that a Detector's detect() works on an HTMLImageElement.

-// Use the mock mojo server implemented in mock-shapedetection.js.

+// Use the mock mojo server implemented in mock-{barcode,face}detection.js.

generate_tests(createTestForImageElement, [

- [ "Face", "FaceDetector", FaceDetectorDetectionResultTest ],

- [ "Barcode", "BarcodeDetector", BarcodeDetectorDetectionResultTest ]

+ [

+ "Face",

+ "FaceDetector",

+ () => { return mockFaceDetectionReady; },

+ FaceDetectorDetectionResultTest

+ ],

+ [

+ "Barcode",

+ "BarcodeDetector",

+ () => { return mockBarcodeDetectionReady; },

+ BarcodeDetectorDetectionResultTest

+ ]

]);

</script>