Modify the Spec for the object

diff --git a/org/w3c/dom/smil.js b/org/w3c/dom/smil.js
index 992f2d7..276a309 100644 (file)
--- a/org/w3c/dom/smil.js
+++ b/org/w3c/dom/smil.js
@@ -1354,7 +1354,7 @@ base("$calcMode").up("$attribute").mix( {
   },\r
   \r
   _setFrame: function($list) {\r
-    var currentTime = $list.currentFrame;\r
+    var currentFrame = $list.currentFrame;\r
     /*durationは単純継続時間\r
      *advanceは継続時間内での、進捗率\r
      * 　仕様を参照　http://www.w3.org/TR/smil-animation/#AnimFuncValues\r
@@ -1366,7 +1366,7 @@ base("$calcMode").up("$attribute").mix( {
         /*単純継続時間が不定の場合、補間はせずに初期値が採用されるため、advanceは0となる\r
          * 仕様を参照　SMIL Animation 3.2.2. Animation function values のInterpolation and indefinite simple durations\r
          * http://www.w3.org/TR/2001/REC-smil-animation-20010904/#AnimFuncValues*/\r
-        advance = duration ? ( (currentTime - $list.begin) % duration ) / duration\r
+        advance = duration ? ( (currentFrame - $list.begin) % duration ) / duration\r
                     : 0;\r
     this.setAttribute(this.tocall(advance));\r
     line = duration = advance = void 0;\r
@@ -1730,7 +1730,8 @@ base("$calcMode").up("$attribute").mix( {
    /*後の_setFrameメソッドで使うダミー*/\r
    __setAttribute: function(){},\r
    \r
-   _setFrame: function(currentFrame) {\r
+   _setFrame: function($list) {\r
+    var currentFrame = $list.currentFrame;\r
      /*__transformListの中で、自分より後の項目に再生中のものがあれば、\r
       *アニメーションを再生させないで、後に続く項目に任せる*/\r
      var list = this.element.__transformList,\r
@@ -1752,7 +1753,7 @@ base("$calcMode").up("$attribute").mix( {
      this.$animateElement._setFrame.call(this, currentFrame);\r
    },\r
    \r
-   _setEndFrame: function(currentFrame) {\r
+   _setEndFrame: function($list) {\r
      var list = this.element.__transformList;\r
      if ((this.fill !== "remove") || !list) {\r
        return;\r

diff --git a/tool/Spec/spec/SvgDomSpec.js b/tool/Spec/spec/SvgDomSpec.js
index b3198ff..4415779 100644 (file)
--- a/tool/Spec/spec/SvgDomSpec.js
+++ b/tool/Spec/spec/SvgDomSpec.js
@@ -2997,7 +2997,7 @@ describe("SMIL Animation Spec", function() {
           expect(p.__transformList[1].isPlaying).toBeTruthy();\r
           $animate._setEndFrame(1);\r
           expect(p.__transformList[0].isPlaying).toBeTruthy();\r
-          expect(p.__transformList[1].isPlaying).toBeTruthy();\r
+          expect(p.__transformList[1].isPlaying).toBeFalsy();\r
           \r
           delete p.__transformList;\r
           ele.setAttributeNS(null, "type", "scale");\r