From 2d3855fa2496c3c07c781b46e4eafb1956c43961 Mon Sep 17 00:00:00 2001
From: dhrname <dhrname@users.sourceforge.jp>
Date: Sat, 16 Apr 2016 23:17:32 +0900
Subject: [PATCH] Lighten the tocall method

---
 org/w3c/dom/smil.js | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index d9563ab..c696dd8 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -1183,16 +1183,6 @@ base("$calcMode").up("$attribute").mix( {
   /*進捗率advanceから、呈示値を求める*/
   tocall: function(advance) {
     var tf = this.funcs;
-    if (this.mode === "discrete") {
-      var result = "";
-      for (var i=0;i<tf.length;++i) {
-        var tfi = tf[i];
-        if (advance >= tfi.startKeyTime) {
-          result = tfi(advance);
-        }
-      }
-      return result;
-    }
     for (var i=0;i<tf.length;++i) {
       var tfi = tf[i];
       /*keyTime（keyTimes属性で指定されたような値）で実行するかどうかを判別*/
@@ -1431,7 +1421,32 @@ base("$calcMode").up("$attribute").mix( {
     if (/^(?:display|class|edgeMode|(gradient|marker|pattern|maskContent|mask|patternContent|primitive)Units|in|in2|method|mode|operator|preserveAspectRatio|result|spacing|spreadMethod|stitchTiles|target|type|xlink:href|yChannelSelector|color-interpolation|(clip|fill)-rule|cursor|filter|font-(family|stretch|style|variant)|image-rendering|marker-(end|mid|start)|mask|overflow|pointer-events|shape-rendering|stroke-(linecap|linejoin)|text-(anchor|decoration|rendering)|visibility)$/.test(this.attrName) ) {
       this.mode = "discrete";
     }
+  },
+  
+  /*discreteモードのために、setKeyメソッドをオーバライド*/
+  setKey: function() {
+    var s = this.$attribute.setKey.apply(this, arguments);
+    if (this.mode === "discrete") {
+      this._tocall = this.tocall;
+      this.tocall = function (advance) {
+                      var tf = this.funcs;
+                      var result = "";
+                      for (var i=0;i<tf.length;++i) {
+                        var tfi = tf[i];
+                        if (advance >= tfi.startKeyTime) {
+                          result = tfi(advance);
+                        }
+                      }
+                            console.log(this.mode);
+                      advance = tf = tfi = void 0;
+                      return result;
+      };
+    } else {
+      this.tocall = this._tocall || this.tocall;
+    }
+    return s;
   }
+    
 
 /*initメソッドに追加処理
  * onメソッドについては、base.jsを参照のこと*/
-- 
2.11.0