don't render changes made after canvasSource.pause()

mapbox · Apr 10, 2019 · 95dc749 · 95dc749
1 parent 6f8feba
commit 95dc749
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/source/canvas_source.js b/src/source/canvas_source.js
@@ -67,7 +67,6 @@ class CanvasSource extends ImageSource {
     play: () => void;
     pause: () => void;
     _playing: boolean;
-    _dirty: boolean;
 
     /**
      * @private
@@ -131,8 +130,10 @@ class CanvasSource extends ImageSource {
         };
 
         this.pause = function() {
-            this._playing = false;
-            this._dirty = true;
+            if (this._playing) {
+                this.prepare();
+                this._playing = false;
+            }
         };
 
         this._finishLoading();
@@ -201,9 +202,8 @@ class CanvasSource extends ImageSource {
 
         if (!this.texture) {
             this.texture = new Texture(context, this.canvas, gl.RGBA, { premultiply: true });
-        } else if (resize || this._playing || this._dirty) {
+        } else if (resize || this._playing) {
             this.texture.update(this.canvas, { premultiply: true });
-            this._dirty = false;
         }
 
         for (const w in this.tiles) {

diff --git a/test/integration/render-tests/canvas/update/style.json b/test/integration/render-tests/canvas/update/style.json
@@ -10,7 +10,7 @@
       },
       "operations": [
           ["wait"],
-          ["updateFakeCanvas", "canvas", "./image/1.png"]
+          ["updateFakeCanvas", "canvas", "./image/1.png", "./image/0.png"]
       ]
     }
   },

diff --git a/test/suite_implementation.js b/test/suite_implementation.js
@@ -158,10 +158,13 @@ module.exports = function(style, options, _callback) { // eslint-disable-line im
             map._render();
             applyOperations(map, operations.slice(1), callback);
         } else if (operation[0] === 'updateFakeCanvas') {
-            updateFakeCanvas(window.document, options.addFakeCanvas.id, operation[2]);
             const canvasSource = map.getSource(operation[1]);
             canvasSource.play();
+            // update before pause should be rendered
+            updateFakeCanvas(window.document, options.addFakeCanvas.id, operation[2]);
             canvasSource.pause();
+            // update after pause should not be rendered
+            updateFakeCanvas(window.document, options.addFakeCanvas.id, operation[3]);
             map._render();
             applyOperations(map, operations.slice(1), callback);
         } else if (operation[0] === 'setStyle') {