Updated context lost / restored handlers

Author: photonstorm

src/display/mask/BitmapMask.js

@@ -5,6 +5,7 @@
  */
 
 var Class = require('../../utils/Class');
+var GameEvents = require('../../core/events');
 
 /**
  * @classdesc
@@ -159,7 +160,7 @@ var BitmapMask = new Class({
             this.mainFramebuffer = renderer.createFramebuffer(width, height, this.mainTexture, true);
             this.maskFramebuffer = renderer.createFramebuffer(width, height, this.maskTexture, true);
 
-            renderer.onContextRestored(function (renderer)
+            scene.sys.game.events.on(GameEvents.CONTEXT_RESTORED, function (renderer)
             {
                 var width = renderer.width;
                 var height = renderer.height;

src/gameobjects/text/static/Text.js

@@ -8,7 +8,7 @@ var AddToDOM = require('../../../dom/AddToDOM');
 var CanvasPool = require('../../../display/canvas/CanvasPool');
 var Class = require('../../../utils/Class');
 var Components = require('../../components');
-var CONST = require('../../../const');
+var GameEvents = require('../../../core/events');
 var GameObject = require('../../GameObject');
 var GetTextSize = require('../GetTextSize');
 var GetValue = require('../../../utils/object/GetValue');
@@ -288,13 +288,10 @@ var Text = new Class({
             this.lineSpacing = style.lineSpacing;
         }
 
-        if (scene.sys.game.config.renderType === CONST.WEBGL)
+        scene.sys.game.events.on(GameEvents.CONTEXT_RESTORED, function ()
         {
-            scene.sys.game.renderer.onContextRestored(function ()
-            {
-                this.dirty = true;
-            }, this);
-        }
+            this.dirty = true;
+        }, this);
     },
 
     /**

src/gameobjects/tilesprite/TileSprite.js

@@ -7,7 +7,7 @@
 var CanvasPool = require('../../display/canvas/CanvasPool');
 var Class = require('../../utils/Class');
 var Components = require('../components');
-var CONST = require('../../const');
+var GameEvents = require('../../core/events');
 var GameObject = require('../GameObject');
 var GetPowerOfTwo = require('../../math/pow2/GetPowerOfTwo');
 var Smoothing = require('../../display/canvas/Smoothing');
@@ -275,17 +275,15 @@ var TileSprite = new Class({
         this.setOriginFromFrame();
         this.initPipeline();
 
-        if (scene.sys.game.config.renderType === CONST.WEBGL)
+        scene.sys.game.events.on(GameEvents.CONTEXT_RESTORED, function (renderer)
         {
-            scene.sys.game.renderer.onContextRestored(function (renderer)
-            {
-                var gl = renderer.gl;
-
-                this.dirty = true;
-                this.fillPattern = null;
-                this.fillPattern = renderer.createTexture2D(0, gl.LINEAR, gl.LINEAR, gl.REPEAT, gl.REPEAT, gl.RGBA, this.fillCanvas, this.potWidth, this.potHeight);
-            }, this);
-        }
+            var gl = renderer.gl;
+
+            this.dirty = true;
+            this.fillPattern = null;
+            this.fillPattern = renderer.createTexture2D(0, gl.LINEAR, gl.LINEAR, gl.REPEAT, gl.REPEAT, gl.RGBA, this.fillCanvas, this.potWidth, this.potHeight);
+
+        }, this);
     },
 
     /**

src/renderer/canvas/CanvasRenderer.js

@@ -277,30 +277,6 @@ var CanvasRenderer = new Class({
         }
     },
 
-    /**
-     * A NOOP method for handling lost context. Intentionally empty.
-     *
-     * @method Phaser.Renderer.Canvas.CanvasRenderer#onContextLost
-     * @since 3.0.0
-     *
-     * @param {function} callback - Ignored parameter.
-     */
-    onContextLost: function ()
-    {
-    },
-
-    /**
-     * A NOOP method for handling restored context. Intentionally empty.
-     *
-     * @method Phaser.Renderer.Canvas.CanvasRenderer#onContextRestored
-     * @since 3.0.0
-     *
-     * @param {function} callback - Ignored parameter.
-     */
-    onContextRestored: function ()
-    {
-    },
-
     /**
      * Resets the transformation matrix of the current context to the identity matrix, thus resetting any transformation.
      *

src/renderer/webgl/WebGLRenderer.js

@@ -305,10 +305,25 @@ var WebGLRenderer = new Class({
          */
         this.scissorStack = [];
 
+        /**
+         * The handler to invoke when the context is lost.
+         * This should not be changed and is set in the boot method.
+         *
+         * @name Phaser.Renderer.WebGL.WebGLRenderer#contextLostHandler
+         * @type {function}
+         * @since 3.19.0
+         */
         this.contextLostHandler = NOOP;
-        this.contextRestoredHandler = NOOP;
 
-        // These are initialized post context creation
+        /**
+         * The handler to invoke when the context is restored.
+         * This should not be changed and is set in the boot method.
+         *
+         * @name Phaser.Renderer.WebGL.WebGLRenderer#contextRestoredHandler
+         * @type {function}
+         * @since 3.19.0
+         */
+        this.contextRestoredHandler = NOOP;
 
         /**
          * The underlying WebGL context of the renderer.
@@ -552,8 +567,6 @@ var WebGLRenderer = new Class({
 
         this.contextLostHandler = function (event)
         {
-            console.log('ctx lost handler');
-
             _this.contextLost = true;
 
             _this.game.events.emit(GameEvents.CONTEXT_LOST, _this);
@@ -771,42 +784,6 @@ var WebGLRenderer = new Class({
         return this;
     },
 
-    /**
-     * Adds a callback to be invoked when the WebGL context has been restored by the browser.
-     *
-     * @method Phaser.Renderer.WebGL.WebGLRenderer#onContextRestored
-     * @since 3.0.0
-     *
-     * @param {WebGLContextCallback} callback - The callback to be invoked on context restoration.
-     * @param {object} target - The context of the callback.
-     *
-     * @return {this} This WebGLRenderer instance.
-     */
-    onContextRestored: function (callback, target)
-    {
-        this.restoredContextCallbacks.push([ callback, target ]);
-
-        return this;
-    },
-
-    /**
-     * Adds a callback to be invoked when the WebGL context has been lost by the browser.
-     *
-     * @method Phaser.Renderer.WebGL.WebGLRenderer#onContextLost
-     * @since 3.0.0
-     *
-     * @param {WebGLContextCallback} callback - The callback to be invoked on context loss.
-     * @param {object} target - The context of the callback.
-     *
-     * @return {this} This WebGLRenderer instance.
-     */
-    onContextLost: function (callback, target)
-    {
-        this.lostContextCallbacks.push([ callback, target ]);
-
-        return this;
-    },
-
     /**
      * Checks if a WebGL extension is supported
      *

src/tilemaps/staticlayer/StaticTilemapLayer.js

@@ -6,7 +6,7 @@
 
 var Class = require('../../utils/Class');
 var Components = require('../../gameobjects/components');
-var CONST = require('../../const');
+var GameEvents = require('../../core/events');
 var GameObject = require('../../gameobjects/GameObject');
 var StaticTilemapLayerRender = require('./StaticTilemapLayerRender');
 var TilemapComponents = require('../components');
@@ -359,13 +359,10 @@ var StaticTilemapLayer = new Class({
 
         this.initPipeline('TextureTintPipeline');
 
-        if (scene.sys.game.config.renderType === CONST.WEBGL)
+        scene.sys.game.events.on(GameEvents.CONTEXT_RESTORED, function ()
         {
-            scene.sys.game.renderer.onContextRestored(function ()
-            {
-                this.updateVBOData();
-            }, this);
-        }
+            this.updateVBOData();
+        }, this);
     },
 
     /**