X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FLayoutTests%2Fhttp%2Ftests%2Fmedia%2Fmedia-source%2Fmediasource-remove.html;h=4306546cbee0e2889b9a7e557b135812cfe933bc;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=6cf84a971a22c38bc98eb818729feae07c657f92;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-remove.html b/src/third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-remove.html
index 6cf84a9..4306546 100644
--- a/src/third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-remove.html
+++ b/src/third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-remove.html
@@ -21,6 +21,20 @@
               test.done();
           }, "Test remove with an negative start.");
 
+          mediasource_test(function(test, mediaElement, mediaSource)
+          {
+              var sourceBuffer = mediaSource.addSourceBuffer(MediaSourceUtil.AUDIO_VIDEO_TYPE);
+
+              [ undefined, NaN, Infinity, -Infinity ].forEach(function(item)
+              {
+                  assert_throws(new TypeError(), function()
+                  {
+                      sourceBuffer.remove(item, 2);
+                  }, "remove");
+              });
+
+              test.done();
+          }, "Test remove with non-finite start.");
 
           mediasource_test(function(test, mediaElement, mediaSource)
           {
@@ -156,11 +170,11 @@
 
                   test.waitForExpectedEvents(function()
                   {
-                      var duration = segmentInfo.duration.toFixed(3);
+                      var bufferedRangeEnd = segmentInfo.bufferedRangeEndBeforeEndOfStream.toFixed(3);
                       var subType = MediaSourceUtil.getSubType(segmentInfo.type);
 
-                      assertBufferedEquals(sourceBuffer, "{ [0.000, " + duration + ") }", "Initial buffered range.");
-                      callback(test, sourceBuffer, duration, subType);
+                      assertBufferedEquals(sourceBuffer, "{ [0.000, " + bufferedRangeEnd + ") }", "Initial buffered range.");
+                      callback(test, sourceBuffer, bufferedRangeEnd, subType);
                   });
               }, description);
           };
@@ -179,16 +193,18 @@
               });
           }
 
-          removeAppendedDataTests(function(test, sourceBuffer, duration, subType)
+          removeAppendedDataTests(function(test, sourceBuffer, bufferedRangeEnd, subType)
           {
-              removeAndCheckBufferedRanges(test, sourceBuffer, 0, Number.POSITIVE_INFINITY, "{ }");
+              // Using MAX_VALUE rather than POSITIVE_INFINITY here due to lack
+              // of 'unrestricted' on end parameter. (See comment in SourceBuffer.idl)
+              removeAndCheckBufferedRanges(test, sourceBuffer, 0, Number.MAX_VALUE, "{ }");
           }, "Test removing all appended data.");
 
-          removeAppendedDataTests(function(test, sourceBuffer, duration, subType)
+          removeAppendedDataTests(function(test, sourceBuffer, bufferedRangeEnd, subType)
           {
               var expectations = {
-                webm: ("{ [3.187, " + duration + ") }"),
-                mp4: ("{ [3.021, " + duration + ") }"),
+                webm: ("{ [3.187, " + bufferedRangeEnd + ") }"),
+                mp4: ("{ [3.021, " + bufferedRangeEnd + ") }"),
               };
 
               // Note: Range doesn't start exactly at the end of the remove range because there isn't
@@ -196,11 +212,11 @@
               removeAndCheckBufferedRanges(test, sourceBuffer, 0, 3, expectations[subType]);
           }, "Test removing beginning of appended data.");
 
-          removeAppendedDataTests(function(test, sourceBuffer, duration, subType)
+          removeAppendedDataTests(function(test, sourceBuffer, bufferedRangeEnd, subType)
           {
               var expectations = {
-                webm: ("{ [0.000, 1.012) [3.187, " + duration + ") }"),
-                mp4: ("{ [0.000, 1.022) [3.021, " + duration + ") }"),
+                webm: ("{ [0.000, 1.012) [3.187, " + bufferedRangeEnd + ") }"),
+                mp4: ("{ [0.000, 1.022) [3.021, " + bufferedRangeEnd + ") }"),
               };
 
               // Note: The first resulting range ends slightly after start because the removal algorithm only removes
@@ -209,14 +225,16 @@
               removeAndCheckBufferedRanges(test, sourceBuffer, 1, 3, expectations[subType]);
           }, "Test removing the middle of appended data.");
 
-          removeAppendedDataTests(function(test, sourceBuffer, duration, subType)
+          removeAppendedDataTests(function(test, sourceBuffer, bufferedRangeEnd, subType)
           {
               var expectations = {
                 webm: "{ [0.000, 1.012) }",
                 mp4: "{ [0.000, 1.022) }",
               };
 
-              removeAndCheckBufferedRanges(test, sourceBuffer, 1, Number.POSITIVE_INFINITY, expectations[subType]);
+              // Using MAX_VALUE rather than POSITIVE_INFINITY here due to lack
+              // of 'unrestricted' on end parameter. (See comment in SourceBuffer.idl)
+              removeAndCheckBufferedRanges(test, sourceBuffer, 1, Number.MAX_VALUE, expectations[subType]);
           }, "Test removing the end of appended data.");
         </script>
     </body>