Try to handle GL context losses

diff --git a/js/map.js b/js/map.js
index cf095cb13f3d199e4226791a4fbde8dfa5ebcb9c..ec9a05c0c0d324fdaf8384552d2bb8fd197e082b 100644 (file)
--- a/js/map.js
+++ b/js/map.js
@@ -72,11 +72,19 @@ function initMap() {
               gGLMapCanvas.getContext("experimental-webgl", {depth: false});
   }
   catch(e) {}
-  // If we don't have a GL context, give up now
   if (!gMap.gl) {
+    // If we don't have a GL context, give up now
     showGLWarningDialog();
     gMap.gl = null;
   }
+  else {
+    // GL context can be lost at any time, handle that.
+    // See http://www.khronos.org/webgl/wiki/HandlingContextLost
+    gGLMapCanvas.addEventListener("webglcontextlost",
+                                  gMap.handleContextLost, false);
+    gGLMapCanvas.addEventListener("webglcontextrestored",
+                                  gMap.handleContextRestored, false);
+  }
   gTrackCanvas = document.getElementById("track");
   gTrackContext = gTrackCanvas.getContext("2d");
   if (!gMap.activeMap)
@@ -235,7 +243,7 @@ var gMap = {
     '  gl_Position = vec4(clipSpace * vec2(1, -1), 0, 1);\n' +
     '  vTextureCoord = aTextureCoord;\n' +
     '}'; },
-  getFragShaderSource:function() {
+  getFragShaderSource: function() {
     return 'varying highp vec2 vTextureCoord;\n\n' +
     'uniform sampler2D uImage;\n\n' +
     'void main(void) {\n' +
@@ -312,8 +320,13 @@ var gMap = {
       gMap.glTxCleanIntervalID = window.setInterval(gMap.cleanTextures, 30 * 1000);
     }
 
-    var throwEv = new CustomEvent("mapinit-done");
-    gAction.dispatchEvent(throwEv);
+    if (!gAppInitDone) {
+      // We may be called when context was lost and destroyed,
+      // only send event when we are in app startup
+      // (gAppInitDone is set to true right after we return this event).
+      var throwEv = new CustomEvent("mapinit-done");
+      gAction.dispatchEvent(throwEv);
+    }
   },
 
   draw: function() {
@@ -503,9 +516,21 @@ var gMap = {
         }
       }
       console.log("Cleaning complete, " + Object.keys(gMap.glTextures).length + " textures left)");
-      //clearInterval(gMap.glTxCleanIntervalID);
     }
   },
+
+  handleContextLost: function(event) {
+    event.preventDefault();
+    // GL context is gone, let's reset everything that depends on it.
+    clearInterval(gMap.glTxCleanIntervalID);
+    gMap.glTextures = {};
+  },
+
+  handleContextRestored: function(event) {
+    // When GL context is back, init GL again and draw.
+    gMap.initGL();
+    gMap.draw();
+  },
 }
 
 // Using scale(x, y) together with drawing old data on scaled canvas would be an improvement for zooming.

diff --git a/js/ui.js b/js/ui.js
index 7f0afd5c9890e76e0d6f6a193441da17e3df813a..0e0650f1e44b095848a6b2ac2d2369dff4c1ecf6 100644 (file)
--- a/js/ui.js
+++ b/js/ui.js
@@ -7,6 +7,7 @@ window.indexedDB = window.indexedDB || window.webkitIndexedDB || window.mozIndex
 window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;
 
 var mainDB;
+var gAppInitDone = false;
 var gUIHideCountdown = 0;
 var gWaitCounter = 0;
 var gAction, gActionLabel;
@@ -66,6 +67,7 @@ function postInit(aEvent) {
   gAction.removeEventListener(aEvent.type, postInit, false);
   console.log("init done, draw map.");
   gMapPrefsLoaded = true;
+  gAppInitDone = true;
   //gMap.resizeAndDraw();  <-- HACK: This triggers bug 1001853, work around with a delay.
   window.setTimeout(gMap.resizeAndDraw, 100);
   gActionLabel.textContent = "";

diff --git a/manifest.appcache b/manifest.appcache
index 1133f56e9a223696a1c222d43794853f923d388a..3cbe3f0cbc88841ff582c62594077279111c5d61 100644 (file)
--- a/manifest.appcache
+++ b/manifest.appcache
@@ -1,6 +1,7 @@
 CACHE MANIFEST
 
-# 2014-05-12
+# 2014-06-29
+index.html
 manifest.webapp
 js/map.js
 js/ui.js