Merge pull request #3420 from pandamicro/develop

Fix issues reported by QA

Author: pandamicro

cocos2d/core/utils/CCProfiler.js

@@ -86,9 +86,9 @@ cc.profiler = (function () {
 
             if (_showFPS) {
                 var mode = cc._renderType === cc.game.RENDER_TYPE_CANVAS ? "\n canvas" : "\n webgl";
-                _SPFLabel.innerText = _lastSPF.toFixed(3);
-                _FPSLabel.innerText = _frameRate.toFixed(1).toString() + mode;
-                _drawsLabel.innerText = (0 | cc.g_NumberOfDraws).toString();
+                _SPFLabel.innerHTML = _lastSPF.toFixed(3);
+                _FPSLabel.innerHTML = _frameRate.toFixed(1).toString() + mode;
+                _drawsLabel.innerHTML = (0 | cc.g_NumberOfDraws).toString();
             }
         }
     };

cocos2d/particle/CCParticleBatchNode.js

@@ -154,7 +154,7 @@ cc.ParticleBatchNode = cc.Node.extend(/** @lends cc.ParticleBatchNode# */{
 
         var cmd = this._renderCmd;
         cmd.visit(parent && parent._renderCmd);
-        renderer.pushRenderCommand(cmd);
+        cc.renderer.pushRenderCommand(cmd);
         cmd._dirtyFlag = 0;
     },
 

cocos2d/render-texture/CCRenderTexture.js

@@ -140,6 +140,7 @@ cc.RenderTexture = cc.Node.extend(/** @lends cc.RenderTexture# */{
         var renderer = cc.renderer, cmd = this._renderCmd;
 
         cmd.visit(parent && parent._renderCmd);
+        renderer.pushRenderCommand(cmd);
         this.sprite.visit(this);
         cmd._dirtyFlag = 0;
     },

cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js

@@ -100,7 +100,7 @@
             for (var i = 0; i < locChildren.length; i++) {
                 var getChild = locChildren[i];
                 if (getChild !== node.sprite) {
-                    getChild._renderCmd.visit(node.sprite._renderCmd);    //TODO it's very Strange
+                    getChild.visit(node.sprite);    //TODO it's very Strange
                 }
             }
             node.end();
@@ -363,9 +363,4 @@
         gl.clearDepth(depthClearValue);
         node.end();
     };
-
-    proto.visit = function (parentCmd) {
-        this._syncStatus(parentCmd);
-        cc.renderer.pushRenderCommand(this);
-    };
 })();

extensions/ccui/uiwidgets/UIVideoPlayer.js

@@ -420,14 +420,17 @@ ccui.VideoPlayer.EventType = {
             scaleY = scaleY / dpr;
         }
         if (this._loaded === false) return;
-        var cw = node._contentSize.width,
+        var containerStyle = cc.game.container.style,
+            offsetX = parseInt(containerStyle.paddingLeft),
+            offsetY = parseInt(containerStyle.paddingBottom),
+            cw = node._contentSize.width,
             ch = node._contentSize.height;
         var a = t.a * scaleX,
             b = t.b,
             c = t.c,
             d = t.d * scaleY,
-            tx = t.tx * scaleX - cw / 2 + cw * node._scaleX / 2 * scaleX,
-            ty = t.ty * scaleY - ch / 2 + ch * node._scaleY / 2 * scaleY;
+            tx = offsetX + t.tx * scaleX - cw / 2 + cw * node._scaleX / 2 * scaleX,
+            ty = offsetY + t.ty * scaleY - ch / 2 + ch * node._scaleY / 2 * scaleY;
         var matrix = "matrix(" + a + "," + b + "," + c + "," + d + "," + tx + "," + -ty + ")";
         this._video.style["transform"] = matrix;
         this._video.style["-webkit-transform"] = matrix;

extensions/ccui/uiwidgets/UIWebView.js

@@ -363,14 +363,17 @@ ccui.WebView.EventType = {
             scaleY = scaleY / dpr;
         }
         if (this._loaded === false) return;
-        var cw = node._contentSize.width,
+        var containerStyle = cc.game.container.style,
+            offsetX = parseInt(containerStyle.paddingLeft),
+            offsetY = parseInt(containerStyle.paddingBottom),
+            cw = node._contentSize.width,
             ch = node._contentSize.height;
         var a = t.a * scaleX,
             b = t.b,
             c = t.c,
             d = t.d * scaleY,
-            tx = t.tx * scaleX - cw / 2 + cw * node._scaleX / 2 * scaleX,
-            ty = t.ty * scaleY - ch / 2 + ch * node._scaleY / 2 * scaleY;
+            tx = offsetX + t.tx * scaleX - cw / 2 + cw * node._scaleX / 2 * scaleX,
+            ty = offsetY + t.ty * scaleY - ch / 2 + ch * node._scaleY / 2 * scaleY;
         var matrix = "matrix(" + a + "," + b + "," + c + "," + d + "," + tx + "," + -ty + ")";
         this._div.style["transform"] = matrix;
         this._div.style["-webkit-transform"] = matrix;