commit 6e5b07e25b65fc05592ca4bfcaaff9c2dfe9064f
author Kevin Lubick <kjlubick@google.com> Thu Oct 10 13:18:35 2019 -0400
committer Kevin Lubick <kjlubick@google.com> Thu Oct 10 18:48:49 2019 +0000
tree 85ca1e2e5ff01299f1174d268883626d578a6ae0
parent 2d8a95ee71b5a459eb7dfa26400bfd089e7b268a

[canvaskit] Enable tests for getGlyphPosition

Change-Id: Ibdd5987689305d383699153cdabdb6cbfd528a3e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247599
Reviewed-by: Julia Lavrova <jlavrova@google.com>

modules/canvaskit/canvaskit/extra.html

diff --git a/modules/canvaskit/canvaskit/extra.html b/modules/canvaskit/canvaskit/extra.html
index d41ff72..64b7efe 100644
--- a/modules/canvaskit/canvaskit/extra.html
+++ b/modules/canvaskit/canvaskit/extra.html
@@ -27,7 +27,7 @@
 <canvas id=particles width=500 height=500></canvas>
 
 <h2> Paragraph </h2>
-<canvas id=para1 width=500 height=500></canvas>
+<canvas id=para1 width=600 height=600></canvas>
 
 <script type="text/javascript" src="/node_modules/canvaskit/bin/canvaskit.js"></script>
 
@@ -344,15 +344,15 @@
       canvas.drawLine(wrapTo, 0, wrapTo, 400, fontPaint);
 
       let posA = paragraph.getGlyphPositionAtCoordinate(X, Y);
-      canvas.drawText(`At (${X}, ${Y}) glyph is ${posA.pos}`, 5, 450, fontPaint, font);
+      canvas.drawText(`At (${X.toFixed(2)}, ${Y.toFixed(2)}) glyph is ${posA.pos}`, 5, 450, fontPaint, font);
 
       surface.requestAnimationFrame(drawFrame);
     }
     surface.requestAnimationFrame(drawFrame);
 
     let interact = (e) => {
-      X = e.offsetX;
-      Y = e.offsetY;
+      X = e.offsetX*2; // multiply by 2 because the canvas is 300 css pixels wide,
+      Y = e.offsetY*2; // but the canvas itself is 600px wide
     };
 
     document.getElementById('para1').addEventListener('pointermove', interact);

modules/canvaskit/tests/paragraph.spec.js

diff --git a/modules/canvaskit/tests/paragraph.spec.js b/modules/canvaskit/tests/paragraph.spec.js
index 49261ab..e0bfcd9 100644
--- a/modules/canvaskit/tests/paragraph.spec.js
+++ b/modules/canvaskit/tests/paragraph.spec.js
@@ -228,8 +228,7 @@
         }));
     });
 
-    // A bit wrong, check after jlavrova's change lands.
-    xit('can do hit detection on ascii', function(done) {
+    it('can do hit detection on ascii', function(done) {
         Promise.all([LoadCanvasKit, notoSerifFontLoaded]).then(catchException(done, () => {
             const surface = CanvasKit.MakeCanvasSurface('test');
             expect(surface).toBeTruthy('Could not make surface')