Merge mozilla-central to fx-team

This commit is contained in:
Carsten "Tomcat" Book 2014-03-14 12:56:25 +01:00
Родитель 059b64503c 36c4f3f93d
Коммит df81fc64c8
166 изменённых файлов: 802 добавлений и 372 удалений

Просмотреть файл

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>

Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="b5151b89ff31e92dc44b466f15ad4909e73db248"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="485846b2a40d8ac7d6c1c5f8af6d15b0c10af19d"/>

Просмотреть файл

@ -15,7 +15,7 @@
<project name="platform_build" path="build" remote="b2g" revision="a9e08b91e9cd1f0930f16cfc49ec72f63575d5fe">
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="gaia" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="b5151b89ff31e92dc44b466f15ad4909e73db248"/>

Просмотреть файл

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="d11f524d00cacf5ba0dfbf25e4aa2158b1c3a036"/>

Просмотреть файл

@ -4,6 +4,6 @@
"branch": "",
"revision": ""
},
"revision": "04a13c212e02a36e590e5fd166af2f8e0abfbad7",
"revision": "37b9db0c5bc096893c78468b1a3cf3d02962e231",
"repo_path": "/integration/gaia-central"
}

Просмотреть файл

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

Просмотреть файл

@ -15,7 +15,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

Просмотреть файл

@ -19,7 +19,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

Просмотреть файл

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

Просмотреть файл

@ -17,7 +17,7 @@
</project>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="moztt" path="external/moztt" remote="b2g" revision="b5151b89ff31e92dc44b466f15ad4909e73db248"/>
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="485846b2a40d8ac7d6c1c5f8af6d15b0c10af19d"/>

Просмотреть файл

@ -17,7 +17,7 @@
<copyfile dest="Makefile" src="core/root.mk"/>
</project>
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="29a990ac0347c057ef6998cb42e4548768a18559"/>
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="1cef557f9e9a865d1bf49d99a8f1cca1f0f4f5c4"/>
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="266bca6e60dad43e395f38b66edabe8bdc882334"/>
<project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
<project name="librecovery" path="librecovery" remote="b2g" revision="1f6a1fe07f81c5bc5e1d079c9b60f7f78ca2bf4f"/>

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s
support-files =
audio.ogg
bug364677-data.xml

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s
support-files =
bug368464-data.xml
bug408328-data.xml

Просмотреть файл

@ -3,6 +3,7 @@ support-files =
file_disableScript.html
[test_app_principal_equality.html]
skip-if = e10s
[test_bug246699.html]
[test_bug292789.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
file_CSP.css
file_CSP.sjs

Просмотреть файл

@ -220,7 +220,7 @@ skip-if = toolkit == 'android'
[test_CrossSiteXHR_cache.html]
skip-if = toolkit == 'android'
[test_CrossSiteXHR_origin.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(https not working, bug 907770)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(https not working, bug 907770) b2g-debug(https not working, bug 907770) b2g-desktop(https not working, bug 907770)
[test_DOMException.html]
[test_EventSource_redirects.html]
[test_NodeIterator_basics_filters.xhtml]
@ -230,7 +230,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(https not working, bug
[test_XHR.html]
[test_XHRDocURI.html]
[test_XHRSendData.html]
skip-if = buildapp == 'b2g' # b2g(seems to stall) b2g-debug(seems to stall) b2g-desktop(seems to stall)
skip-if = buildapp == 'b2g' || e10s # b2g(seems to stall) b2g-debug(seems to stall) b2g-desktop(seems to stall)
[test_XHR_anon.html]
[test_XHR_header.html]
[test_XHR_onuploadprogress.html]
@ -244,7 +244,7 @@ skip-if = buildapp == 'b2g' # b2g(flaky on B2G, bug 960743) b2g-debug(flaky on B
[test_base.xhtml]
[test_blobconstructor.html]
[test_bug166235.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
[test_bug199959.html]
[test_bug218236.html]
[test_bug218277.html]
@ -254,6 +254,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(clipboard undefined) b
[test_bug276037-1.html]
[test_bug276037-2.xhtml]
[test_bug282547.html]
skip-if = e10s
[test_bug28293.html]
[test_bug28293.xhtml]
[test_bug298064.html]
@ -324,6 +325,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(https not working, bug
[test_bug402150.html^headers^]
[test_bug403841.html]
[test_bug403852.html]
skip-if = e10s
[test_bug403868.xml]
[test_bug405182.html]
[test_bug409380.html]
@ -347,7 +349,7 @@ skip-if = buildapp == 'b2g' # b2g(bug 901343, specialpowers.wrap issue [nsIChann
[test_bug422403-2.xhtml]
skip-if = buildapp == 'b2g'
[test_bug422537.html]
skip-if = buildapp == 'b2g' # b2g(xmlhttprequest causes crash, bug 902271) b2g-debug(xmlhttprequest causes crash, bug 902271) b2g-desktop(xmlhttprequest causes crash, bug 902271)
skip-if = buildapp == 'b2g' || e10s # b2g(xmlhttprequest causes crash, bug 902271) b2g-debug(xmlhttprequest causes crash, bug 902271) b2g-desktop(xmlhttprequest causes crash, bug 902271)
[test_bug424212.html]
[test_bug424359-1.html]
skip-if = buildapp == 'b2g'
@ -362,7 +364,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_bug429157.html]
[test_bug431082.html]
[test_bug431701.html]
skip-if = buildapp == 'b2g' # b2g(xmlhttprequest causes crash, bug 902271) b2g-debug(xmlhttprequest causes crash, bug 902271) b2g-desktop(xmlhttprequest causes crash, bug 902271)
skip-if = buildapp == 'b2g' || e10s # b2g(xmlhttprequest causes crash, bug 902271) b2g-debug(xmlhttprequest causes crash, bug 902271) b2g-desktop(xmlhttprequest causes crash, bug 902271)
[test_bug431833.html]
[test_bug433533.html]
[test_bug433662.html]
@ -398,7 +400,7 @@ skip-if = buildapp == 'b2g'
[test_bug475156.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 855762 # b2g(36 total - bug 902611) b2g-debug(36 total - bug 902611) b2g-desktop(36 total - bug 902611)
[test_bug482935.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 855762
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 855762
[test_bug484396.html]
[test_bug493881.html]
[test_bug493881.js]
@ -442,7 +444,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_bug564863.xhtml]
[test_bug567350.html]
[test_bug578096.html]
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(debug-only failure; crash) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s # b2g-debug(debug-only failure; crash) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
[test_bug585978.html]
skip-if = (toolkit == 'gonk' && debug) #debug-only timeout
[test_bug587931.html]
@ -525,7 +527,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #bug 901343, specialpowers.wr
[test_bug819051.html]
[test_bug820909.html]
[test_bug827160.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #needs plugin support # b2g(needs plugin support) b2g-debug(debug-only failure) b2g-desktop(needs plugin support)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #needs plugin support # b2g(needs plugin support) b2g-debug(debug-only failure) b2g-desktop(needs plugin support)
[test_bug840098.html]
[test_bug868999.html]
[test_bug869000.html]
@ -544,9 +546,9 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #needs plugin support # b2g(
[test_classList.html]
# This test fails on the Mac for some reason
[test_copyimage.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit != 'gtk2' && toolkit != 'gtk3' && toolkit != 'windows' #b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit != 'gtk2' && toolkit != 'gtk3' && toolkit != 'windows' || e10s #b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
[test_copypaste.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 904183 # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined)
[test_copypaste.xhtml]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(bug 904183) b2g-debug(bug 904183) b2g-desktop(bug 904183)
[test_createHTMLDocument.html]
@ -555,8 +557,9 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 904183 # b2g(bug 904183
[test_domparsing.html]
[test_elementTraversal.html]
[test_fileapi.html]
skip-if = e10s
[test_fileapi_slice.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 775227
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 775227
[test_getElementById.html]
[test_html_colors_quirks.html]
[test_html_colors_standards.html]
@ -572,27 +575,27 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 775227
[test_meta_viewport5.html]
[test_meta_viewport6.html]
[test_mixed_content_blocker.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
[test_mixed_content_blocker_bug803225.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
[test_mixed_content_blocker_frameNavigation.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT, SSL_REQUIRED
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT, SSL_REQUIRED
[test_mozfiledataurl.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
[test_mutationobservers.html]
skip-if = buildapp == 'b2g' # b2g(bug 901385, showmodaldialog) b2g-debug(bug 901385, showmodaldialog) b2g-desktop(bug 901385, showmodaldialog)
skip-if = buildapp == 'b2g' || e10s # b2g(bug 901385, showmodaldialog) b2g-debug(bug 901385, showmodaldialog) b2g-desktop(bug 901385, showmodaldialog)
[test_nodelist_holes.html]
[test_object.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(needs plugin support) b2g-debug(needs plugin support) b2g-desktop(needs plugin support)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(needs plugin support) b2g-debug(needs plugin support) b2g-desktop(needs plugin support)
[test_plugin_freezing.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #CLICK_TO_PLAY
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #CLICK_TO_PLAY
[test_processing_instruction_update_stylesheet.xhtml]
[test_range_bounds.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_reentrant_flush.html]
skip-if = toolkit == 'android' #RANDOM
skip-if = toolkit == 'android' || e10s #RANDOM
[test_sync_xhr_timer.xhtml]
skip-if = toolkit == 'android' #RANDOM
skip-if = toolkit == 'android' || e10s #RANDOM
[test_text_wholeText.html]
[test_textnode_normalize_in_selection.html]
[test_textnode_split_in_selection.html]
@ -603,13 +606,13 @@ skip-if = toolkit == 'android' #RANDOM
[test_w3element_traversal.xhtml]
[test_w3element_traversal_svg.html]
[test_websocket.html]
skip-if = buildapp == 'b2g' || toolkit == 'android'
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
[test_websocket_basic.html]
skip-if = buildapp == 'b2g' || toolkit == 'android'
[test_websocket_hello.html]
skip-if = buildapp == 'b2g' || toolkit == 'android'
[test_x-frame-options.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(observerservice issue) b2g-debug(observerservice issue) b2g-desktop(observerservice issue)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(observerservice issue) b2g-debug(observerservice issue) b2g-desktop(observerservice issue)
[test_xbl_userdata.xhtml]
[test_xhr_abort_after_load.html]
skip-if = toolkit == 'android'

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
file_binary-frames_wsh.py
file_check-binary-messages_wsh.py

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
00_test_list.txt
failing_tests_android.txt

Просмотреть файл

@ -78,6 +78,8 @@
#include "mozilla/dom/power/PowerManagerService.h"
#include "mozilla/dom/WakeLock.h"
#include "mozilla/dom/TextTrack.h"
#include "ImageContainer.h"
#include "nsRange.h"
#include <algorithm>
@ -3947,9 +3949,11 @@ HTMLMediaElement::AddTextTrack(TextTrackKind aKind,
const nsAString& aLabel,
const nsAString& aLanguage)
{
return mTextTrackManager ? mTextTrackManager->AddTextTrack(aKind, aLabel,
aLanguage)
: nullptr;
if (mTextTrackManager) {
return mTextTrackManager->AddTextTrack(aKind, aLabel, aLanguage,
TextTrackSource::AddTextTrack);
}
return nullptr;
}
void

Просмотреть файл

@ -153,7 +153,9 @@ HTMLTrackElement::CreateTextTrack()
kind = TextTrackKind::Subtitles;
}
mTrack = new TextTrack(OwnerDoc()->GetParentObject(), kind, label, srcLang);
mTrack = new TextTrack(OwnerDoc()->GetParentObject(), kind, label, srcLang,
TextTrackSource::Track);
mTrack->SetTrackElement(this);
if (mMediaParent) {
mMediaParent->AddTextTrack(mTrack);

Просмотреть файл

@ -20,6 +20,59 @@
namespace mozilla {
namespace dom {
CompareTextTracks::CompareTextTracks(HTMLMediaElement* aMediaElement)
{
mMediaElement = aMediaElement;
}
int32_t
CompareTextTracks::TrackChildPosition(TextTrack* aTextTrack) const {
HTMLTrackElement* trackElement = aTextTrack->GetTrackElement();
if (!trackElement) {
return -1;
}
return mMediaElement->IndexOf(trackElement);
}
bool
CompareTextTracks::Equals(TextTrack* aOne, TextTrack* aTwo) const {
// Two tracks can never be equal. If they have corresponding TrackElements
// they would need to occupy the same tree position (impossible) and in the
// case of tracks coming from AddTextTrack source we put the newest at the
// last position, so they won't be equal as well.
return false;
}
bool
CompareTextTracks::LessThan(TextTrack* aOne, TextTrack* aTwo) const
{
TextTrackSource sourceOne = aOne->GetTextTrackSource();
TextTrackSource sourceTwo = aTwo->GetTextTrackSource();
if (sourceOne != sourceTwo) {
return sourceOne == Track ||
(sourceOne == AddTextTrack && sourceTwo == MediaResourceSpecific);
}
switch (sourceOne) {
case Track: {
int32_t positionOne = TrackChildPosition(aOne);
int32_t positionTwo = TrackChildPosition(aTwo);
// If either position one or positiontwo are -1 then something has gone
// wrong. In this case we should just put them at the back of the list.
return positionOne != -1 && positionTwo != -1 &&
positionOne < positionTwo;
}
case AddTextTrack:
// For AddTextTrack sources the tracks will already be in the correct relative
// order in the source array. Assume we're called in iteration order and can
// therefore always report aOne < aTwo to maintain the original temporal ordering.
return true;
case MediaResourceSpecific:
// No rules for Media Resource Specific tracks yet.
break;
}
return true;
}
NS_IMPL_CYCLE_COLLECTION_3(TextTrackManager, mTextTracks,
mPendingTextTracks, mNewCues)
NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(TextTrackManager, AddRef)
@ -58,10 +111,15 @@ TextTrackManager::TextTracks() const
already_AddRefed<TextTrack>
TextTrackManager::AddTextTrack(TextTrackKind aKind, const nsAString& aLabel,
const nsAString& aLanguage)
const nsAString& aLanguage,
TextTrackSource aTextTrackSource)
{
if (!mMediaElement) {
return nullptr;
}
nsRefPtr<TextTrack> ttrack =
mTextTracks->AddTextTrack(aKind, aLabel, aLanguage);
mTextTracks->AddTextTrack(aKind, aLabel, aLanguage, aTextTrackSource,
CompareTextTracks(mMediaElement));
ttrack->SetReadyState(HTMLTrackElement::READY_STATE_LOADED);
AddCues(ttrack);
return ttrack.forget();
@ -70,7 +128,10 @@ TextTrackManager::AddTextTrack(TextTrackKind aKind, const nsAString& aLabel,
void
TextTrackManager::AddTextTrack(TextTrack* aTextTrack)
{
mTextTracks->AddTextTrack(aTextTrack);
if (!mMediaElement) {
return;
}
mTextTracks->AddTextTrack(aTextTrack, CompareTextTracks(mMediaElement));
AddCues(aTextTrack);
}
@ -157,7 +218,8 @@ TextTrackManager::PopulatePendingList()
TextTrack* ttrack = mTextTracks->IndexedGetter(index, dummy);
if (ttrack && ttrack->Mode() != TextTrackMode::Disabled &&
ttrack->ReadyState() == HTMLTrackElement::READY_STATE_LOADING) {
mPendingTextTracks->AddTextTrack(ttrack);
mPendingTextTracks->AddTextTrack(ttrack,
CompareTextTracks(mMediaElement));
}
}
}

Просмотреть файл

@ -19,6 +19,17 @@ namespace mozilla {
namespace dom {
class HTMLMediaElement;
class CompareTextTracks {
private:
HTMLMediaElement* mMediaElement;
public:
CompareTextTracks(HTMLMediaElement* aMediaElement);
int32_t TrackChildPosition(TextTrack* aTrack) const;
bool Equals(TextTrack* aOne, TextTrack* aTwo) const;
bool LessThan(TextTrack* aOne, TextTrack* aTwo) const;
};
class TextTrack;
class TextTrackCue;
@ -34,7 +45,8 @@ public:
TextTrackList* TextTracks() const;
already_AddRefed<TextTrack> AddTextTrack(TextTrackKind aKind,
const nsAString& aLabel,
const nsAString& aLanguage);
const nsAString& aLanguage,
TextTrackSource aTextTrackSource);
void AddTextTrack(TextTrack* aTextTrack);
void RemoveTextTrack(TextTrack* aTextTrack, bool aPendingListOnly);
void DidSeek();

Просмотреть файл

@ -54,10 +54,12 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_input_url.html]
[test_label_control_attribute.html]
[test_max_attribute.html]
skip-if = e10s
[test_maxlength_attribute.html]
[test_meter_element.html]
[test_meter_pseudo-classes.html]
[test_min_attribute.html]
skip-if = e10s
[test_mozistextfield.html]
[test_novalidate_attribute.html]
[test_option_disabled.html]
@ -67,16 +69,18 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_pattern_attribute.html]
[test_progress_element.html]
[test_required_attribute.html]
skip-if = e10s
[test_restore_form_elements.html]
[test_save_restore_radio_groups.html]
[test_select_selectedOptions.html]
[test_set_range_text.html]
[test_step_attribute.html]
skip-if = e10s
[test_stepup_stepdown.html]
[test_submit_invalid_file.html]
[test_textarea_attributes_reflection.html]
[test_validation.html]
skip-if = buildapp == 'b2g' # b2g(374 total, bug 901848, no keygen support) b2g-debug(374 total, bug 901848, no keygen support) b2g-desktop(374 total, bug 901848, no keygen support)
skip-if = buildapp == 'b2g' || e10s # b2g(374 total, bug 901848, no keygen support) b2g-debug(374 total, bug 901848, no keygen support) b2g-desktop(374 total, bug 901848, no keygen support)
[test_valueAsDate_pref.html]
[test_valueasdate_attribute.html]
[test_valueasnumber_attribute.html]

Просмотреть файл

@ -246,7 +246,7 @@ skip-if = toolkit == 'android'
[test_bug518122.html]
[test_bug519987.html]
[test_bug523771.html]
skip-if = buildapp == 'b2g' # b2g(onload of iframe not firing, because submit not working?) b2g-debug(onload of iframe not firing, because submit not working?) b2g-desktop(onload of iframe not firing, because submit not working?)
skip-if = buildapp == 'b2g' || e10s # b2g(onload of iframe not firing, because submit not working?) b2g-debug(onload of iframe not firing, because submit not working?) b2g-desktop(onload of iframe not firing, because submit not working?)
[test_bug529819.html]
[test_bug529859.html]
[test_bug535043.html]
@ -270,7 +270,7 @@ skip-if = toolkit == 'android' #TIMED_OUT
[test_bug560112.html]
[test_bug561634.html]
[test_bug561636.html]
skip-if = buildapp == 'b2g' # b2g(observerservice not working) b2g-debug(observerservice not working) b2g-desktop(observerservice not working)
skip-if = buildapp == 'b2g' || e10s # b2g(observerservice not working) b2g-debug(observerservice not working) b2g-desktop(observerservice not working)
[test_bug561640.html]
[test_bug564001.html]
[test_bug566046.html]
@ -291,16 +291,19 @@ skip-if = buildapp == 'b2g' # b2g(observerservice not working) b2g-debug(observe
[test_bug589.html]
[test_bug590353-1.html]
[test_bug590353-2.html]
skip-if = e10s
[test_bug590363.html]
[test_bug592802.html]
[test_bug593689.html]
[test_bug595429.html]
skip-if = e10s
[test_bug595447.html]
[test_bug595449.html]
skip-if = (toolkit == 'gonk' && debug) #debug-only failure
skip-if = (toolkit == 'gonk' && debug) || e10s #debug-only failure
[test_bug596350.html]
[test_bug596511.html]
[test_bug598643.html]
skip-if = e10s
[test_bug598833-1.html]
[test_bug600155.html]
[test_bug601030.html]
@ -316,7 +319,7 @@ skip-if = (toolkit == 'gonk' && debug) #debug-only failure
[test_bug612730.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(form control not selected/checked with synthesizeMouse, also fails on Android) b2g-debug(form control not selected/checked with synthesizeMouse, also fails on Android) b2g-desktop(form control not selected/checked with synthesizeMouse, also fails on Android)
[test_bug613113.html]
skip-if = buildapp == 'b2g' # b2g(bug 587671, need an invalidformsubmit observer) b2g-debug(bug 587671, need an invalidformsubmit observer) b2g-desktop(bug 587671, need an invalidformsubmit observer)
skip-if = buildapp == 'b2g' || e10s # b2g(bug 587671, need an invalidformsubmit observer) b2g-debug(bug 587671, need an invalidformsubmit observer) b2g-desktop(bug 587671, need an invalidformsubmit observer)
[test_bug613722.html]
[test_bug613979.html]
[test_bug615595.html]
@ -324,22 +327,29 @@ skip-if = buildapp == 'b2g' # b2g(bug 587671, need an invalidformsubmit observer
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(form control not selected/checked with synthesizeMouse, also fails on Android) b2g-debug(form control not selected/checked with synthesizeMouse, also fails on Android) b2g-desktop(form control not selected/checked with synthesizeMouse, also fails on Android)
[test_bug617528.html]
[test_bug618948.html]
skip-if = buildapp == 'b2g' # b2g(bug 587671, need an invalidformsubmit observer) b2g-debug(bug 587671, need an invalidformsubmit observer) b2g-desktop(bug 587671, need an invalidformsubmit observer)
skip-if = buildapp == 'b2g' || e10s # b2g(bug 587671, need an invalidformsubmit observer) b2g-debug(bug 587671, need an invalidformsubmit observer) b2g-desktop(bug 587671, need an invalidformsubmit observer)
[test_bug619278.html]
skip-if = buildapp == 'b2g' # b2g(bug 587671, need an invalidformsubmit observer) b2g-debug(bug 587671, need an invalidformsubmit observer) b2g-desktop(bug 587671, need an invalidformsubmit observer)
skip-if = buildapp == 'b2g' || e10s # b2g(bug 587671, need an invalidformsubmit observer) b2g-debug(bug 587671, need an invalidformsubmit observer) b2g-desktop(bug 587671, need an invalidformsubmit observer)
[test_bug622558.html]
skip-if = e10s
[test_bug622597.html]
skip-if = buildapp == 'b2g' # b2g(bug 587671, need an invalidformsubmit observer) b2g-debug(bug 587671, need an invalidformsubmit observer) b2g-desktop(bug 587671, need an invalidformsubmit observer)
skip-if = buildapp == 'b2g' || e10s # b2g(bug 587671, need an invalidformsubmit observer) b2g-debug(bug 587671, need an invalidformsubmit observer) b2g-desktop(bug 587671, need an invalidformsubmit observer)
[test_bug623291.html]
skip-if = e10s
[test_bug6296.html]
skip-if = e10s
[test_bug629801.html]
skip-if = e10s
[test_bug633058.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
[test_bug636336.html]
skip-if = e10s
[test_bug641219.html]
skip-if = e10s
[test_bug643051.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
[test_bug646157.html]
skip-if = e10s
[test_bug649134.html]
# This extra subdirectory is needed due to the nature of this test.
# With the bug, the test loads the base URL of the bug649134/file_*.sjs
@ -390,7 +400,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_bug839913.html]
[test_bug840877.html]
[test_bug841466.html]
skip-if = (toolkit == 'gonk' && debug) #debug-only failure
skip-if = (toolkit == 'gonk' && debug) || e10s #debug-only failure
[test_bug845057.html]
[test_bug869040.html]
[test_bug870787.html]
@ -407,33 +417,35 @@ skip-if = (toolkit == 'gonk' && debug) #debug-only failure
[test_embed_attributes_reflection.html]
[test_formData.html]
[test_formSubmission.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) b2g-debug(NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) b2g-desktop(NS_ERROR_FILE_TARGET_DOES_NOT_EXIST)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT # b2g(NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) b2g-debug(NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) b2g-desktop(NS_ERROR_FILE_TARGET_DOES_NOT_EXIST)
[test_formSubmission2.html]
skip-if = toolkit == 'android'
[test_formelements.html]
[test_fullscreen-api.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(time out, some kind of focus issue) b2g-debug(time out, some kind of focus issue) b2g-desktop(time out, some kind of focus issue)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT # b2g(time out, some kind of focus issue) b2g-debug(time out, some kind of focus issue) b2g-desktop(time out, some kind of focus issue)
[test_hidden.html]
[test_html_attributes_reflection.html]
[test_htmlcollection.html]
[test_iframe_sandbox_general.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
[test_iframe_sandbox_inheritance.html]
skip-if = buildapp == 'b2g' # b2g(Crash, bug 904659) b2g-debug(Crash, bug 904659) b2g-desktop(Crash, bug 904659)
skip-if = buildapp == 'b2g' || e10s # b2g(Crash, bug 904659) b2g-debug(Crash, bug 904659) b2g-desktop(Crash, bug 904659)
[test_iframe_sandbox_modal.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #modal tests fail on android # b2g(modal tests fail on B2G) b2g-debug(modal tests fail on B2G) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #modal tests fail on android # b2g(modal tests fail on B2G) b2g-debug(modal tests fail on B2G) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
[test_iframe_sandbox_navigation.html]
skip-if = buildapp == 'b2g' # b2g(Crash, bug 904659) b2g-debug(Crash, bug 904659) b2g-desktop(Crash, bug 904659)
skip-if = buildapp == 'b2g' || e10s # b2g(Crash, bug 904659) b2g-debug(Crash, bug 904659) b2g-desktop(Crash, bug 904659)
[test_iframe_sandbox_navigation2.html]
skip-if = buildapp == 'b2g' # b2g(Crash, bug 904659) b2g-debug(Crash, bug 904659) b2g-desktop(Crash, bug 904659)
skip-if = buildapp == 'b2g' || e10s # b2g(Crash, bug 904659) b2g-debug(Crash, bug 904659) b2g-desktop(Crash, bug 904659)
[test_iframe_sandbox_plugins.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(plugins not supported) b2g-debug(plugins not supported) b2g-desktop(plugins not supported)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(plugins not supported) b2g-debug(plugins not supported) b2g-desktop(plugins not supported)
[test_iframe_sandbox_popups.html]
skip-if = buildapp == 'b2g' # b2g(multiple concurrent window.open()s fail on B2G) b2g-debug(multiple concurrent window.open()s fail on B2G) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
skip-if = buildapp == 'b2g' || e10s # b2g(multiple concurrent window.open()s fail on B2G) b2g-debug(multiple concurrent window.open()s fail on B2G) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
[test_iframe_sandbox_popups_inheritance.html]
skip-if = buildapp == 'b2g' # b2g(multiple concurrent window.open()s fail on B2G) b2g-debug(multiple concurrent window.open()s fail on B2G) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
skip-if = buildapp == 'b2g' || e10s # b2g(multiple concurrent window.open()s fail on B2G) b2g-debug(multiple concurrent window.open()s fail on B2G) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
[test_iframe_sandbox_same_origin.html]
skip-if = e10s
[test_iframe_sandbox_workers.html]
skip-if = e10s
[test_img_attributes_reflection.html]
[test_imageSrcSet.html]
[test_li_attributes_reflection.html]
@ -447,7 +459,7 @@ skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(Perma-
[test_nested_invalid_fieldsets.html]
[test_object_attributes_reflection.html]
[test_object_plugin_nav.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(plugins not supported) b2g-debug(plugins not supported) b2g-desktop(plugins not supported)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT # b2g(plugins not supported) b2g-debug(plugins not supported) b2g-desktop(plugins not supported)
[test_ol_attributes_reflection.html]
[test_option_defaultSelected.html]
[test_option_selected_state.html]

Просмотреть файл

@ -25,9 +25,9 @@ support-files =
[test_bug1823.html]
[test_bug57600.html]
[test_bug196523.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
[test_bug199692.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #bug 811644 #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' || e10s #bug 811644 #Bug 931116, b2g desktop specific, initial triage
[test_bug172261.html]
[test_bug255820.html]
[test_bug259332.html]
@ -38,10 +38,10 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #bug
[test_bug340017.xhtml]
[test_bug359657.html]
[test_bug369370.html]
skip-if = buildapp == 'b2g' || toolkit == 'android'
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
[test_bug380383.html]
[test_bug391777.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_bug402680.html]
[test_bug403868.html]
[test_bug403868.xhtml]
@ -71,10 +71,10 @@ skip-if = toolkit == 'android'
[test_bug677495.html]
[test_bug677495-1.html]
[test_bug741266.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(needs control of popup window size) b2g-debug(needs control of popup window size) b2g-desktop(needs control of popup window size)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(needs control of popup window size) b2g-debug(needs control of popup window size) b2g-desktop(needs control of popup window size)
[test_non-ascii-cookie.html]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s
[test_bug765780.html]
[test_bug871161.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
support-files = file_bug871161-1.html file_bug871161-2.html

Просмотреть файл

@ -16,20 +16,22 @@
namespace mozilla {
namespace dom {
NS_IMPL_CYCLE_COLLECTION_INHERITED_4(TextTrack,
NS_IMPL_CYCLE_COLLECTION_INHERITED_5(TextTrack,
nsDOMEventTargetHelper,
mParent,
mCueList,
mActiveCueList,
mTextTrackList)
mTextTrackList,
mTrackElement)
NS_IMPL_ADDREF_INHERITED(TextTrack, nsDOMEventTargetHelper)
NS_IMPL_RELEASE_INHERITED(TextTrack, nsDOMEventTargetHelper)
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(TextTrack)
NS_INTERFACE_MAP_END_INHERITING(nsDOMEventTargetHelper)
TextTrack::TextTrack(nsISupports* aParent)
TextTrack::TextTrack(nsISupports* aParent, TextTrackSource aTextTrackSource)
: mParent(aParent)
, mTextTrackSource(aTextTrackSource)
{
SetDefaultSettings();
SetIsDOMBinding();
@ -38,8 +40,10 @@ TextTrack::TextTrack(nsISupports* aParent)
TextTrack::TextTrack(nsISupports* aParent,
TextTrackKind aKind,
const nsAString& aLabel,
const nsAString& aLanguage)
const nsAString& aLanguage,
TextTrackSource aTextTrackSource)
: mParent(aParent)
, mTextTrackSource(aTextTrackSource)
{
SetDefaultSettings();
mKind = aKind;
@ -52,9 +56,11 @@ TextTrack::TextTrack(nsISupports* aParent,
TextTrackList* aTextTrackList,
TextTrackKind aKind,
const nsAString& aLabel,
const nsAString& aLanguage)
const nsAString& aLanguage,
TextTrackSource aTextTrackSource)
: mParent(aParent)
, mTextTrackList(aTextTrackList)
, mTextTrackSource(aTextTrackSource)
{
SetDefaultSettings();
mKind = aKind;
@ -211,5 +217,15 @@ TextTrack::SetTextTrackList(TextTrackList* aTextTrackList)
mTextTrackList = aTextTrackList;
}
HTMLTrackElement*
TextTrack::GetTrackElement() {
return mTrackElement;
}
void
TextTrack::SetTrackElement(HTMLTrackElement* aTrackElement) {
mTrackElement = aTrackElement;
}
} // namespace dom
} // namespace mozilla

Просмотреть файл

@ -20,6 +20,13 @@ class TextTrackList;
class TextTrackCue;
class TextTrackCueList;
class TextTrackRegion;
class HTMLTrackElement;
enum TextTrackSource {
Track,
AddTextTrack,
MediaResourceSpecific
};
class TextTrack MOZ_FINAL : public nsDOMEventTargetHelper
{
@ -27,16 +34,19 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(TextTrack, nsDOMEventTargetHelper)
TextTrack(nsISupports* aParent);
TextTrack(nsISupports* aParent,
TextTrackSource aTextTrackSource);
TextTrack(nsISupports* aParent,
TextTrackKind aKind,
const nsAString& aLabel,
const nsAString& aLanguage);
const nsAString& aLanguage,
TextTrackSource aTextTrackSource);
TextTrack(nsISupports* aParent,
TextTrackList* aTextTrackList,
TextTrackKind aKind,
const nsAString& aLabel,
const nsAString& aLanguage);
const nsAString& aLanguage,
TextTrackSource aTextTrackSource);
void SetDefaultSettings();
@ -99,6 +109,13 @@ public:
IMPL_EVENT_HANDLER(cuechange)
HTMLTrackElement* GetTrackElement();
void SetTrackElement(HTMLTrackElement* aTrackElement);
TextTrackSource GetTextTrackSource() {
return mTextTrackSource;
}
private:
void UpdateActiveCueList();
@ -114,10 +131,14 @@ private:
nsRefPtr<TextTrackCueList> mCueList;
nsRefPtr<TextTrackCueList> mActiveCueList;
nsRefPtr<HTMLTrackElement> mTrackElement;
uint32_t mCuePos;
uint16_t mReadyState;
bool mDirty;
// An enum that represents where the track was sourced from.
TextTrackSource mTextTrackSource;
};
} // namespace dom

Просмотреть файл

@ -64,17 +64,21 @@ TextTrackList::IndexedGetter(uint32_t aIndex, bool& aFound)
already_AddRefed<TextTrack>
TextTrackList::AddTextTrack(TextTrackKind aKind,
const nsAString& aLabel,
const nsAString& aLanguage)
const nsAString& aLanguage,
TextTrackSource aTextTrackSource,
const CompareTextTracks& aCompareTT)
{
nsRefPtr<TextTrack> track = new TextTrack(mGlobal, this, aKind, aLabel, aLanguage);
AddTextTrack(track);
nsRefPtr<TextTrack> track = new TextTrack(mGlobal, this, aKind, aLabel, aLanguage,
aTextTrackSource);
AddTextTrack(track, aCompareTT);
return track.forget();
}
void
TextTrackList::AddTextTrack(TextTrack* aTextTrack)
TextTrackList::AddTextTrack(TextTrack* aTextTrack,
const CompareTextTracks& aCompareTT)
{
if (mTextTracks.AppendElement(aTextTrack)) {
if (mTextTracks.InsertElementSorted(aTextTrack, aCompareTT)) {
aTextTrack->SetTextTrackList(this);
CreateAndDispatchTrackEventRunner(aTextTrack, NS_LITERAL_STRING("addtrack"));
}

Просмотреть файл

@ -16,6 +16,7 @@ namespace dom {
class HTMLMediaElement;
class TextTrackManager;
class CompareTextTracks;
class TrackEvent;
class TrackEventRunner;
@ -48,10 +49,12 @@ public:
already_AddRefed<TextTrack> AddTextTrack(TextTrackKind aKind,
const nsAString& aLabel,
const nsAString& aLanguage);
const nsAString& aLanguage,
TextTrackSource aTextTrackSource,
const CompareTextTracks& aCompareTT);
TextTrack* GetTrackById(const nsAString& aId);
void AddTextTrack(TextTrack* aTextTrack);
void AddTextTrack(TextTrack* aTextTrack, const CompareTextTracks& aCompareTT);
void RemoveTextTrack(TextTrack* aTrack);
void DidSeek();

Просмотреть файл

@ -1,13 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
# These includes are from Android JB, for use of MediaCodec.
INCLUDES += \
-I$(topsrcdir)/ipc/chromium/src \
-I$(ANDROID_SOURCE)/frameworks/native/opengl/include/ \
-I$(ANDROID_SOURCE)/frameworks/native/include/ \
-I$(ANDROID_SOURCE)/frameworks/av/include/media/ \
$(NULL)

Просмотреть файл

@ -41,4 +41,14 @@ FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'gklayout'
# These includes are from Android JB, for use of MediaCodec.
LOCAL_INCLUDES += ['/ipc/chromium/src']
CXXFLAGS += [
'-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
'frameworks/native/opengl/include',
'frameworks/native/include',
'frameworks/av/include/media',
]
]
include('/ipc/chromium/chromium-config.mozbuild')

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files = seek.webm seek.webm^headers^
[test_MediaSource.html]

Просмотреть файл

@ -299,6 +299,18 @@ nsresult RtspOmxReader::Seek(int64_t aTime, int64_t aStartTime,
return MediaOmxReader::Seek(aTime, aStartTime, aEndTime, aCurrentTime);
}
nsresult
RtspOmxReader::ReadMetadata(MediaInfo* aInfo,
MetadataTags** aTags)
{
nsresult rv = MediaOmxReader::ReadMetadata(aInfo, aTags);
NS_ENSURE_SUCCESS(rv, rv);
SetActive();
return NS_OK;
}
void RtspOmxReader::SetIdle() {
// Need to pause RTSP streaming OMXCodec decoding.
if (mRtspResource) {
@ -319,7 +331,7 @@ void RtspOmxReader::SetActive() {
nsIStreamingProtocolController* controller =
mRtspResource->GetMediaStreamController();
if (controller) {
controller->Play();
controller->Play();
}
}

Просмотреть файл

@ -44,6 +44,9 @@ public:
MOZ_COUNT_DTOR(RtspOmxReader);
}
virtual nsresult ReadMetadata(MediaInfo* aInfo,
MetadataTags** aTags) MOZ_OVERRIDE;
// Implement a time-based seek instead of byte-based..
virtual nsresult Seek(int64_t aTime, int64_t aStartTime, int64_t aEndTime,
int64_t aCurrentTime) MOZ_FINAL MOZ_OVERRIDE;

Просмотреть файл

@ -1,14 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
CXXFLAGS += \
-I$(ANDROID_SOURCE)/frameworks/base/include/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/binder/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/utils/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/media/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/media/stagefright/openmax \
-I$(ANDROID_SOURCE)/frameworks/base/media/libstagefright/include/ \
$(NULL)

Просмотреть файл

@ -14,4 +14,15 @@ SOURCES += [
include('/ipc/chromium/chromium-config.mozbuild')
CXXFLAGS += [
'-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
'frameworks/base/include',
'frameworks/base/include/binder',
'frameworks/base/include/utils',
'frameworks/base/include/media/',
'frameworks/base/include/media/stagefright/openmax',
'frameworks/base/media/libstagefright/include',
]
]
FINAL_LIBRARY = 'gklayout'

Просмотреть файл

@ -333,7 +333,7 @@ skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(timed
[test_can_play_type_mpeg.html]
skip-if = buildapp == 'b2g' # b2g(7 failures out of 27) b2g-debug(7 failures out of 27) b2g-desktop(7 failures out of 27)
[test_can_play_type_ogg.html]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s
[test_can_play_type_no_ogg.html]
[test_closing_connections.html]
[test_constants.html]

Просмотреть файл

@ -27,11 +27,11 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
is(trackList.length, 0, "Length should be 0.");
ok(typeof video.addTextTrack == "function", "HTMLMediaElement::AddTextTrack() function should be available.")
video.addTextTrack("subtitles", "label", "en-CA");
video.addTextTrack("subtitles", "third", "en-CA");
is(trackList.length, 1, "Length should be 1.");
var textTrack = video.textTracks[0];
is(textTrack.label, "label", "Label should be set to label.");
is(textTrack.label, "third", "Label should be set to third.");
is(textTrack.language, "en-CA", "Language should be en-CA.");
is(textTrack.kind, "subtitles", "Default kind should be subtitles.");
is(textTrack.mode, "hidden", "Default mode should be hidden.");
@ -47,7 +47,7 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
// All below are read-only properties and so should not allow setting.
textTrack.label = "French subtitles";
is(textTrack.label, "label", "Label is read-only so should still be \"label\".");
is(textTrack.label, "third", "Label is read-only so should still be \"label\".");
textTrack.language = "en";
is(textTrack.language, "en-CA", "Language is read-only so should still be \"en-CA\".");
@ -60,9 +60,50 @@ SpecialPowers.pushPrefEnv({"set": [["media.webvtt.enabled", true]]},
is(textTrack.mode, value, message);
}
SimpleTest.finish();
}
);
// Test that text tracks are sorted correctly when being inserted on the
// MediaElements list of text tracks. For this test we add four tracks, the
// first one was at the start of the test, the next three are below.
var trackOne = document.createElement("track");
trackOne.label = "first";
trackOne.src = "basic.vtt";
video.appendChild(trackOne);
video.addTextTrack("subtitles", "fourth", "en-CA");
var trackTwo = document.createElement("track");
trackTwo.label = "second";
trackTwo.src = "basic.vtt";
video.appendChild(trackTwo);
video.src = "seek.webm";
video.preload = "auto";
document.getElementById("content").appendChild(video);
video.addEventListener("loadedmetadata", function run_tests() {
// Re-que run_tests() at the end of the event loop until the track
// element has loaded its data.
if (trackOne.readyState == 1 || trackTwo.readyState == 1) {
setTimeout(run_tests, 0);
return;
}
is(trackOne.readyState, 2, "First Track::ReadyState should be set to LOADED.");
is(trackTwo.readyState, 2, "Second Track::ReadyState should be set to LOADED.");
// For the tracks to be sorted the first two tracks, added through a
// TrackElement, must occupy the first two indexes in their TrackElement
// tree order. The second two tracks, added through the 'addTextTrack'
// method, will occupy the last two indexes in the order that they were
// added in.
var labels = [ "first", "second", "third", "fourth" ];
is(video.textTracks.length, labels.length, "TextTracks length should be " + labels.length);
for (var i = 0; i < video.textTracks.length; i++) {
isnot(video.textTracks[i], null, "Video should have a text track at " + i + " index.");
is(video.textTracks[i].label, labels[i], "Text track at " + i + " should be " + labels[i]);
}
SimpleTest.finish();
});
});
</script>
</pre>
</body>

Просмотреть файл

@ -10,7 +10,7 @@ support-files =
[test_audio_capture_error.html]
[test_call_start_from_end_handler.html]
[test_nested_eventloop.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_preference_enable.html]
[test_recognition_service_error.html]
skip-if = buildapp == 'b2g' # b2g(timed out) b2g-debug(timed out) b2g-desktop(timed out)

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
[test_ipc.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 857673 # b2g(comp.classes['@mozilla.org/special-powers-observer;1'] is undefined) b2g-debug(comp.classes['@mozilla.org/special-powers-observer;1'] is undefined) b2g-desktop(comp.classes['@mozilla.org/special-powers-observer;1'] is undefined)

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files = common.js
[test_setup.html]

Просмотреть файл

@ -8,7 +8,7 @@ support-files =
[test_bug343870.xhtml]
[test_bug355213.xhtml]
[test_bug392338.html]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s
[test_bug399502.xhtml]
[test_bug445330.html]
[test_bug691215.html]

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
file_other_auxiliary_navigation_by_location.html
file_our_auxiliary_navigation_by_location.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
bug123696-subframe.html
bug369814.jar

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
NavigationUtils.js
blank.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
[test_alarm_add_data.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = toolkit=='gonk' #b2g(bug 972927, nearly perma-fail) b2g-debug(bug 972927, nearly perma-fail)
skip-if = toolkit=='gonk' || e10s #b2g(bug 972927, nearly perma-fail) b2g-debug(bug 972927, nearly perma-fail)
support-files =
file_app.sjs
file_app.template.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
[test_battery_basics.html]
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug))

Просмотреть файл

@ -3,7 +3,7 @@
# so we don't run that test on platforms which don't support OOP tests.
# OOP tests don't work on native-fennec (bug 774939).
# Bug 960345 - Disabled on OSX debug for frequent crashes.
skip-if = os == "android" || (toolkit == "cocoa" && debug) || (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
skip-if = os == "android" || (toolkit == "cocoa" && debug) || (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s
support-files =
browserElement_OpenMixedProcess.js
file_browserElement_OpenMixedProcess.html

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s
support-files =
../../../browser/base/content/test/general/audio.ogg
../../../content/media/test/short-video.ogv

Просмотреть файл

@ -1,6 +1,6 @@
[DEFAULT]
# Good luck running these tests on anything but desktop Linux.
skip-if = toolkit != "gtk2" || (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
skip-if = toolkit != "gtk2" || (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s
# Note: ../browserElementTestHelpers.js makes all tests in this directory OOP,
# because testing the process-priority manager without OOP frames does not make

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
[shared.js]
[test_contacts_basics.html]

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = toolkit=='gonk' #b2g(bug 974270, frequent failures) b2g-debug(bug 974270, frequent failures)
skip-if = toolkit=='gonk' || e10s #b2g(bug 974270, frequent failures) b2g-debug(bug 974270, frequent failures)
support-files =
file_app_install.html
file_readonly.html

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = toolkit == 'android' #bug 781789 & bug 782275
skip-if = toolkit == 'android' || e10s #bug 781789 & bug 782275
support-files = ../test/devicestorage_common.js
[test_ipc.html]

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = toolkit == 'android' #bug 781789 & bug 782275
skip-if = toolkit == 'android' || e10s #bug 781789 & bug 782275
support-files = devicestorage_common.js
[test_823965.html]

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
file_utf16_be_bom.css
file_utf16_be_bom.js

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
[test_big5.js]
[test_euc-jp.js]

Просмотреть файл

@ -23,7 +23,7 @@ skip-if = buildapp == 'b2g'
[test_bug299673-1.html]
[test_bug299673-2.html]
[test_bug322588.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
[test_bug328885.html]
[test_bug336682.js]
[test_bug336682_1.html]
@ -37,9 +37,9 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
[test_bug412567.html]
[test_bug422132.html]
skip-if = buildapp == 'b2g' # b2g(2 failures out of 8, mousewheel test) b2g-debug(2 failures out of 8, mousewheel test) b2g-desktop(2 failures out of 8, mousewheel test)
skip-if = buildapp == 'b2g' || e10s # b2g(2 failures out of 8, mousewheel test) b2g-debug(2 failures out of 8, mousewheel test) b2g-desktop(2 failures out of 8, mousewheel test)
[test_bug426082.html]
skip-if = buildapp == 'b2g' || os == "win" || toolkit == 'android' # Intermittent failures, bug 921693 # b2g(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) b2g-debug(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) b2g-desktop(1 failure out of 6, Moving the mouse down from the label should have unpressed the button)
skip-if = buildapp == 'b2g' || os == "win" || toolkit == 'android' || e10s # Intermittent failures, bug 921693 # b2g(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) b2g-debug(1 failure out of 6, Moving the mouse down from the label should have unpressed the button) b2g-desktop(1 failure out of 6, Moving the mouse down from the label should have unpressed the button)
[test_bug427537.html]
[test_bug428988.html]
[test_bug432698.html]
@ -56,7 +56,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_bug502818.html]
skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_bug508479.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #CRASH_DUMP, RANDOM # b2g(drag event, also fails on Android) b2g-debug(drag event, also fails on Android) b2g-desktop(drag event, also fails on Android)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #CRASH_DUMP, RANDOM # b2g(drag event, also fails on Android) b2g-debug(drag event, also fails on Android) b2g-desktop(drag event, also fails on Android)
[test_bug822898.html]
[test_bug517851.html]
[test_bug534833.html]
@ -95,7 +95,7 @@ skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_bug650493.html]
skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_bug656379-1.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' #TIMED_OUT #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || toolkit == 'android' || e10s #TIMED_OUT #Bug 931116, b2g desktop specific, initial triage
[test_bug656379-2.html]
skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_bug656954.html]
@ -131,14 +131,14 @@ skip-if = toolkit == "gonk"
[test_clickevent_on_input.html]
skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_continuous_wheel_events.html]
skip-if = buildapp == 'b2g' # b2g(5535 passed, 108 failed - more tests running than desktop) b2g-debug(5535 passed, 108 failed - more tests running than desktop) b2g-desktop(5535 passed, 108 failed - more tests running than desktop)
skip-if = buildapp == 'b2g' || e10s # b2g(5535 passed, 108 failed - more tests running than desktop) b2g-debug(5535 passed, 108 failed - more tests running than desktop) b2g-desktop(5535 passed, 108 failed - more tests running than desktop)
[test_dblclick_explicit_original_target.html]
[test_dom_keyboard_event.html]
skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_dom_mouse_event.html]
skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_dom_wheel_event.html]
skip-if = buildapp == 'b2g' # b2g(456 failed out of 19873, mousewheel test) b2g-debug(456 failed out of 19873, mousewheel test) b2g-desktop(456 failed out of 19873, mousewheel test)
skip-if = buildapp == 'b2g' || e10s # b2g(456 failed out of 19873, mousewheel test) b2g-debug(456 failed out of 19873, mousewheel test) b2g-desktop(456 failed out of 19873, mousewheel test)
[test_draggableprop.html]
skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_dragstart.html]
@ -151,4 +151,4 @@ skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
[test_messageEvent.html]
[test_moz_mouse_pixel_scroll_event.html]
[test_wheel_default_action.html]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
dummy_worker.js
helpers.js

Просмотреть файл

@ -1,4 +1,4 @@
[DEFAULT]
[test_ipc.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 783513 # b2g(nested ipc not working) b2g-debug(nested ipc not working) b2g-desktop(nested ipc not working)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 783513 # b2g(nested ipc not working) b2g-debug(nested ipc not working) b2g-desktop(nested ipc not working)

Просмотреть файл

@ -161,7 +161,7 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_overlapping_transactions.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_persistenceType.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #Bug 931116, b2g desktop specific, initial triage
[test_put_get_values.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_put_get_values_autoIncrement.html]

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = toolkit == 'android' #Not supported on Android
skip-if = toolkit == 'android' || e10s #Not supported on Android
support-files =
inputmethod_common.js
file_inputmethod.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
/.well-known/idp-proxy/idp.html
/.well-known/idp-proxy/idp-proxy.js

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
[test_ipc.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 910661 # b2g(nested ipc not working) b2g-debug(debug-only failure) b2g-desktop(nested ipc not working)

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
[test_sms_basics.html]
skip-if = toolkit == 'android' #Bug 909036

Просмотреть файл

@ -5,7 +5,7 @@ skip-if = toolkit == "gonk"
[test_tcpsocket_enabled_no_perm.html]
skip-if = toolkit == "gonk"
[test_tcpsocket_enabled_with_perm.html]
skip-if = toolkit == "gonk"
skip-if = toolkit == "gonk" || e10s
[test_networkstats_alarms.html]
skip-if = toolkit != "gonk"
[test_networkstats_basics.html]

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
file_framework.js
file_shim.html

Просмотреть файл

@ -1,3 +1,4 @@
[DEFAULT]
skip-if = e10s
[test_phonenumberutils_basics.html]

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #b2g-desktop(tests that use plugins)
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') || e10s #b2g-desktop(tests that use plugins)
support-files =
307-xo-redirect.sjs
crashing_subpage.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
[test_bug957893.html]
[test_bug957899.html]

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = (toolkit == 'gonk' && debug) #debug-only failure, bug 932878
skip-if = (toolkit == 'gonk' && debug) || e10s #debug-only failure, bug 932878
[test_settings_basics.html]
[test_settings_blobs.html]

Просмотреть файл

@ -1,3 +1,4 @@
[DEFAULT]
skip-if = e10s
[test_json.html]

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
fail.html
form-submit.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
manifest.json
dist/jquery.js

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
manifest.json
MochiKit/Async.js

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
FakeJSAN.js
MochiKit-Async.html

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = toolkit == 'android' #SLOW_DIRECTORY
skip-if = toolkit == 'android' || e10s #SLOW_DIRECTORY
support-files =
445544.cacheManifest
445544.cacheManifest^headers^

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
manifest.json
dist/prototype.js

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
manifest.json
lib/prototype.js

Просмотреть файл

@ -38,13 +38,13 @@ support-files =
[test_bug132255.html]
[test_bug159849.html]
[test_bug260264.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g)
[test_bug260264_nested.html]
skip-if = buildapp == 'b2g' # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g)
skip-if = buildapp == 'b2g' || e10s # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g)
[test_bug265203.html]
[test_bug291377.html]
[test_bug291653.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_bug304459.html]
[test_bug308856.html]
[test_bug327891.html]
@ -57,7 +57,7 @@ skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_bug351601.html]
[test_bug369306.html]
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' #TIMED_OUT # b2g-debug(test timed out, can't focus back from popup window to opener?) b2g-desktop(test timed out, can't focus back from popup window to opener?)
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' || e10s #TIMED_OUT # b2g-debug(test timed out, can't focus back from popup window to opener?) b2g-desktop(test timed out, can't focus back from popup window to opener?)
[test_bug370098.html]
[test_bug377539.html]
[test_bug384122.html]
@ -72,16 +72,16 @@ skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
[test_bug400204.html]
[test_bug404748.html]
[test_bug406375.html]
skip-if = buildapp == 'b2g' || toolkit == 'android'
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
[test_bug411103.html]
[test_bug414291.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_bug427744.html]
skip-if = buildapp == 'b2g' || toolkit == 'android'
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s
[test_bug42976.html]
[test_bug430276.html]
[test_bug437361.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(dom.disable_open_during_load not implemented in b2g, showmodaldialog) b2g-debug(dom.disable_open_during_load not implemented in b2g, showmodaldialog) b2g-desktop(dom.disable_open_during_load not implemented in b2g, showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(dom.disable_open_during_load not implemented in b2g, showmodaldialog) b2g-debug(dom.disable_open_during_load not implemented in b2g, showmodaldialog) b2g-desktop(dom.disable_open_during_load not implemented in b2g, showmodaldialog)
[test_bug440572.html]
[test_bug456151.html]
[test_bug458091.html]
@ -89,14 +89,14 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_bug459848.html]
[test_bug465263.html]
[test_bug479143.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_bug484775.html]
[test_bug492925.html]
[test_bug49312.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_bug495219.html]
[test_bug504862.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #RANDOM # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #RANDOM # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_bug529328.html]
[test_bug531176.html]
[test_bug531542.html]
@ -115,9 +115,9 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_bug593174.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_bug597809.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug61098.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_bug612267.html]
[test_bug617296.html]
[test_bug620947.html]
@ -125,7 +125,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(showmodaldialog) b2g-d
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_bug633133.html]
[test_bug641552.html]
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android'
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' || e10s
[test_bug642026.html]
[test_bug648465.html]
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
@ -154,14 +154,14 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
[test_bug876098.html]
[test_bug927901.html]
[test_devicemotion_multiple_listeners.html]
skip-if = toolkit == 'android' #bug 775227
skip-if = toolkit == 'android' || e10s #bug 775227
[test_domparser_after_blank.html]
[test_onerror_message.html]
[test_protochains.html]
[test_resize_move_windows.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #Windows can't change size and position on Android # b2g(Windows can't change size and position on B2G) b2g-debug(Windows can't change size and position on B2G) b2g-desktop(Windows can't change size and position on B2G)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #Windows can't change size and position on Android # b2g(Windows can't change size and position on B2G) b2g-debug(Windows can't change size and position on B2G) b2g-desktop(Windows can't change size and position on B2G)
[test_sizetocontent_clamp.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #Windows can't change size on Android # b2g(Windows can't change size on B2G) b2g-debug(Windows can't change size on B2G) b2g-desktop(Windows can't change size on B2G)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #Windows can't change size on Android # b2g(Windows can't change size on B2G) b2g-debug(Windows can't change size on B2G) b2g-desktop(Windows can't change size on B2G)
[test_toJSON.html]
[test_window_bar.html]
skip-if = buildapp == 'b2g' || toolkit == 'android'
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s

Просмотреть файл

@ -1 +1,2 @@
[test_legacy.html]
skip-if = e10s

Просмотреть файл

@ -1 +1,2 @@
[test_no_legacy.html]
skip-if = e10s

Просмотреть файл

@ -1,3 +1,4 @@
[DEFAULT]
skip-if = e10s
[test_getRandomValues.html]

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
gamepad_frame.html
gamepad_frame_state.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
497633.html
file_MozEnteredDomFullscreen.html

Просмотреть файл

@ -10,7 +10,7 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(Bug 910235
[test_allowWatch.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
[test_cachedPosition.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
[test_cancelCurrent.html]
skip-if = buildapp == 'b2g'
[test_cancelWatch.html]
@ -20,10 +20,10 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
[test_clearWatch_invalid.html]
skip-if = buildapp == 'b2g'
[test_errorcheck.html]
skip-if = toolkit=='gonk' || toolkit == 'android' #TIMED_OUT # b2g-debug(debug-only timeout)
skip-if = toolkit=='gonk' || toolkit == 'android' || e10s #TIMED_OUT # b2g-debug(debug-only timeout)
[test_geolocation_is_undefined_when_pref_is_off.html]
[test_handlerSpinsEventLoop.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #Don't run modal tests on Android # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #Don't run modal tests on Android # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog)
[test_manyCurrentConcurrent.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
[test_manyCurrentSerial.html]
@ -35,15 +35,15 @@ skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
[test_manyWindows.html]
skip-if = buildapp == 'b2g'
[test_mozsettings.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #mozSettings is undefined
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #mozSettings is undefined
[test_mozsettingsWatch.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #mozSettings is undefined
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #mozSettings is undefined
[test_optional_api_params.html]
skip-if = buildapp == 'b2g'
[test_shutdown.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
[test_timerRestartWatch.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #TIMED_OUT
[test_windowClose.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT
[test_worseAccuracyDoesNotBlockCallback.html]

Просмотреть файл

@ -30,7 +30,7 @@ skip-if = toolkit=='gonk' # b2g(4 failures) b2g-debug(debug-only failure)
[test_embededNulls.html]
[test_keySync.html]
[test_localStorageBase.html]
skip-if = buildapp == 'b2g' # b2g(no storage chrome event received)
skip-if = buildapp == 'b2g' || e10s # b2g(no storage chrome event received)
[test_localStorageBaseSessionOnly.html]
skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug))
[test_localStorageCookieSettings.html]

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
MockServices.js
NotificationTest.js

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files = bug507902-frame.html
[test_bug507902.html]

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
file_http.html
file_https.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
frameLocalStorageMaster.html
frameLocalStorageSlaveEqual.html

Просмотреть файл

@ -1,4 +1,5 @@
[DEFAULT]
skip-if = e10s
support-files =
file_bug_779982.html
file_bug_779982.js

Просмотреть файл

@ -25,7 +25,7 @@ support-files =
[test_MessageEvent.html]
[test_postMessage_basehref.html]
[test_postMessage_closed.html]
skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 894914 - wrong data - got FAIL, expected message # b2g(bug 894914 - wrong data - got FAIL, expected message) b2g-debug(bug 894914 - wrong data - got FAIL, expected message) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
skip-if = buildapp == 'b2g' || toolkit == 'android' || e10s #bug 894914 - wrong data - got FAIL, expected message # b2g(bug 894914 - wrong data - got FAIL, expected message) b2g-debug(bug 894914 - wrong data - got FAIL, expected message) b2g-desktop(Bug 931116, b2g desktop specific, initial triage)
[test_postMessage_hash.html]
[test_postMessage.html]
[test_postMessage_idn.xhtml]

Просмотреть файл

@ -120,7 +120,7 @@ skip-if = buildapp == 'b2g' # b2g(Failed to load script: relativeLoad_import.js)
[test_sharedWorker.html]
[test_simpleThread.html]
[test_suspend.html]
skip-if = buildapp == 'b2g' # b2g(test timed out, might need more time) b2g-debug(test timed out, might need more time) b2g-desktop(test timed out, might need more time)
skip-if = buildapp == 'b2g' || e10s # b2g(test timed out, might need more time) b2g-debug(test timed out, might need more time) b2g-desktop(test timed out, might need more time)
[test_terminate.html]
[test_threadErrors.html]
[test_threadTimeouts.html]
@ -137,12 +137,12 @@ skip-if = (toolkit == 'gonk' && debug) #debug-only crash, bug 931887
[test_xhr_headers.html]
[test_xhr_implicit_cancel.html]
[test_xhr_parameters.html]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s
[test_xhr_parameters.js]
[test_xhr_system.html]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s
[test_xhr_system.js]
[test_xhr_timeout.html]
skip-if = (os == "win") || (os == "mac") || toolkit == 'android' #bug 798220
skip-if = (os == "win") || (os == "mac") || toolkit == 'android' || e10s #bug 798220
[test_url_exceptions.html]
[test_urlSearchParams.html]

Просмотреть файл

@ -8,7 +8,7 @@ skip-if = toolkit == 'android'
[test_bug514156.html]
[test_bug567213.html]
[test_bug586662.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug599983.html]
[test_bug742261.html]
[test_bug773262.html]

Просмотреть файл

@ -24,11 +24,11 @@ skip-if = os != "mac"
skip-if = toolkit == 'android'
[test_bug404320.html]
[test_bug410986.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug414526.html]
[test_bug417418.html]
[test_bug432225.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug439808.html]
[test_bug442186.html]
[test_bug449243.html]
@ -37,20 +37,20 @@ skip-if = toolkit == 'android'
[test_bug460740.html]
[test_bug468353.html]
[test_bug478725.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug480647.html]
[test_bug480972.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug484181.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug487524.html]
[test_bug520189.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug525389.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug537046.html]
[test_bug549262.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug550434.html]
[test_bug551704.html]
[test_bug552782.html]
@ -60,7 +60,7 @@ skip-if = toolkit == 'android'
[test_bug592592.html]
[test_bug597784.html]
[test_bug599322.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug607584.html]
[test_bug611182.html]
skip-if = toolkit == 'android'
@ -72,11 +72,12 @@ skip-if = toolkit == 'android' #TIMED_OUT
skip-if = toolkit == 'android' #bug 957797
[test_bug629845.html]
[test_bug640321.html]
skip-if = e10s
[test_bug668599.html]
[test_bug674770-1.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug674770-2.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug674861.html]
[test_bug676401.html]
[test_bug677752.html]
@ -102,5 +103,6 @@ skip-if = os != "win"
[test_keypress_untrusted_event.html]
[test_root_element_replacement.html]
[test_select_all_without_body.html]
skip-if = e10s
[test_spellcheck_pref.html]
skip-if = toolkit == 'android'

Просмотреть файл

@ -4,11 +4,11 @@ skip-if = buildapp == 'b2g'
[test_bug318065.html]
[test_bug471722.html]
[test_bug527935.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug590554.html]
[test_bug596001.html]
[test_bug596333.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug596506.html]
[test_bug597331.html]
[test_bug600570.html]
@ -19,7 +19,7 @@ skip-if = toolkit == 'android'
skip-if = toolkit == 'android'
[test_bug625452.html]
[test_bug629172.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s
[test_bug638596.html]
[test_bug641466.html]
[test_bug645914.html]

Просмотреть файл

@ -12,4 +12,4 @@ skip-if = toolkit == 'android'
[test_nsFind.html]
[test_private_window_from_content.html]
[test_window_open_units.html]
skip-if = toolkit == 'android'
skip-if = toolkit == 'android' || e10s

Просмотреть файл

@ -1,5 +1,5 @@
[DEFAULT]
skip-if = buildapp == 'b2g'
skip-if = buildapp == 'b2g' || e10s
support-files =
beltzner.jpg
beltzner.jpg^headers^

Просмотреть файл

@ -4,10 +4,6 @@
include $(topsrcdir)/config/rules.mk
ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
CXXFLAGS += -I$(ANDROID_SOURCE)/hardware/libhardware/include
endif
DEFINES := $(filter-out -DUNICODE,$(DEFINES))
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше