зеркало из https://github.com/mozilla/gecko-dev.git
Bug 499880 - Restructure content/media directory. r+=doublec
--HG-- rename : content/media/video/src/nsAudioStream.cpp => content/media/nsAudioStream.cpp rename : content/media/video/public/nsAudioStream.h => content/media/nsAudioStream.h rename : content/media/video/src/nsMediaCache.cpp => content/media/nsMediaCache.cpp rename : content/media/video/public/nsMediaCache.h => content/media/nsMediaCache.h rename : content/media/video/src/nsMediaDecoder.cpp => content/media/nsMediaDecoder.cpp rename : content/media/video/public/nsMediaDecoder.h => content/media/nsMediaDecoder.h rename : content/media/video/src/nsMediaStream.cpp => content/media/nsMediaStream.cpp rename : content/media/video/public/nsMediaStream.h => content/media/nsMediaStream.h rename : content/media/video/src/nsChannelReader.cpp => content/media/ogg/nsChannelReader.cpp rename : content/media/video/public/nsChannelReader.h => content/media/ogg/nsChannelReader.h rename : content/media/video/src/nsOggDecoder.cpp => content/media/ogg/nsOggDecoder.cpp rename : content/media/video/public/nsOggDecoder.h => content/media/ogg/nsOggDecoder.h rename : content/media/video/test/320x240.allow-origin.ogv => content/media/test/320x240.allow-origin.ogv rename : content/media/video/test/320x240.allow-origin.ogv^headers^ => content/media/test/320x240.allow-origin.ogv^headers^ rename : content/media/video/test/320x240.ogv => content/media/test/320x240.ogv rename : content/media/video/test/Makefile.in => content/media/test/Makefile.in rename : content/media/video/test/big.wav => content/media/test/big.wav rename : content/media/video/test/bug461281.ogg => content/media/test/bug461281.ogg rename : content/media/video/test/bug482461.ogv => content/media/test/bug482461.ogv rename : content/media/video/test/can_play_type_ogg.js => content/media/test/can_play_type_ogg.js rename : content/media/video/test/can_play_type_wave.js => content/media/test/can_play_type_wave.js rename : content/media/video/test/contentDuration1.sjs => content/media/test/contentDuration1.sjs rename : content/media/video/test/contentDuration2.sjs => content/media/test/contentDuration2.sjs rename : content/media/video/test/contentDuration3.sjs => content/media/test/contentDuration3.sjs rename : content/media/video/test/contentDuration4.sjs => content/media/test/contentDuration4.sjs rename : content/media/video/test/contentDuration5.sjs => content/media/test/contentDuration5.sjs rename : content/media/video/test/contentDuration6.sjs => content/media/test/contentDuration6.sjs rename : content/media/video/test/crashtests/468763-1.html => content/media/test/crashtests/468763-1.html rename : content/media/video/test/crashtests/474744-1.html => content/media/test/crashtests/474744-1.html rename : content/media/video/test/crashtests/crashtests.list => content/media/test/crashtests/crashtests.list rename : content/media/video/test/dynamic_redirect.sjs => content/media/test/dynamic_redirect.sjs rename : content/media/video/test/file_access_controls.html => content/media/test/file_access_controls.html rename : content/media/video/test/r11025_s16_c1.wav => content/media/test/r11025_s16_c1.wav rename : content/media/video/test/r11025_s16_c1_trailing.wav => content/media/test/r11025_s16_c1_trailing.wav rename : content/media/video/test/r11025_u8_c1.wav => content/media/test/r11025_u8_c1.wav rename : content/media/video/test/r11025_u8_c1_trunc.wav => content/media/test/r11025_u8_c1_trunc.wav rename : content/media/video/test/r16000_u8_c1_list.wav => content/media/test/r16000_u8_c1_list.wav rename : content/media/video/test/redirect.sjs => content/media/test/redirect.sjs rename : content/media/video/test/seek.ogv => content/media/test/seek.ogv rename : content/media/video/test/small-shot.ogg => content/media/test/small-shot.ogg rename : content/media/video/test/sound.ogg => content/media/test/sound.ogg rename : content/media/video/test/test_access_control.html => content/media/test/test_access_control.html rename : content/media/video/test/test_audio1.html => content/media/test/test_audio1.html rename : content/media/video/test/test_audio2.html => content/media/test/test_audio2.html rename : content/media/video/test/test_audioDocumentTitle.html => content/media/test/test_audioDocumentTitle.html rename : content/media/video/test/test_autobuffer.html => content/media/test/test_autobuffer.html rename : content/media/video/test/test_autobuffer2.html => content/media/test/test_autobuffer2.html rename : content/media/video/test/test_autoplay.html => content/media/test/test_autoplay.html rename : content/media/video/test/test_bug448534.html => content/media/test/test_bug448534.html rename : content/media/video/test/test_bug461281.html => content/media/test/test_bug461281.html rename : content/media/video/test/test_bug463162.xhtml => content/media/test/test_bug463162.xhtml rename : content/media/video/test/test_bug465498.html => content/media/test/test_bug465498.html rename : content/media/video/test/test_bug468190.html => content/media/test/test_bug468190.html rename : content/media/video/test/test_bug468190_wav.html => content/media/test/test_bug468190_wav.html rename : content/media/video/test/test_bug476973.html => content/media/test/test_bug476973.html rename : content/media/video/test/test_bug482461.html => content/media/test/test_bug482461.html rename : content/media/video/test/test_bug493187.html => content/media/test/test_bug493187.html rename : content/media/video/test/test_bug495145.html => content/media/test/test_bug495145.html rename : content/media/video/test/test_bug495145_wav.html => content/media/test/test_bug495145_wav.html rename : content/media/video/test/test_bug495300.html => content/media/test/test_bug495300.html rename : content/media/video/test/test_bug495319.html => content/media/test/test_bug495319.html rename : content/media/video/test/test_can_play_type.html => content/media/test/test_can_play_type.html rename : content/media/video/test/test_can_play_type_no_ogg.html => content/media/test/test_can_play_type_no_ogg.html rename : content/media/video/test/test_can_play_type_no_wave.html => content/media/test/test_can_play_type_no_wave.html rename : content/media/video/test/test_can_play_type_ogg.html => content/media/test/test_can_play_type_ogg.html rename : content/media/video/test/test_can_play_type_wave.html => content/media/test/test_can_play_type_wave.html rename : content/media/video/test/test_closing_connections.html => content/media/test/test_closing_connections.html rename : content/media/video/test/test_constants.html => content/media/test/test_constants.html rename : content/media/video/test/test_contentDuration1.html => content/media/test/test_contentDuration1.html rename : content/media/video/test/test_contentDuration2.html => content/media/test/test_contentDuration2.html rename : content/media/video/test/test_contentDuration3.html => content/media/test/test_contentDuration3.html rename : content/media/video/test/test_contentDuration4.html => content/media/test/test_contentDuration4.html rename : content/media/video/test/test_contentDuration5.html => content/media/test/test_contentDuration5.html rename : content/media/video/test/test_contentDuration6.html => content/media/test/test_contentDuration6.html rename : content/media/video/test/test_controls.html => content/media/test/test_controls.html rename : content/media/video/test/test_currentTime.html => content/media/test/test_currentTime.html rename : content/media/video/test/test_decoder_disable.html => content/media/test/test_decoder_disable.html rename : content/media/video/test/test_delay_load.html => content/media/test/test_delay_load.html rename : content/media/video/test/test_duration1.html => content/media/test/test_duration1.html rename : content/media/video/test/test_ended1.html => content/media/test/test_ended1.html rename : content/media/video/test/test_ended2.html => content/media/test/test_ended2.html rename : content/media/video/test/test_error_on_404.html => content/media/test/test_error_on_404.html rename : content/media/video/test/test_info_leak.html => content/media/test/test_info_leak.html rename : content/media/video/test/test_load.html => content/media/test/test_load.html rename : content/media/video/test/test_load_candidates.html => content/media/test/test_load_candidates.html rename : content/media/video/test/test_media_selection.html => content/media/test/test_media_selection.html rename : content/media/video/test/test_mixed_principals.html => content/media/test/test_mixed_principals.html rename : content/media/video/test/test_networkState.html => content/media/test/test_networkState.html rename : content/media/video/test/test_onloadedmetadata.html => content/media/test/test_onloadedmetadata.html rename : content/media/video/test/test_paused.html => content/media/test/test_paused.html rename : content/media/video/test/test_paused_after_ended.html => content/media/test/test_paused_after_ended.html rename : content/media/video/test/test_play.html => content/media/test/test_play.html rename : content/media/video/test/test_progress1.html => content/media/test/test_progress1.html rename : content/media/video/test/test_progress2.html => content/media/test/test_progress2.html rename : content/media/video/test/test_progress3.html => content/media/test/test_progress3.html rename : content/media/video/test/test_progress4.html => content/media/test/test_progress4.html rename : content/media/video/test/test_readyState.html => content/media/test/test_readyState.html rename : content/media/video/test/test_seek1.html => content/media/test/test_seek1.html rename : content/media/video/test/test_seek2.html => content/media/test/test_seek2.html rename : content/media/video/test/test_seek3.html => content/media/test/test_seek3.html rename : content/media/video/test/test_seek4.html => content/media/test/test_seek4.html rename : content/media/video/test/test_seek5.html => content/media/test/test_seek5.html rename : content/media/video/test/test_seek6.html => content/media/test/test_seek6.html rename : content/media/video/test/test_seek7.html => content/media/test/test_seek7.html rename : content/media/video/test/test_seek8.html => content/media/test/test_seek8.html rename : content/media/video/test/test_seek9.html => content/media/test/test_seek9.html rename : content/media/video/test/test_source.html => content/media/test/test_source.html rename : content/media/video/test/test_source_write.html => content/media/test/test_source_write.html rename : content/media/video/test/test_standalone.html => content/media/test/test_standalone.html rename : content/media/video/test/test_timeupdate1.html => content/media/test/test_timeupdate1.html rename : content/media/video/test/test_timeupdate2.html => content/media/test/test_timeupdate2.html rename : content/media/video/test/test_timeupdate3.html => content/media/test/test_timeupdate3.html rename : content/media/video/test/test_videoDocumentTitle.html => content/media/test/test_videoDocumentTitle.html rename : content/media/video/test/test_volume.html => content/media/test/test_volume.html rename : content/media/video/test/test_wav_8bit.html => content/media/test/test_wav_8bit.html rename : content/media/video/test/test_wav_ended1.html => content/media/test/test_wav_ended1.html rename : content/media/video/test/test_wav_ended2.html => content/media/test/test_wav_ended2.html rename : content/media/video/test/test_wav_list.html => content/media/test/test_wav_list.html rename : content/media/video/test/test_wav_onloadedmetadata.html => content/media/test/test_wav_onloadedmetadata.html rename : content/media/video/test/test_wav_seek1.html => content/media/test/test_wav_seek1.html rename : content/media/video/test/test_wav_seek3.html => content/media/test/test_wav_seek3.html rename : content/media/video/test/test_wav_seek4.html => content/media/test/test_wav_seek4.html rename : content/media/video/test/test_wav_seek5.html => content/media/test/test_wav_seek5.html rename : content/media/video/test/test_wav_seek6.html => content/media/test/test_wav_seek6.html rename : content/media/video/test/test_wav_seek7.html => content/media/test/test_wav_seek7.html rename : content/media/video/test/test_wav_seek8.html => content/media/test/test_wav_seek8.html rename : content/media/video/test/test_wav_seek_past_end.html => content/media/test/test_wav_seek_past_end.html rename : content/media/video/test/test_wav_seek_then_play.html => content/media/test/test_wav_seek_then_play.html rename : content/media/video/test/test_wav_standalone.html => content/media/test/test_wav_standalone.html rename : content/media/video/test/test_wav_timeupdate1.html => content/media/test/test_wav_timeupdate1.html rename : content/media/video/test/test_wav_timeupdate2.html => content/media/test/test_wav_timeupdate2.html rename : content/media/video/test/test_wav_trailing.html => content/media/test/test_wav_trailing.html rename : content/media/video/test/test_wav_trunc.html => content/media/test/test_wav_trunc.html rename : content/media/video/test/test_wav_trunc_seek.html => content/media/test/test_wav_trunc_seek.html rename : content/media/video/test/use_large_cache.js => content/media/test/use_large_cache.js rename : content/media/video/src/nsWaveDecoder.cpp => content/media/wave/nsWaveDecoder.cpp rename : content/media/video/public/nsWaveDecoder.h => content/media/wave/nsWaveDecoder.h
This commit is contained in:
Robert O'Callahan
Родитель
5b3ab339dc
Коммит
e38733eb15
|
|
@ -48,7 +48,7 @@ include $(topsrcdir)/config/rules.mk
|
|||
_TEST_FILES =\
|
||||
letters.gif \
|
||||
moz.png \
|
||||
$(topsrcdir)/content/media/video/test/bug461281.ogg \
|
||||
$(topsrcdir)/content/media/test/bug461281.ogg \
|
||||
longdesc_src.html \
|
||||
actions.js \
|
||||
attributes.js \
|
||||
|
|
|
|||
|
|
@ -41,11 +41,83 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifdef MOZ_MEDIA
|
||||
DIRS = \
|
||||
video \
|
||||
MODULE = content
|
||||
LIBRARY_NAME = gkconmedia_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = \
|
||||
xpcom \
|
||||
string \
|
||||
gfx \
|
||||
content \
|
||||
thebes \
|
||||
layout \
|
||||
widget \
|
||||
dom \
|
||||
js \
|
||||
locale \
|
||||
unicharutil \
|
||||
webshell \
|
||||
uriloader \
|
||||
htmlparser \
|
||||
necko \
|
||||
view \
|
||||
pref \
|
||||
docshell \
|
||||
xpconnect \
|
||||
xuldoc \
|
||||
caps \
|
||||
editor \
|
||||
imglib2 \
|
||||
mimetype \
|
||||
exthandler \
|
||||
uconv \
|
||||
intl \
|
||||
plugin \
|
||||
cairo \
|
||||
libpixman \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = \
|
||||
nsMediaDecoder.h \
|
||||
nsMediaStream.h \
|
||||
nsMediaCache.h \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
nsMediaDecoder.cpp \
|
||||
nsMediaCache.cpp \
|
||||
nsMediaStream.cpp \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_SYDNEYAUDIO
|
||||
EXPORTS += \
|
||||
nsAudioStream.h \
|
||||
$(NULL)
|
||||
CPPSRCS += \
|
||||
nsAudioStream.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
DIRS =
|
||||
|
||||
ifdef MOZ_OGG
|
||||
DIRS += ogg
|
||||
endif
|
||||
|
||||
ifdef MOZ_WAVE
|
||||
DIRS += wave
|
||||
endif
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
endif
|
||||
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/../base/src \
|
||||
-I$(srcdir)/../html/content/src \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -42,7 +42,7 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = content
|
||||
LIBRARY_NAME = gkconvideo_s
|
||||
LIBRARY_NAME = gkconogg_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = \
|
||||
|
|
@ -78,36 +78,21 @@ REQUIRES = \
|
|||
libpixman \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS += \
|
||||
nsChannelReader.h \
|
||||
nsOggDecoder.h \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
nsMediaDecoder.cpp \
|
||||
nsMediaCache.cpp \
|
||||
nsMediaStream.cpp \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_SYDNEYAUDIO
|
||||
CPPSRCS += \
|
||||
nsAudioStream.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_OGG
|
||||
CPPSRCS += \
|
||||
nsChannelReader.cpp \
|
||||
nsOggDecoder.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_WAVE
|
||||
CPPSRCS += \
|
||||
nsWaveDecoder.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/../../../base/src \
|
||||
-I$(srcdir)/../../../html/content/src \
|
||||
-I$(srcdir)/../../base/src \
|
||||
-I$(srcdir)/../../html/content/src \
|
||||
$(NULL)
|
||||
|
|
@ -34,11 +34,11 @@
|
|||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
relativesrcdir = content/media/video/test
|
||||
relativesrcdir = content/media/test
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
@ -7,7 +7,7 @@ function handleRequest(request, response)
|
|||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
var bis = Components.classes["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
var paths = "tests/content/media/video/test/320x240.ogv";
|
||||
var paths = "tests/content/media/test/320x240.ogv";
|
||||
var split = paths.split("/");
|
||||
for(var i = 0; i < split.length; ++i) {
|
||||
file.append(split[i]);
|
||||
|
|
@ -7,7 +7,7 @@ function handleRequest(request, response)
|
|||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
var bis = Components.classes["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
var paths = "tests/content/media/video/test/320x240.ogv";
|
||||
var paths = "tests/content/media/test/320x240.ogv";
|
||||
var split = paths.split("/");
|
||||
for(var i = 0; i < split.length; ++i) {
|
||||
file.append(split[i]);
|
||||
|
|
@ -7,7 +7,7 @@ function handleRequest(request, response)
|
|||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
var bis = Components.classes["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
var paths = "tests/content/media/video/test/320x240.ogv";
|
||||
var paths = "tests/content/media/test/320x240.ogv";
|
||||
var split = paths.split("/");
|
||||
for(var i = 0; i < split.length; ++i) {
|
||||
file.append(split[i]);
|
||||
|
|
@ -7,7 +7,7 @@ function handleRequest(request, response)
|
|||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
var bis = Components.classes["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
var paths = "tests/content/media/video/test/320x240.ogv";
|
||||
var paths = "tests/content/media/test/320x240.ogv";
|
||||
var split = paths.split("/");
|
||||
for(var i = 0; i < split.length; ++i) {
|
||||
file.append(split[i]);
|
||||
|
|
@ -7,7 +7,7 @@ function handleRequest(request, response)
|
|||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
var bis = Components.classes["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
var paths = "tests/content/media/video/test/320x240.ogv";
|
||||
var paths = "tests/content/media/test/320x240.ogv";
|
||||
var split = paths.split("/");
|
||||
for(var i = 0; i < split.length; ++i) {
|
||||
file.append(split[i]);
|
||||
|
|
@ -7,7 +7,7 @@ function handleRequest(request, response)
|
|||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
var bis = Components.classes["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
var paths = "tests/content/media/video/test/320x240.ogv";
|
||||
var paths = "tests/content/media/test/320x240.ogv";
|
||||
var split = paths.split("/");
|
||||
for(var i = 0; i < split.length; ++i) {
|
||||
file.append(split[i]);
|
||||
|
|
@ -7,7 +7,7 @@ function handleRequest(request, response)
|
|||
if (getState(key[1]) == "redirect") {
|
||||
var origin = request.host == "localhost" ? "example.org" : "localhost:8888";
|
||||
response.setStatusLine(request.httpVersion, 303, "See Other");
|
||||
response.setHeader("Location", "http://" + origin + "/tests/content/media/video/test/seek.ogv");
|
||||
response.setHeader("Location", "http://" + origin + "/tests/content/media/test/seek.ogv");
|
||||
response.setHeader("Content-Type", "text/html");
|
||||
return;
|
||||
}
|
||||
|
|
@ -21,7 +21,7 @@ function handleRequest(request, response)
|
|||
createInstance(Components.interfaces.nsIFileInputStream);
|
||||
var bis = Components.classes["@mozilla.org/binaryinputstream;1"].
|
||||
createInstance(Components.interfaces.nsIBinaryInputStream);
|
||||
var paths = "tests/content/media/video/test/seek.ogv";
|
||||
var paths = "tests/content/media/test/seek.ogv";
|
||||
var split = paths.split("/");
|
||||
for(var i = 0; i < split.length; ++i) {
|
||||
file.append(split[i]);
|
||||
|
|
@ -4,67 +4,67 @@
|
|||
<body onload="setTimeout(load, 0);" onunload="done()">
|
||||
<script>
|
||||
|
||||
// Page URL: http://example.org/tests/content/media/video/test/file_access_controls.html
|
||||
// Page URL: http://example.org/tests/content/media/test/file_access_controls.html
|
||||
|
||||
var gTests = [
|
||||
{
|
||||
// Test 0
|
||||
url: "redirect.sjs?http://example.com/tests/content/media/video/test/320x240.ogv",
|
||||
url: "redirect.sjs?http://example.com/tests/content/media/test/320x240.ogv",
|
||||
result: "error",
|
||||
description: "Won't load when redirected to different domain",
|
||||
},{
|
||||
// Test 1
|
||||
url: "redirect.sjs?http://example.com/tests/content/media/video/test/320x240.allow-origin.ogv",
|
||||
url: "redirect.sjs?http://example.com/tests/content/media/test/320x240.allow-origin.ogv",
|
||||
result: "loaded",
|
||||
description: "Can load when redirected to different domain with allow-origin",
|
||||
},{
|
||||
// Test 2
|
||||
url: "redirect.sjs?http://test1.example.org/tests/content/media/video/test/320x240.ogv",
|
||||
url: "redirect.sjs?http://test1.example.org/tests/content/media/test/320x240.ogv",
|
||||
result: "error",
|
||||
description: "Won't load when redirected to subdomain",
|
||||
},{
|
||||
// Test 3
|
||||
url: "redirect.sjs?http://test1.example.org/tests/content/media/video/test/320x240.allow-origin.ogv",
|
||||
url: "redirect.sjs?http://test1.example.org/tests/content/media/test/320x240.allow-origin.ogv",
|
||||
result: "loaded",
|
||||
description: "Can load when redirected to subdomain with allow-origin",
|
||||
},{
|
||||
// Test 4
|
||||
url: "redirect.sjs?http://example.org/tests/content/media/video/test/320x240.ogv",
|
||||
url: "redirect.sjs?http://example.org/tests/content/media/test/320x240.ogv",
|
||||
result: "loaded",
|
||||
description: "Can load when redirected to same domain",
|
||||
},{
|
||||
// Test 5
|
||||
url: "http://example.org/tests/content/media/video/test/320x240.ogv",
|
||||
url: "http://example.org/tests/content/media/test/320x240.ogv",
|
||||
result: "loaded",
|
||||
description: "Can load from same domain"
|
||||
},{
|
||||
// Test 6
|
||||
url: "http://example.org:8000/tests/content/media/video/test/320x240.ogv",
|
||||
url: "http://example.org:8000/tests/content/media/test/320x240.ogv",
|
||||
result: "error",
|
||||
description: "Won't load from differnet port on same domain"
|
||||
},{
|
||||
// Test 7
|
||||
url: "http://example.org:8000/tests/content/media/video/test/320x240.allow-origin.ogv",
|
||||
url: "http://example.org:8000/tests/content/media/test/320x240.allow-origin.ogv",
|
||||
result: "loaded",
|
||||
description: "Can load from different port on same domain with allow-origin",
|
||||
},{
|
||||
// Test 8
|
||||
url: "http://example.com/tests/content/media/video/test/320x240.ogv",
|
||||
url: "http://example.com/tests/content/media/test/320x240.ogv",
|
||||
result: "error",
|
||||
description: "Won't load cross domain",
|
||||
},{
|
||||
// Test 9
|
||||
url: "http://example.com/tests/content/media/video/test/320x240.allow-origin.ogv",
|
||||
url: "http://example.com/tests/content/media/test/320x240.allow-origin.ogv",
|
||||
result: "loaded",
|
||||
description: "Can load cross domain with allow-origin",
|
||||
},{
|
||||
// Test 10
|
||||
url: "http://test1.example.org/tests/content/media/video/test/320x240.allow-origin.ogv",
|
||||
url: "http://test1.example.org/tests/content/media/test/320x240.allow-origin.ogv",
|
||||
result: "loaded",
|
||||
description: "Can load from subdomain with allow-origin",
|
||||
},{
|
||||
// Test 11
|
||||
url: "http://test1.example.org/tests/content/media/video/test/320x240.ogv",
|
||||
url: "http://test1.example.org/tests/content/media/test/320x240.ogv",
|
||||
result: "error",
|
||||
description: "Won't load from subdomain",
|
||||
}
|
||||
|
|
@ -95,7 +95,7 @@ function createVideo() {
|
|||
function load() {
|
||||
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
|
||||
opener.is(window.location.href,
|
||||
"http://example.org/tests/content/media/video/test/file_access_controls.html",
|
||||
"http://example.org/tests/content/media/test/file_access_controls.html",
|
||||
"We must be on a example.org:80");
|
||||
|
||||
// Ensure access control check pref is on.
|
||||
|
|
@ -20,7 +20,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=451958
|
|||
/** Test for Bug 451958 **/
|
||||
|
||||
function run() {
|
||||
window.open("http://example.org:80/tests/content/media/video/test/file_access_controls.html", "", "width=500,height=500");
|
||||
window.open("http://example.org:80/tests/content/media/test/file_access_controls.html", "", "width=500,height=500");
|
||||
}
|
||||
|
||||
function done() {
|
||||
|
|
@ -77,7 +77,7 @@ function createVideo(id) {
|
|||
v.addEventListener(t, listener, false);
|
||||
}
|
||||
}
|
||||
v.src = "http://localhost:8888/tests/content/media/video/test/320x240.ogv";
|
||||
v.src = "http://localhost:8888/tests/content/media/test/320x240.ogv";
|
||||
register(v);
|
||||
return v;
|
||||
}
|
||||
|
|
@ -48,22 +48,22 @@ var gMedia = null;
|
|||
var gTests = [
|
||||
{
|
||||
tag: 'video',
|
||||
src: fileUriToSrc("tests/content/media/video/test/320x240.ogv", true),
|
||||
src: fileUriToSrc("tests/content/media/test/320x240.ogv", true),
|
||||
},{
|
||||
tag: 'video',
|
||||
src: fileUriToSrc("tests/content/media/video/test/404.ogv", false),
|
||||
src: fileUriToSrc("tests/content/media/test/404.ogv", false),
|
||||
}, {
|
||||
tag: 'audio',
|
||||
src: fileUriToSrc("tests/content/media/video/test/r11025_s16_c1.wav", true),
|
||||
src: fileUriToSrc("tests/content/media/test/r11025_s16_c1.wav", true),
|
||||
}, {
|
||||
tag: 'audio',
|
||||
src: fileUriToSrc("tests/content/media/video/test/404.wav", false),
|
||||
src: fileUriToSrc("tests/content/media/test/404.wav", false),
|
||||
}, {
|
||||
tag: 'audio',
|
||||
src: fileUriToSrc("tests/content/media/video/test/bug461281.ogg", true),
|
||||
src: fileUriToSrc("tests/content/media/test/bug461281.ogg", true),
|
||||
}, {
|
||||
tag: 'audio',
|
||||
src: fileUriToSrc("tests/content/media/video/test/404.ogg", false),
|
||||
src: fileUriToSrc("tests/content/media/test/404.ogg", false),
|
||||
}, {
|
||||
tag: 'video',
|
||||
src: 'http://localhost/404.ogv',
|
||||
|
|
@ -72,10 +72,10 @@ var gTests = [
|
|||
src: 'http://localhost/404.wav',
|
||||
}, {
|
||||
tag: 'video',
|
||||
src: 'http://example.com/tests/content/media/video/test/test_info_leak.html'
|
||||
src: 'http://example.com/tests/content/media/test/test_info_leak.html'
|
||||
}, {
|
||||
tag: 'audio',
|
||||
src: 'http://example.com/tests/content/media/video/test/test_info_leak.html'
|
||||
src: 'http://example.com/tests/content/media/test/test_info_leak.html'
|
||||
}
|
||||
];
|
||||
|
||||
|
|
@ -53,12 +53,12 @@ var key = Math.floor(Math.random()*100000000);
|
|||
|
||||
// In v1, try loading from same-origin first and then getting redirected to
|
||||
// another origin.
|
||||
v1.src = "http://localhost:8888/tests/content/media/video/test/dynamic_redirect.sjs?key=v1_" + key;
|
||||
v1.src = "http://localhost:8888/tests/content/media/test/dynamic_redirect.sjs?key=v1_" + key;
|
||||
v1.load();
|
||||
|
||||
// In v2, try loading cross-origin first and then getting redirected to
|
||||
// our origin.
|
||||
v2.src = "http://example.org/tests/content/media/video/test/dynamic_redirect.sjs?key=v2_" + key;
|
||||
v2.src = "http://example.org/tests/content/media/test/dynamic_redirect.sjs?key=v2_" + key;
|
||||
v2.load();
|
||||
|
||||
</script>
|
||||
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче