Merge pull request phaserjs#5193 from scott20145/master

Fix nested mask behaviour for Phaser.CANVAS mode

Author: photonstorm

src/gameobjects/container/ContainerCanvasRenderer.js

@@ -55,7 +55,11 @@ var ContainerCanvasRenderer = function (renderer, container, interpolationPercen
     var alpha = container._alpha;
     var scrollFactorX = container.scrollFactorX;
     var scrollFactorY = container.scrollFactorY;
-
+    
+    if (container.mask) {
+        container.mask.preRenderCanvas(renderer, null, camera);
+    }
+    
     for (var i = 0; i < children.length; i++)
     {
         var child = children[i];
@@ -86,6 +90,11 @@ var ContainerCanvasRenderer = function (renderer, container, interpolationPercen
         child.setAlpha(childAlpha);
         child.setScrollFactor(childScrollFactorX, childScrollFactorY);
     }
+    
+    if (container.mask) {
+        container.mask.postRenderCanvas(renderer);
+    }
+
 };
 
 module.exports = ContainerCanvasRenderer;

src/renderer/canvas/CanvasRenderer.js

@@ -766,9 +766,17 @@ var CanvasRenderer = new Class({
         ctx.globalAlpha = alpha;
 
         ctx.imageSmoothingEnabled = !(!this.antialias || frame.source.scaleMode);
+        
+        if (sprite.mask) {
+            sprite.mask.preRenderCanvas(this, sprite, camera);
+        }
 
         ctx.drawImage(frame.source.image, frameX, frameY, frameWidth, frameHeight, x, y, frameWidth / res, frameHeight / res);
 
+        if (sprite.mask) {
+            sprite.mask.postRenderCanvas(this, sprite, camera);
+        }
+        
         ctx.restore();
     },