avoid potential infinite loop when replotting due to wrong gl dims

Author: etpinard

src/plot_api/plot_api.js

@@ -243,21 +243,22 @@ exports.plot = function(gd, data, layout, config) {
                 .attr('width', fullLayout.width)
                 .attr('height', fullLayout.height);
 
-
             var regl = fullLayout._glcanvas.data()[0].regl;
             if(regl) {
-                if(
-                    fullLayout.width !== regl._gl.drawingBufferWidth ||
+                // Unfortunately, this can happen when relayouting to large
+                // width/height on some browsers.
+                if(fullLayout.width !== regl._gl.drawingBufferWidth ||
                     fullLayout.height !== regl._gl.drawingBufferHeight
                  ) {
-                    // Unfortunately, this can happen when relayouting to large
-                    // width/height on some browsers.
-                    Lib.log([
-                        'WebGL context buffer and canvas dimensions do not match,',
-                        'due to browser/WebGL bug.',
-                        'Clearing graph and plotting again.'
-                    ].join(' '));
-                    exports.newPlot(gd, gd.data, gd.layout);
+                    var msg = 'WebGL context buffer and canvas dimensions do not match due to browser/WebGL bug.';
+                    if(fullLayout._redrawFromWrongGlDimensions) {
+                        Lib.error(msg);
+                    } else {
+                        Lib.log(msg + ' Clearing graph and plotting again.');
+                        fullLayout._redrawFromWrongGlDimensions = 1;
+                        Plots.cleanPlot([], {}, gd._fullData, fullLayout, gd.calcdata);
+                        exports.plot(gd, gd.data, gd.layout);
+                    }
                 }
             }
         }

test/jasmine/tests/splom_test.js

@@ -697,20 +697,22 @@ describe('Test splom interactions:', function() {
             expect(gl.drawingBufferHeight).toBe(h, msg);
         }
 
-        spyOn(plotApi, 'newPlot').and.callThrough();
+        spyOn(plotApi, 'plot').and.callThrough();
         spyOn(Lib, 'log');
 
         Plotly.plot(gd, fig).then(function() {
-            expect(plotApi.newPlot).toHaveBeenCalledTimes(0);
+            expect(plotApi.plot).toHaveBeenCalledTimes(0);
             expect(Lib.log).toHaveBeenCalledTimes(0);
+            expect(gd._fullLayout._redrawFromWrongGlDimensions).toBeUndefined();
             assertDims('base', 600, 500);
 
             return Plotly.relayout(gd, {width: 4810, height: 3656});
         })
         .then(function() {
-            expect(plotApi.newPlot).toHaveBeenCalledTimes(1);
+            expect(plotApi.plot).toHaveBeenCalledTimes(1);
             expect(Lib.log)
-                .toHaveBeenCalledWith('WebGL context buffer and canvas dimensions do not match, due to browser/WebGL bug. Clearing graph and plotting again.');
+                .toHaveBeenCalledWith('WebGL context buffer and canvas dimensions do not match due to browser/WebGL bug. Clearing graph and plotting again.');
+            expect(gd._fullLayout._redrawFromWrongGlDimensions).toBe(1);
             assertDims('base', 4810, 3656);
         })
         .catch(failTest)