From 7e1cfced8fbb06a1638da797e8530f8691d6af5e Mon Sep 17 00:00:00 2001
From: dhrname <dhrname@users.sourceforge.jp>
Date: Wed, 7 Oct 2015 23:01:49 +0900
Subject: [PATCH] Modify the setFrame method of the  object

---
 org/w3c/dom/smil.js          | 33 ++++++++++++++++++++-------------
 tool/Spec/spec/SvgDomSpec.js | 33 +++++++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index df589a3..f52cc67 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -1191,23 +1191,30 @@ base("$calcMode").up("$attribute").mix( {
 
 /*$svgEventオブジェクトは、SVGEvent発火を監視するためのオブジェクト*/
 base("$frame").up("$svgEvent").mix( {
+  /*イベントのスケジュール記録*/
   log: [],
-  setFrame: function(num) {
-    for (var i=0;i<this.log.length;++i) {
-      /*ログを検索して、過去にイベントを実行したものは除外する*/
-      if (this.log[i].frame <= num) {
-        return this.$frame.setFrame(num);
-      }
+  
+  /*タイムラインの長さのキャッシュ*/
+  length: 0,
+  
+  setFrame: function (num) {
+    /*キャッシュのlengthプロパティを使って、再びログの計算をさせないようにする*/
+    if (this.length === this.timelines.length) {
+      return this.$frame.setFrame(num);
     }
+    this.length = this.timelines.length;
     for (var i=0;i<this.timelines.length;++i) {
       var timeline = this.timelines[i];
-      if (timeline.begin <= num) {
-        /*beginEventを発動させる*/
-        this.log.push( {
-          frame: num,
-          target: timeline.target
-        } );
-      }
+      this.log.push( {
+        frame: timeline.begin,
+        eventType: "begin",
+        target: timeline.target
+      },
+      {
+        frame: timeline.begin+timeline.activeTime,
+        eventType: "end",
+        target: timeline.target
+      });
     }
     return this.$frame.setFrame(num);
   }
diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index 27b7520..a216bde 100644
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -4204,6 +4204,7 @@ describe("SMIL Animation Spec", function() {
         } );
       /*境界条件を調べておく (limit value analysis)*/
       it("should be this for the value  (limit value analysis)", function() {
+        expect(frame.length).toBe(0);
         expect(frame.log).toEqual([]);
         frame.setFrame(0);
         expect(frame.log).toEqual([]);
@@ -4216,32 +4217,48 @@ describe("SMIL Animation Spec", function() {
         frame.setFrame(0);
         expect(frame.log).toEqual([
           { frame: 0,
+            eventType: "begin",
+            target: ele
+          },
+          { frame: 0,
+            eventType: "end",
             target: ele
           }
         ]);
+      } );
+      /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
+      it("should be this for the value (the valid partion )", function() {
+        frame.length = 0;
+        frame.log = [];
+        base("$frame").addLine( base("$frame").$begin.up().mix({
+          timelines: [],
+          begin: 0,
+          activeTime: 0,
+          target: ele
+        }) );
         frame.setFrame(0);
         expect(frame.log).toEqual([
           { frame: 0,
+            eventType: "begin",
             target: ele
-          }
-        ]);
-        
-        frame.setFrame(1);
-        expect(frame.log).toEqual([
+          },
           { frame: 0,
+            eventType: "end",
             target: ele
           }
         ]);
         frame.setFrame(1);
         expect(frame.log).toEqual([
           { frame: 0,
+            eventType: "begin",
+            target: ele
+          },
+          { frame: 0,
+            eventType: "end",
             target: ele
           }
         ]);
       } );
-      /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
-      it("should be this for the value (the valid partion )", function() {
-      } );
     } );
     describe("Event", function() {
       var $animate, ele, frame, p;
-- 
2.11.0