[ShapeDetection] Change DetectedText.boundingBox to DOMRectReadOnly

The spec[1] says that the boundingBox attribute should be
DOMRectReadOnly instead of DOMRect.

[1] https://github.com/WICG/shape-detection-api/pull/41

Bug: 852838
Change-Id: I8666d56fcaf4ac77c29b497827b410ec0aeaa916
Reviewed-on: https://chromium-review.googlesource.com/1102838Reviewed-by: Miguel Casas <mcasas@chromium.org>
Commit-Queue: Byoungkwon Ko <codeimpl@gmail.com>
Cr-Commit-Position: refs/heads/master@{#570763}

third_party/WebKit/LayoutTests/shapedetection/detected-boundingBox-read-only.html

@@ -4,9 +4,11 @@
 <script src="file:///gen/layout_test_data/mojo/public/js/mojo_bindings.js"></script>
 <script src="file:///gen/services/shape_detection/public/mojom/barcodedetection_provider.mojom.js"></script>
 <script src="file:///gen/services/shape_detection/public/mojom/facedetection_provider.mojom.js"></script>
+<script src="file:///gen/services/shape_detection/public/mojom/textdetection.mojom.js"></script>
 <script src="resources/big-buffer-helpers.js"></script>
 <script src="resources/mock-barcodedetection.js"></script>
 <script src="resources/mock-facedetection.js"></script>
+<script src="resources/mock-textdetection.js"></script>
 <script>
 
 const createTestForImageData = (createDetector, mock, detectionResultTest) => {
@@ -33,18 +35,17 @@ const createTestForImageData = (createDetector, mock, detectionResultTest) => {
   });
 };
 
-function CheckDetectedReadOnlyBoundingBoxes(detectedObject) {
-  assert_readonly(detectedObject[0].boundingBox, 'x');
-  assert_readonly(detectedObject[0].boundingBox, 'y');
-  assert_readonly(detectedObject[0].boundingBox, 'width');
-  assert_readonly(detectedObject[0].boundingBox, 'height');
-  assert_readonly(detectedObject[0].boundingBox, 'top');
-  assert_readonly(detectedObject[0].boundingBox, 'right');
-  assert_readonly(detectedObject[0].boundingBox, 'bottom');
-  assert_readonly(detectedObject[0].boundingBox, 'left');
+function CheckDetectedReadOnlyBoundingBoxes(detectedObjects) {
+  var properties = ['x', 'y', 'width', 'height', 'top', 'right', 'bottom', 'left'];
+
+  detectedObjects.forEach(detectedObject => {
+    properties.forEach(property => {
+      assert_readonly(detectedObject.boundingBox, property);
+    });
+  });
 }
 
-// These tests verify that detectedFace's boundingBox should be DOMRectReadOnly.
+// These tests verify that detected{Face, Barcode, Text}'s boundingBox should be DOMRectReadOnly.
 generate_tests(createTestForImageData, [
   [
     "Face - detectedFace.boundingBox should be DOMRectReadOnly",
@@ -57,6 +58,12 @@ generate_tests(createTestForImageData, [
     () => { return new BarcodeDetector(); },
     mockBarcodeDetectionProvider,
     CheckDetectedReadOnlyBoundingBoxes
+  ],
+  [
+    "Text - detectedText.boundingBox should be DOMRectReadOnly",
+    () => { return new TextDetector(); },
+    mockTextDetection,
+    CheckDetectedReadOnlyBoundingBoxes
   ]
 ]);
 

third_party/blink/renderer/modules/shapedetection/detected_text.cc

@@ -10,11 +10,12 @@ namespace blink {
 
 DetectedText* DetectedText::Create() {
   HeapVector<Point2D> empty_list;
-  return new DetectedText(g_empty_string, DOMRect::Create(), empty_list);
+  return new DetectedText(g_empty_string, DOMRectReadOnly::Create(0, 0, 0, 0),
+                          empty_list);
 }
 
 DetectedText* DetectedText::Create(String raw_value,
-                                   DOMRect* bounding_box,
+                                   DOMRectReadOnly* bounding_box,
                                    HeapVector<Point2D> corner_points) {
   return new DetectedText(raw_value, bounding_box, corner_points);
 }
@@ -23,7 +24,7 @@ const String& DetectedText::rawValue() const {
   return raw_value_;
 }
 
-DOMRect* DetectedText::boundingBox() const {
+DOMRectReadOnly* DetectedText::boundingBox() const {
   return bounding_box_.Get();
 }
 
@@ -32,7 +33,7 @@ const HeapVector<Point2D>& DetectedText::cornerPoints() const {
 }
 
 DetectedText::DetectedText(String raw_value,
-                           DOMRect* bounding_box,
+                           DOMRectReadOnly* bounding_box,
                            HeapVector<Point2D> corner_points)
     : raw_value_(raw_value),
       bounding_box_(bounding_box),

third_party/blink/renderer/modules/shapedetection/detected_text.h

@@ -12,25 +12,25 @@
 
 namespace blink {
 
-class DOMRect;
+class DOMRectReadOnly;
 
 class MODULES_EXPORT DetectedText final : public ScriptWrappable {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
   static DetectedText* Create();
-  static DetectedText* Create(String, DOMRect*, HeapVector<Point2D>);
+  static DetectedText* Create(String, DOMRectReadOnly*, HeapVector<Point2D>);
 
   const String& rawValue() const;
-  DOMRect* boundingBox() const;
+  DOMRectReadOnly* boundingBox() const;
   const HeapVector<Point2D>& cornerPoints() const;
   void Trace(blink::Visitor*) override;
 
  private:
-  DetectedText(String, DOMRect*, HeapVector<Point2D>);
+  DetectedText(String, DOMRectReadOnly*, HeapVector<Point2D>);
 
   const String raw_value_;
-  const Member<DOMRect> bounding_box_;
+  const Member<DOMRectReadOnly> bounding_box_;
   const HeapVector<Point2D> corner_points_;
 };
 

third_party/blink/renderer/modules/shapedetection/detected_text.idl

@@ -9,7 +9,7 @@
     RuntimeEnabled=ShapeDetection
 ] interface DetectedText {
     [SameObject] readonly attribute DOMString rawValue;
-    [SameObject] readonly attribute DOMRect boundingBox;
+    [SameObject] readonly attribute DOMRectReadOnly boundingBox;
     // 4 corner points in clockwise direction starting with top-left. Due to
     // possible perspective distortions, this is not necessarily a rectangle.
     [SameObject] readonly attribute FrozenArray<Point2D> cornerPoints;

third_party/blink/renderer/modules/shapedetection/text_detector.cc

@@ -64,8 +64,9 @@ void TextDetector::OnDetectText(
     }
     detected_text.push_back(DetectedText::Create(
         text->raw_value,
-        DOMRect::Create(text->bounding_box.x, text->bounding_box.y,
-                        text->bounding_box.width, text->bounding_box.height),
+        DOMRectReadOnly::Create(text->bounding_box.x, text->bounding_box.y,
+                                text->bounding_box.width,
+                                text->bounding_box.height),
         corner_points));
   }