Backing out 454683 due to test failure
authorRobert O'Callahan <robert@ocallahan.org>
Mon, 29 Sep 2008 17:06:34 +1300
changeset 19866 15cb5d25db05
parent 19865 dccf2cdea8ee
child 19867 b456877d519a
push id2504
push userrocallahan@mozilla.com
push dateMon, 29 Sep 2008 04:06:42 +0000
treeherdermozilla-central@15cb5d25db05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs454683
milestone1.9.1b1pre
Backing out 454683 due to test failure
content/html/content/src/nsHTMLMediaElement.cpp
content/media/video/test/Makefile.in
--- a/content/html/content/src/nsHTMLMediaElement.cpp
+++ b/content/html/content/src/nsHTMLMediaElement.cpp
@@ -345,19 +345,16 @@ NS_IMETHODIMP nsHTMLMediaElement::GetVol
     *aVolume = mMutedVolume;
   else
     *aVolume = mDecoder ? mDecoder->GetVolume() : 0.0;
   return NS_OK;
 }
 
 NS_IMETHODIMP nsHTMLMediaElement::SetVolume(float aVolume)
 {
-  if (aVolume < 0.0f || aVolume > 1.0f)
-    return NS_ERROR_DOM_INDEX_SIZE_ERR;
-
   if (mMuted) 
     mMutedVolume = aVolume;
   else {
     if (mDecoder)
       mDecoder->SetVolume(aVolume);
 
     DispatchSimpleEvent(NS_LITERAL_STRING("volumechange"));
   }
--- a/content/media/video/test/Makefile.in
+++ b/content/media/video/test/Makefile.in
@@ -48,15 +48,14 @@ include $(topsrcdir)/config/rules.mk
                 test_controls.html \
                 test_currentTime.html \
                 test_defaultPlaybackRate.html \
                 test_networkState.html \
                 test_paused.html \
                 test_playbackRate.html \
                 test_readyState.html \
                 test_start.html \
-                test_volume.html \
 #               test_bug448534.html \
                 320x240.ogg \
                 $(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)