Merge branch 'BlendModes'

Author: David Gillen

src/easeljs/display/Container.js

@@ -705,4 +705,4 @@ this.createjs = this.createjs||{};
 
 
 	createjs.Container = createjs.promote(Container, "DisplayObject");
-}());
+}());

src/easeljs/display/DisplayObject.js

@@ -153,7 +153,7 @@ this.createjs = this.createjs||{};
 		 * If a cache is active, this returns the canvas that holds the image of this display object. See {{#crossLink "DisplayObject/cache:method"}}{{/crossLink}}
 		 * for more information. Use this to display the result of a cache. This will be a HTMLCanvasElement unless special cache rules have been deliberately enabled for this cache.
 		 * @property cacheCanvas
-		 * @type {HTMLCanvasElement | Object}
+		 * @type {HTMLCanvasElement | WebGLTexture | Object}
 		 * @default null
 		 * @readonly
 		 **/
@@ -457,6 +457,15 @@ this.createjs = this.createjs||{};
 		 * @default 0
 		 */
 		this._webGLRenderStyle = DisplayObject._StageGL_NONE;
+
+		/**
+		 * Storage for the calculated position of an object in StageGL. If not using StageGL, you can null it to save memory.
+		 * @property _glMtx
+		 * @protected
+		 * @type {Matrix2D}
+		 * @default null
+		 */
+		this._glMtx = new createjs.Matrix2D();
 	}
 	var p = createjs.extend(DisplayObject, createjs.EventDispatcher);
 
@@ -751,7 +760,7 @@ this.createjs = this.createjs||{};
 	 **/
 	p.draw = function(ctx, ignoreCache) {
 		var cache = this.bitmapCache;
-		if(cache && !ignoreCache) {
+		if (cache && !ignoreCache) {
 			return cache.draw(ctx);
 		}
 		return false;
@@ -826,8 +835,10 @@ this.createjs = this.createjs||{};
 	 * @param {Object} [options=undefined] Specify additional parameters for the cache logic
 	 **/
 	p.cache = function(x, y, width, height, scale, options) {
-		if(!this.bitmapCache){
+		if (!this.bitmapCache){
 			this.bitmapCache = new createjs.BitmapCache();
+		} else {
+			this.bitmapCache._autoGenerated = false;
 		}
 		this.bitmapCache.define(this, x, y, width, height, scale, options);
 	};
@@ -855,7 +866,7 @@ this.createjs = this.createjs||{};
 	 * whatwg spec on compositing</a>.
 	 **/
 	p.updateCache = function(compositeOperation) {
-		if(!this.bitmapCache) {
+		if (!this.bitmapCache) {
 			throw "cache() must be called before updateCache()";
 		}
 		this.bitmapCache.update(compositeOperation);
@@ -866,7 +877,7 @@ this.createjs = this.createjs||{};
 	 * @method uncache
 	 **/
 	p.uncache = function() {
-		if(this.bitmapCache) {
+		if (this.bitmapCache) {
 			this.bitmapCache.release();
 			this.bitmapCache = undefined;
 		}
@@ -996,8 +1007,9 @@ this.createjs = this.createjs||{};
 	 * @return {Matrix2D} A matrix representing this display object's transform.
 	 **/
 	p.getMatrix = function(matrix) {
-		var o = this, mtx = matrix&&matrix.identity() || new createjs.Matrix2D();
-		return o.transformMatrix ?  mtx.copy(o.transformMatrix) : mtx.appendTransform(o.x, o.y, o.scaleX, o.scaleY, o.rotation, o.skewX, o.skewY, o.regX, o.regY);
+		var o = this, mtx = matrix || new createjs.Matrix2D();
+		return o.transformMatrix ?  mtx.copy(o.transformMatrix) :
+			(mtx.identity() && mtx.appendTransform(o.x, o.y, o.scaleX, o.scaleY, o.rotation, o.skewX, o.skewY, o.regX, o.regY));
 	};
 
 	/**
@@ -1254,6 +1266,7 @@ this.createjs = this.createjs||{};
 		o.hitArea = this.hitArea;
 		o.cursor = this.cursor;
 		o._bounds = this._bounds;
+		o._webGLRenderStyle = this._webGLRenderStyle;
 		return o;
 	};