Changeset 12594

Timestamp:

02/21/08 11:09:52 (11 months ago)

Author:

elazutkin

Message:

Preventing IE from allocating large memory chunks for images in
cases of trivial transformations (scaling + translating).
Fixes #5852, !strict

Files:

• dojox/trunk/gfx/vml.js (modified) (2 diffs)

dojox/trunk/gfx/vml.js

@@ -432 +432 @@
                 var shape = this.shape = dojox.gfx.makeParameters(this.shape, newShape);
                 this.bbox = null;
-                var firstChild = this.rawNode.firstChild;
-        firstChild.src = shape.src;
-        if(shape.width || shape.height){
-                        firstChild.style.width  = shape.width;
-                        firstChild.style.height = shape.height;
-        }
+                this.rawNode.firstChild.src = shape.src;
                 return this.setTransform(this.matrix);  // self
         },
+        _setDimensions: function(s, w, h){
+                if(w || h){
+                        s.width  = w + "px";
+                        s.height = h + "px";
+                }
+        },
+        _resetImage: function(){
+                var s = this.rawNode.firstChild.style,
+                        shape = this.shape;
+                s.left = "0px";
+                s.top  = "0px";
+                this._setDimensions(s, shape.width, shape.height);
+        },
         _applyTransform: function() {
-                var matrix = this._getRealMatrix();
-                if(!matrix) return this;
-                matrix = dojox.gfx.matrix.multiply(matrix, {dx: this.shape.x, dy: this.shape.y});
-                var f = this.rawNode.filters["DXImageTransform.Microsoft.Matrix"];
-                f.M11 = matrix.xx;
-                f.M12 = matrix.xy;
-                f.M21 = matrix.yx;
-                f.M22 = matrix.yy;
-                f.Dx  = matrix.dx;
-                f.Dy  = matrix.dy;
+                var matrix = this._getRealMatrix(),
+                        img = this.rawNode.firstChild,
+                        s = img.style,
+                        shape = this.shape;
+                if(matrix){
+                        matrix = dojox.gfx.matrix.multiply(matrix, {dx: shape.x, dy: shape.y});
+                }else{
+                        matrix = dojox.gfx.matrix.normalize({dx: shape.x, dy: shape.y});
+                }
+                if(matrix.xy == 0 && matrix.yx == 0 && matrix.xx > 0 && matrix.yy > 0){
+                        // special case to avoid filters
+                        this.rawNode.style.filter = "";
+                        s.left = Math.floor(matrix.dx) + "px";
+                        s.top  = Math.floor(matrix.dy) + "px";
+                        this._setDimensions(s, Math.floor(matrix.xx * shape.width), Math.floor(matrix.yy * shape.height));
+                }else{
+                        this._resetImage();
+                        var f = this.rawNode.filters["DXImageTransform.Microsoft.Matrix"];
+                        if(f){
+                                f.M11 = matrix.xx;
+                                f.M12 = matrix.xy;
+                                f.M21 = matrix.yx;
+                                f.M22 = matrix.yy;
+                                f.Dx = matrix.dx;
+                                f.Dy = matrix.dy;
+                        }else{
+                                this.rawNode.style.filter = "progid:DXImageTransform.Microsoft.Matrix(M11=" + matrix.xx + 
+                                        ", M12=" + matrix.xy + ", M21=" + matrix.yx + ", M22=" + matrix.yy + 
+                                        ", Dx=" + matrix.dx + ", Dy=" + matrix.dy + ")";
+                        }
+                }
                 return this;
         }
@@ -1079 +1108 @@
                 node.style.width  = this.rawNode.style.width;
                 node.style.height = this.rawNode.style.height;
-                node.style.filter = "progid:DXImageTransform.Microsoft.Matrix(M11=1, M12=0, M21=0, M22=1, Dx=0, Dy=0)";
+                //node.style.filter = "progid:DXImageTransform.Microsoft.Matrix(M11=1, M12=0, M21=0, M22=1, Dx=0, Dy=0)";
                 var img  = this.rawNode.ownerDocument.createElement('img');
+                img.style.position = "relative";
                 node.appendChild(img);
                 shape.setRawNode(node);