From: dhrname <dhrname@users.sourceforge.jp>
Date: Wed, 21 Jan 2015 14:21:25 +0000 (+0900)
Subject: New  object for SMIL Animation
X-Git-Tag: version22~362
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5627645c45292686ac8597149f222652ce1f7681;p=sie%2Fsie.git

New  object for SMIL Animation
---

diff --git a/document/ufltimatest.html b/document/ufltimatest.html
index 554a0f5..f4282ec 100644
--- a/document/ufltimatest.html
+++ b/document/ufltimatest.html
@@ -22,7 +22,6 @@
  <li><a href="help.html">ヘルプ</a></li>
 </ol>
 <object data="svg_sample/zeimusu_sakura_.svg" type="image/svg+xml" width="1000" height="1000"></object>
-<object data="svg_sample/funcprotosample.svg" type="image/svg+xml" width="500" height="500"></object>
 <img src="svg_sample/zeimusu_sakura_.svg" width="1000" height="1000"></img>
 <p><object data="svg_sample/sie-logo.svg" type="image/svg+xml" width="120%" height="120%"></object></p>
 <p><img src="svg_sample/sie-logo.svg" width="120%" height="120%"></img></p>
@@ -60,4 +59,4 @@
  *
  * ***** END LICENSE BLOCK ***** */-->
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index ee0351a..83648dd 100644
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -126,4 +126,41 @@ base("$event").up("TimeEvents").mix( {
     this.detail = detailArg;
   }
 } );
-//#endif // _SMIL_IDL_
\ No newline at end of file
+
+if(window.requestAnimationFrame && requestAnimationFrame
+    && !document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Animation", "1.1")) {
+  /*IE11などSMILアニメーションに対応していないブラウザ用*/
+  
+  /*$frame オブジェクト
+   * 全体のフレームの管理を行う
+   */
+  base("$frame").mix ( {
+    /*フレームレート。１ミリ秒何フレームか。計算を省略するためミリ秒使用*/
+    fpms: 0.024,
+    /*タイムラインのリスト (時間区間の設定ができる）*/
+    timelines: [],
+    /*setFrame メソッド
+     * フレーム数を数値num まで進めるか、戻す*/
+    setFrame: function( /*number*/ num) {
+      var timelines = this.timelines; // タイムラインのリスト
+      for (var i=0;i<timelines.length;++i) {
+        timelines[i].setFrame(num);
+      }
+    },
+    /*addLineメソッド
+     * タイムラインを追加する*/
+    addLine: function( /*number*/ begin, /*number*/ activateDuration ) {
+      if((begin === null) || (activateDuration === null)) {
+        /*どちらの引数も未確認の場合、タイムラインは追加されない*/
+        return false;
+      }
+      this.timelines.push( this.up("$line").mix( {
+          begin:      begin,
+          activetime: activateDuration
+        } )
+      );
+      return true;
+    }
+  } );
+}
+//#endif // _SMIL_IDL_
diff --git a/org/w3c/dom/svg.js b/org/w3c/dom/svg.js
index b69d5bf..87bd753 100644
--- a/org/w3c/dom/svg.js
+++ b/org/w3c/dom/svg.js
@@ -6676,4 +6676,4 @@ NAIBU.textToSVG = function ( /*string*/ source, /*float*/ w, /*float*/ h) {
 };
 NAIBU.addEvent("unload", unsvgtovml);
 //IEならばtrue
-NAIBU.isMSIE = /*@cc_on!@*/false;
\ No newline at end of file
+NAIBU.isMSIE = /*@cc_on!@*/false;
diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index dcabeec..564440f 100644
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2048,13 +2048,24 @@ describe("SVG Spec in JavaScript", function() {
   });
 });
 describe("SMIL Animation Spec", function() {
-  /*境界条件を調べておく (limit value analysis, when it calls a insertBefore method)*/
-  it("should be this for the value, when it calls a hasAttributeNS method (limit value analysis)", function() {
-  });
-  /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
-  it("should be this for the value, when it calls a hasAttributeNS method (the valid partion)", function() {
-  });
-  /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/
-  it("should be this for the value, when it calls a hasAttributeNS method (the invalid partion)", function() {
-  });
+  describe("$frame object", function() {
+    var frame = base("$frame");
+    /*境界条件を調べておく (limit value analysis)*/
+    it("should be this for the value  (limit value analysis)", function() {
+      expect(typeof frame.setFrame).toBe("function");
+      expect(frame.timelines.length).toEqual(0);
+      frame.setFrame();
+      expect(frame.addLine(null)).toBe(false);
+      expect(frame.addLine(0, 0)).toBe(true);
+    });
+    /*同値分割をして、有効同値クラスを調べておく (Equivalence partitioning, the following is the valid partion)*/
+    it("should be this for the value (the valid partion)", function() {
+      expect(frame.addLine(null, null)).toBe(false);
+      expect(frame.addLine(0, null)).toBe(false);
+    });
+    /*無効同値クラスを調べておく (Equivalence partitioning, the following is the invalid partion)*/
+    it("should be this for the value (the invalid partion)", function() {
+    });
+  } );
+  
 } )