Commit Graph

29851 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
ce135ea776 Merge mozilla-central to b2g-inbound 2015-01-22 14:41:48 +01:00
Carsten "Tomcat" Book
22bec65ed2 merge mozilla-inbound to mozilla-central a=merge 2015-01-22 14:30:51 +01:00
Eden Chuang
a53531f9f7 Bug 1055699 - integrate volume isRemovable status. r=dhylands 2015-01-22 13:48:12 +08:00
Dimi Lee
1b2902b630 Bug 1105666 - [BrowserAPI] Add an API to indicate this iframe could receive NFC event. r=smaug, kanru, yoshi 2015-01-22 17:40:17 +08:00
Thomas Zimmermann
4a00715925 Bug 1124565: Fix position of const qualifiers for |sDefaultBackend|, r=shuang
This patch fixes the position of the second const qualifier for
|sDefaultBackend|. Both, pointer and memory, are now marked as
constant.
2015-01-22 10:52:18 +01:00
Wes Kocher
6b6ca4243b Merge m-c to fx-team a=merge 2015-01-21 16:28:27 -08:00
Steven Michaud
baee3bf3f5 Bug 1118615 - Flash hangs in HiDPI mode on OS X running peopleroulette app, fix comments. r=fix-comments 2015-01-21 14:45:05 -06:00
Andreas Pehrson
2c3b0d0a32 Bug 992685 - Part 3. Test video element resize event. r=roc 2015-01-19 23:46:00 +01:00
Carsten "Tomcat" Book
547f782a47 merge mozilla-inbound to mozilla-central a=merge 2015-01-21 14:21:49 +01:00
Carsten "Tomcat" Book
d38c6a6af7 merge fx-team to mozilla-central a=merge 2015-01-21 14:05:24 +01:00
Phil Ringnalda
8edbabf141 Backed out 4 changesets (bug 1117650) because moving tests causes WebRTC tests to move from running first in a linux64 debug mochitest-e10s chunk to running last in another chunk, and they fail if they run last in a chunk
CLOSED TREE

Backed out changeset 9318cab3bd13 (bug 1117650)
Backed out changeset aff44058c799 (bug 1117650)
Backed out changeset eef01ed4d406 (bug 1117650)
Backed out changeset 1b25392be437 (bug 1117650)

--HG--
rename : dom/security/test/TestCSPParser.cpp => dom/base/test/TestCSPParser.cpp
rename : dom/security/test/csp/chrome.ini => dom/base/test/csp/chrome.ini
rename : dom/security/test/csp/file_CSP.css => dom/base/test/csp/file_CSP.css
rename : dom/security/test/csp/file_CSP.sjs => dom/base/test/csp/file_CSP.sjs
rename : dom/security/test/csp/file_bug663567.xsl => dom/base/test/csp/file_CSP_bug663567.xsl
rename : dom/security/test/csp/file_bug663567_allows.xml => dom/base/test/csp/file_CSP_bug663567_allows.xml
rename : dom/security/test/csp/file_bug663567_allows.xml^headers^ => dom/base/test/csp/file_CSP_bug663567_allows.xml^headers^
rename : dom/security/test/csp/file_bug663567_blocks.xml => dom/base/test/csp/file_CSP_bug663567_blocks.xml
rename : dom/security/test/csp/file_bug663567_blocks.xml^headers^ => dom/base/test/csp/file_CSP_bug663567_blocks.xml^headers^
rename : dom/security/test/csp/file_bug802872.html => dom/base/test/csp/file_CSP_bug802872.html
rename : dom/security/test/csp/file_bug802872.html^headers^ => dom/base/test/csp/file_CSP_bug802872.html^headers^
rename : dom/security/test/csp/file_bug802872.js => dom/base/test/csp/file_CSP_bug802872.js
rename : dom/security/test/csp/file_bug802872.sjs => dom/base/test/csp/file_CSP_bug802872.sjs
rename : dom/security/test/csp/file_bug885433_allows.html => dom/base/test/csp/file_CSP_bug885433_allows.html
rename : dom/security/test/csp/file_bug885433_allows.html^headers^ => dom/base/test/csp/file_CSP_bug885433_allows.html^headers^
rename : dom/security/test/csp/file_bug885433_blocks.html => dom/base/test/csp/file_CSP_bug885433_blocks.html
rename : dom/security/test/csp/file_bug885433_blocks.html^headers^ => dom/base/test/csp/file_CSP_bug885433_blocks.html^headers^
rename : dom/security/test/csp/file_bug888172.html => dom/base/test/csp/file_CSP_bug888172.html
rename : dom/security/test/csp/file_bug888172.sjs => dom/base/test/csp/file_CSP_bug888172.sjs
rename : dom/security/test/csp/file_bug909029_none.html => dom/base/test/csp/file_CSP_bug909029_none.html
rename : dom/security/test/csp/file_bug909029_none.html^headers^ => dom/base/test/csp/file_CSP_bug909029_none.html^headers^
rename : dom/security/test/csp/file_bug909029_star.html => dom/base/test/csp/file_CSP_bug909029_star.html
rename : dom/security/test/csp/file_bug909029_star.html^headers^ => dom/base/test/csp/file_CSP_bug909029_star.html^headers^
rename : dom/security/test/csp/file_bug910139.sjs => dom/base/test/csp/file_CSP_bug910139.sjs
rename : dom/security/test/csp/file_bug910139.xml => dom/base/test/csp/file_CSP_bug910139.xml
rename : dom/security/test/csp/file_bug910139.xsl => dom/base/test/csp/file_CSP_bug910139.xsl
rename : dom/security/test/csp/file_bug941404.html => dom/base/test/csp/file_CSP_bug941404.html
rename : dom/security/test/csp/file_bug941404_xhr.html => dom/base/test/csp/file_CSP_bug941404_xhr.html
rename : dom/security/test/csp/file_bug941404_xhr.html^headers^ => dom/base/test/csp/file_CSP_bug941404_xhr.html^headers^
rename : dom/security/test/csp/file_evalscript_main.html => dom/base/test/csp/file_CSP_evalscript_main.html
rename : dom/security/test/csp/file_evalscript_main.html^headers^ => dom/base/test/csp/file_CSP_evalscript_main.html^headers^
rename : dom/security/test/csp/file_evalscript_main.js => dom/base/test/csp/file_CSP_evalscript_main.js
rename : dom/security/test/csp/file_evalscript_main_allowed.html => dom/base/test/csp/file_CSP_evalscript_main_allowed.html
rename : dom/security/test/csp/file_evalscript_main_allowed.html^headers^ => dom/base/test/csp/file_CSP_evalscript_main_allowed.html^headers^
rename : dom/security/test/csp/file_evalscript_main_allowed.js => dom/base/test/csp/file_CSP_evalscript_main_allowed.js
rename : dom/security/test/csp/file_frameancestors.sjs => dom/base/test/csp/file_CSP_frameancestors.sjs
rename : dom/security/test/csp/file_frameancestors_main.html => dom/base/test/csp/file_CSP_frameancestors_main.html
rename : dom/security/test/csp/file_frameancestors_main.js => dom/base/test/csp/file_CSP_frameancestors_main.js
rename : dom/security/test/csp/file_inlinescript_main.html => dom/base/test/csp/file_CSP_inlinescript_main.html
rename : dom/security/test/csp/file_inlinescript_main.html^headers^ => dom/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename : dom/security/test/csp/file_inlinescript_main_allowed.html => dom/base/test/csp/file_CSP_inlinescript_main_allowed.html
rename : dom/security/test/csp/file_inlinescript_main_allowed.html^headers^ => dom/base/test/csp/file_CSP_inlinescript_main_allowed.html^headers^
rename : dom/security/test/csp/file_inlinestyle_main.html => dom/base/test/csp/file_CSP_inlinestyle_main.html
rename : dom/security/test/csp/file_inlinestyle_main.html^headers^ => dom/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename : dom/security/test/csp/file_inlinestyle_main_allowed.html => dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html
rename : dom/security/test/csp/file_inlinestyle_main_allowed.html^headers^ => dom/base/test/csp/file_CSP_inlinestyle_main_allowed.html^headers^
rename : dom/security/test/csp/file_main.html => dom/base/test/csp/file_CSP_main.html
rename : dom/security/test/csp/file_main.html^headers^ => dom/base/test/csp/file_CSP_main.html^headers^
rename : dom/security/test/csp/file_main.js => dom/base/test/csp/file_CSP_main.js
rename : dom/security/test/csp/file_base-uri.html => dom/base/test/csp/file_base-uri.html
rename : dom/security/test/csp/file_bug836922_npolicies.html => dom/base/test/csp/file_bug836922_npolicies.html
rename : dom/security/test/csp/file_bug836922_npolicies.html^headers^ => dom/base/test/csp/file_bug836922_npolicies.html^headers^
rename : dom/security/test/csp/file_bug836922_npolicies_ro_violation.sjs => dom/base/test/csp/file_bug836922_npolicies_ro_violation.sjs
rename : dom/security/test/csp/file_bug836922_npolicies_violation.sjs => dom/base/test/csp/file_bug836922_npolicies_violation.sjs
rename : dom/security/test/csp/file_bug886164.html => dom/base/test/csp/file_bug886164.html
rename : dom/security/test/csp/file_bug886164.html^headers^ => dom/base/test/csp/file_bug886164.html^headers^
rename : dom/security/test/csp/file_bug886164_2.html => dom/base/test/csp/file_bug886164_2.html
rename : dom/security/test/csp/file_bug886164_2.html^headers^ => dom/base/test/csp/file_bug886164_2.html^headers^
rename : dom/security/test/csp/file_bug886164_3.html => dom/base/test/csp/file_bug886164_3.html
rename : dom/security/test/csp/file_bug886164_3.html^headers^ => dom/base/test/csp/file_bug886164_3.html^headers^
rename : dom/security/test/csp/file_bug886164_4.html => dom/base/test/csp/file_bug886164_4.html
rename : dom/security/test/csp/file_bug886164_4.html^headers^ => dom/base/test/csp/file_bug886164_4.html^headers^
rename : dom/security/test/csp/file_bug886164_5.html => dom/base/test/csp/file_bug886164_5.html
rename : dom/security/test/csp/file_bug886164_5.html^headers^ => dom/base/test/csp/file_bug886164_5.html^headers^
rename : dom/security/test/csp/file_bug886164_6.html => dom/base/test/csp/file_bug886164_6.html
rename : dom/security/test/csp/file_bug886164_6.html^headers^ => dom/base/test/csp/file_bug886164_6.html^headers^
rename : dom/security/test/csp/file_connect-src.html => dom/base/test/csp/file_connect-src.html
rename : dom/security/test/csp/file_allow_https_schemes.html => dom/base/test/csp/file_csp_allow_https_schemes.html
rename : dom/security/test/csp/file_bug768029.html => dom/base/test/csp/file_csp_bug768029.html
rename : dom/security/test/csp/file_bug768029.sjs => dom/base/test/csp/file_csp_bug768029.sjs
rename : dom/security/test/csp/file_bug773891.html => dom/base/test/csp/file_csp_bug773891.html
rename : dom/security/test/csp/file_bug773891.sjs => dom/base/test/csp/file_csp_bug773891.sjs
rename : dom/security/test/csp/file_invalid_source_expression.html => dom/base/test/csp/file_csp_invalid_source_expression.html
rename : dom/security/test/csp/file_path_matching.html => dom/base/test/csp/file_csp_path_matching.html
rename : dom/security/test/csp/file_path_matching.js => dom/base/test/csp/file_csp_path_matching.js
rename : dom/security/test/csp/file_path_matching_redirect.html => dom/base/test/csp/file_csp_path_matching_redirect.html
rename : dom/security/test/csp/file_path_matching_redirect_server.sjs => dom/base/test/csp/file_csp_path_matching_redirect_server.sjs
rename : dom/security/test/csp/file_redirects_main.html => dom/base/test/csp/file_csp_redirects_main.html
rename : dom/security/test/csp/file_redirects_page.sjs => dom/base/test/csp/file_csp_redirects_page.sjs
rename : dom/security/test/csp/file_redirects_resource.sjs => dom/base/test/csp/file_csp_redirects_resource.sjs
rename : dom/security/test/csp/file_referrerdirective.html => dom/base/test/csp/file_csp_referrerdirective.html
rename : dom/security/test/csp/file_report.html => dom/base/test/csp/file_csp_report.html
rename : dom/security/test/csp/file_testserver.sjs => dom/base/test/csp/file_csp_testserver.sjs
rename : dom/security/test/csp/file_form-action.html => dom/base/test/csp/file_form-action.html
rename : dom/security/test/csp/file_hash_source.html => dom/base/test/csp/file_hash_source.html
rename : dom/security/test/csp/file_hash_source.html^headers^ => dom/base/test/csp/file_hash_source.html^headers^
rename : dom/security/test/csp/file_leading_wildcard.html => dom/base/test/csp/file_leading_wildcard.html
rename : dom/security/test/csp/file_multi_policy_injection_bypass.html => dom/base/test/csp/file_multi_policy_injection_bypass.html
rename : dom/security/test/csp/file_multi_policy_injection_bypass.html^headers^ => dom/base/test/csp/file_multi_policy_injection_bypass.html^headers^
rename : dom/security/test/csp/file_multi_policy_injection_bypass_2.html => dom/base/test/csp/file_multi_policy_injection_bypass_2.html
rename : dom/security/test/csp/file_multi_policy_injection_bypass_2.html^headers^ => dom/base/test/csp/file_multi_policy_injection_bypass_2.html^headers^
rename : dom/security/test/csp/file_nonce_source.html => dom/base/test/csp/file_nonce_source.html
rename : dom/security/test/csp/file_nonce_source.html^headers^ => dom/base/test/csp/file_nonce_source.html^headers^
rename : dom/security/test/csp/file_policyuri_regression_from_multipolicy.html => dom/base/test/csp/file_policyuri_regression_from_multipolicy.html
rename : dom/security/test/csp/file_policyuri_regression_from_multipolicy.html^headers^ => dom/base/test/csp/file_policyuri_regression_from_multipolicy.html^headers^
rename : dom/security/test/csp/file_policyuri_regression_from_multipolicy_policy => dom/base/test/csp/file_policyuri_regression_from_multipolicy_policy
rename : dom/security/test/csp/file_redirect_content.sjs => dom/base/test/csp/file_redirect_content.sjs
rename : dom/security/test/csp/file_redirect_report.sjs => dom/base/test/csp/file_redirect_report.sjs
rename : dom/security/test/csp/file_report_uri_missing_in_report_only_header.html => dom/base/test/csp/file_report_uri_missing_in_report_only_header.html
rename : dom/security/test/csp/file_report_uri_missing_in_report_only_header.html^headers^ => dom/base/test/csp/file_report_uri_missing_in_report_only_header.html^headers^
rename : dom/security/test/csp/file_self_none_as_hostname_confusion.html => dom/base/test/csp/file_self_none_as_hostname_confusion.html
rename : dom/security/test/csp/file_self_none_as_hostname_confusion.html^headers^ => dom/base/test/csp/file_self_none_as_hostname_confusion.html^headers^
rename : dom/security/test/csp/file_subframe_run_js_if_allowed.html => dom/base/test/csp/file_subframe_run_js_if_allowed.html
rename : dom/security/test/csp/file_subframe_run_js_if_allowed.html^headers^ => dom/base/test/csp/file_subframe_run_js_if_allowed.html^headers^
rename : dom/security/test/csp/file_worker_redirect.html => dom/base/test/csp/file_worker_redirect.html
rename : dom/security/test/csp/file_worker_redirect.sjs => dom/base/test/csp/file_worker_redirect.sjs
rename : dom/security/test/csp/mochitest.ini => dom/base/test/csp/mochitest.ini
rename : dom/security/test/csp/referrerdirective.sjs => dom/base/test/csp/referrerdirective.sjs
rename : dom/security/test/csp/test_301_redirect.html => dom/base/test/csp/test_301_redirect.html
rename : dom/security/test/csp/test_302_redirect.html => dom/base/test/csp/test_302_redirect.html
rename : dom/security/test/csp/test_303_redirect.html => dom/base/test/csp/test_303_redirect.html
rename : dom/security/test/csp/test_307_redirect.html => dom/base/test/csp/test_307_redirect.html
rename : dom/security/test/csp/test_CSP.html => dom/base/test/csp/test_CSP.html
rename : dom/security/test/csp/test_bug663567.html => dom/base/test/csp/test_CSP_bug663567.html
rename : dom/security/test/csp/test_bug802872.html => dom/base/test/csp/test_CSP_bug802872.html
rename : dom/security/test/csp/test_bug885433.html => dom/base/test/csp/test_CSP_bug885433.html
rename : dom/security/test/csp/test_bug888172.html => dom/base/test/csp/test_CSP_bug888172.html
rename : dom/security/test/csp/test_bug909029.html => dom/base/test/csp/test_CSP_bug909029.html
rename : dom/security/test/csp/test_bug910139.html => dom/base/test/csp/test_CSP_bug910139.html
rename : dom/security/test/csp/test_bug941404.html => dom/base/test/csp/test_CSP_bug941404.html
rename : dom/security/test/csp/test_evalscript.html => dom/base/test/csp/test_CSP_evalscript.html
rename : dom/security/test/csp/test_frameancestors.html => dom/base/test/csp/test_CSP_frameancestors.html
rename : dom/security/test/csp/test_inlinescript.html => dom/base/test/csp/test_CSP_inlinescript.html
rename : dom/security/test/csp/test_inlinestyle.html => dom/base/test/csp/test_CSP_inlinestyle.html
rename : dom/security/test/csp/test_referrerdirective.html => dom/base/test/csp/test_CSP_referrerdirective.html
rename : dom/security/test/csp/test_base-uri.html => dom/base/test/csp/test_base-uri.html
rename : dom/security/test/csp/test_bug836922_npolicies.html => dom/base/test/csp/test_bug836922_npolicies.html
rename : dom/security/test/csp/test_bug886164.html => dom/base/test/csp/test_bug886164.html
rename : dom/security/test/csp/test_bug949549.html => dom/base/test/csp/test_bug949549.html
rename : dom/security/test/csp/test_connect-src.html => dom/base/test/csp/test_connect-src.html
rename : dom/security/test/csp/test_allow_https_schemes.html => dom/base/test/csp/test_csp_allow_https_schemes.html
rename : dom/security/test/csp/test_bug768029.html => dom/base/test/csp/test_csp_bug768029.html
rename : dom/security/test/csp/test_bug773891.html => dom/base/test/csp/test_csp_bug773891.html
rename : dom/security/test/csp/test_invalid_source_expression.html => dom/base/test/csp/test_csp_invalid_source_expression.html
rename : dom/security/test/csp/test_path_matching.html => dom/base/test/csp/test_csp_path_matching.html
rename : dom/security/test/csp/test_path_matching_redirect.html => dom/base/test/csp/test_csp_path_matching_redirect.html
rename : dom/security/test/csp/test_redirects.html => dom/base/test/csp/test_csp_redirects.html
rename : dom/security/test/csp/test_report.html => dom/base/test/csp/test_csp_report.html
rename : dom/security/test/csp/test_form-action.html => dom/base/test/csp/test_form-action.html
rename : dom/security/test/csp/test_hash_source.html => dom/base/test/csp/test_hash_source.html
rename : dom/security/test/csp/test_leading_wildcard.html => dom/base/test/csp/test_leading_wildcard.html
rename : dom/security/test/csp/test_multi_policy_injection_bypass.html => dom/base/test/csp/test_multi_policy_injection_bypass.html
rename : dom/security/test/csp/test_nonce_source.html => dom/base/test/csp/test_nonce_source.html
rename : dom/security/test/csp/test_policyuri_regression_from_multipolicy.html => dom/base/test/csp/test_policyuri_regression_from_multipolicy.html
rename : dom/security/test/csp/test_report_uri_missing_in_report_only_header.html => dom/base/test/csp/test_report_uri_missing_in_report_only_header.html
rename : dom/security/test/csp/test_self_none_as_hostname_confusion.html => dom/base/test/csp/test_self_none_as_hostname_confusion.html
rename : dom/security/test/csp/test_subframe_run_js_if_allowed.html => dom/base/test/csp/test_subframe_run_js_if_allowed.html
rename : dom/security/test/csp/test_worker_redirect.html => dom/base/test/csp/test_worker_redirect.html
rename : dom/security/test/cors/file_CrossSiteXHR_cache_server.sjs => dom/base/test/file_CrossSiteXHR_cache_server.sjs
rename : dom/security/test/cors/file_CrossSiteXHR_inner.html => dom/base/test/file_CrossSiteXHR_inner.html
rename : dom/security/test/cors/file_CrossSiteXHR_inner.jar => dom/base/test/file_CrossSiteXHR_inner.jar
rename : dom/security/test/cors/file_CrossSiteXHR_inner_data.sjs => dom/base/test/file_CrossSiteXHR_inner_data.sjs
rename : dom/security/test/cors/file_CrossSiteXHR_server.sjs => dom/base/test/file_CrossSiteXHR_server.sjs
rename : dom/security/test/mixedcontentblocker/file_bug803225_test_mailto.html => dom/base/test/mixedcontentblocker/bug803225_test_mailto.html
rename : dom/security/test/mixedcontentblocker/file_frameNavigation.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation.html
rename : dom/security/test/mixedcontentblocker/file_frameNavigation_blankTarget.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_blankTarget.html
rename : dom/security/test/mixedcontentblocker/file_frameNavigation_grandchild.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_grandchild.html
rename : dom/security/test/mixedcontentblocker/file_frameNavigation_innermost.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_innermost.html
rename : dom/security/test/mixedcontentblocker/file_frameNavigation_secure.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure.html
rename : dom/security/test/mixedcontentblocker/file_frameNavigation_secure_grandchild.html => dom/base/test/mixedcontentblocker/file_mixed_content_frameNavigation_secure_grandchild.html
rename : dom/security/test/mixedcontentblocker/file_main.html => dom/base/test/mixedcontentblocker/file_mixed_content_main.html
rename : dom/security/test/mixedcontentblocker/file_main_bug803225.html => dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225.html
rename : dom/security/test/mixedcontentblocker/file_main_bug803225_websocket_wsh.py => dom/base/test/mixedcontentblocker/file_mixed_content_main_bug803225_websocket_wsh.py
rename : dom/security/test/mixedcontentblocker/file_server.sjs => dom/base/test/mixedcontentblocker/file_mixed_content_server.sjs
rename : dom/security/test/mixedcontentblocker/mochitest.ini => dom/base/test/mixedcontentblocker/mochitest.ini
rename : dom/security/test/mixedcontentblocker/test_main.html => dom/base/test/mixedcontentblocker/test_mixed_content_blocker.html
rename : dom/security/test/mixedcontentblocker/test_bug803225.html => dom/base/test/mixedcontentblocker/test_mixed_content_blocker_bug803225.html
rename : dom/security/test/mixedcontentblocker/test_frameNavigation.html => dom/base/test/mixedcontentblocker/test_mixed_content_blocker_frameNavigation.html
rename : dom/security/test/cors/test_CrossSiteXHR.html => dom/base/test/test_CrossSiteXHR.html
rename : dom/security/test/cors/test_CrossSiteXHR_cache.html => dom/base/test/test_CrossSiteXHR_cache.html
rename : dom/security/test/cors/test_CrossSiteXHR_origin.html => dom/base/test/test_CrossSiteXHR_origin.html
rename : dom/security/test/unit/test_cspreports.js => dom/base/test/unit/test_cspreports.js
2015-01-20 22:48:32 -08:00
Phil Ringnalda
cf893a0355 Bug 1117650 followup, unbreak fetch test by telling it where the cors server moved, rs=bholley
CLOSED TREE
2015-01-20 21:57:18 -08:00
Bevis Tseng
7e20f1e3d8 Bug 1122330 - Part 2: Add Corresponding Test Case to Verify Empty String for GET INPUT. r=echen
--HG--
extra : histedit_source : e66190acdb43138b6bb09338fa8e6b874d6cbec8
2015-01-19 19:56:26 +08:00
Bevis Tseng
61bb32d6db Bug 1122330 - Part 1: Identify Empty String to Encode String TLV into TR Properly. r=echen
--HG--
extra : histedit_source : 1d2eccd1949b6a13837289843cdb7db186dee90b
2015-01-19 19:54:54 +08:00
Benjamin Chen
9d71b9259a Bug 1118632 - Fix the duration updated by mp3 incremental parser when we are playing a non-mp3 stream. r=cajbir 2015-01-16 18:59:12 +08:00
Jan-Ivar Bruaroey
399832a769 Bug 1111666 - Refactor setRemoteDescription to use promises and DOMException. r=mt 2015-01-20 01:09:45 -05:00
Jan-Ivar Bruaroey
1d3172e2e9 Bug 1111666 - peerConnection legacy error callbacks working with line numbers. r=mt 2015-01-20 09:41:55 -05:00
Jan-Ivar Bruaroey
cb1dd9591f Bug 1111666 - Have peerConnection throw DOMException. r=mt 2015-01-16 15:00:09 -05:00
Blake Wu
edf683d7d9 Bug 1101565 - Add locks to those functions which read mCodec. r=sotaro
--HG--
extra : rebase_source : d27444a121ba4a4b469f256d5056f7a435fde5bd
2015-01-19 19:00:18 +08:00
Ethan Tseng
deb8b0fdcc Bug 1116715 - [NetworkStats] DB upgrade pattern of NetworkStats is error-prone. r=albert, f=bent 2015-01-06 16:25:14 +08:00
Jan-Ivar Bruaroey
15981514a7 Bug 1115998 - Support RTCIceServer.urls (plural) array form. r=smaug, r=mt 2015-01-20 10:08:00 -05:00
Bevis Tseng
f81b84fff7 Bug 1117609 - Part 2: Add Test case to verify additional information inside TR. r=echen
--HG--
extra : histedit_source : cc4ab98406ed166eb1eefa96f3f0fb7998ffc15b
2015-01-05 17:17:50 +08:00
Bevis Tseng
c6766e8477 Bug 1117609 - Part 1: Add Support of "Additional Info on Result" in STK Terminal Response. r=echen, r=hsinyi
--HG--
extra : histedit_source : 30568f5c4d8db61fee29e6b6e9684bb1874a1b83
2015-01-05 16:05:17 +08:00
Ryan VanderMeulen
14ee341ae2 Merge inbound to m-c. a=merge 2015-01-20 22:12:46 -05:00
Steven Michaud
a3a1208d8a Bug 1117027 - Unity DT2 demo crashes on first click with e10s disabled on OS X. r=mstange 2015-01-20 16:26:38 -06:00
Bill McCloskey
a3f03bc015 Bug 1051842 - Backout e1dd58a149d2 (bug 1051842) due to bug 1122208 2015-01-20 14:03:33 -08:00
Bill McCloskey
fa5a376e2a Bug 1051842 - Backout 734517b508b5 (bug 1051842) due to bug 1122208 2015-01-20 14:01:24 -08:00
Boris Zbarsky
f718167620 Bug 1121688. Filter out overloads with non-worker-exposed arguments when generating worker bindings. r=peterv 2015-01-20 16:44:14 -05:00
Carsten "Tomcat" Book
35ab7fc33b Merge mozilla-central to b2g-inbound 2015-01-20 13:23:50 +01:00
Carsten "Tomcat" Book
4eedb12bdb merge b2g-inbound to mozilla-central a=merge 2015-01-20 12:12:12 +01:00
Thomas Zimmermann
78fac53b18 Bug 1065336: Implement Bluetooth backend selection; use daemon by default, r=shawnjohnjr
This patch adds proper selection of the Bluetooth backend. The backend
is configurable via environment property 'ro.moz.bluetooth.backend'. The
default value is bluetoothd.

On systems that are not Android 4.2 or later, the code does not return
a backend. These systems should use BlueZ instead.
2015-01-20 10:05:45 +01:00
Jessica Jong
1afabfa0c2 Bug 1116434 - adapt Lollipop netd commands in wifi/usb tethering. r=echen 2015-01-20 15:53:58 +08:00
Nicholas Nethercote
b03aa682f8 Bug 1123527 - Fix syntax error in BT_WARNING and BT_LOGD. r=btian.
cppcheck identified the extra ')' at the end of these macros. This code must
not be compiled in any of our standard configurations.

--HG--
extra : rebase_source : 4044d377e3a15ef725ac276ab54a192df63a8eb6
2015-01-19 19:12:43 -08:00
Phil Ringnalda
c483e54f3e Merge m-c to b-i 2015-01-19 18:44:24 -08:00
Phil Ringnalda
952870150c Merge b-i to m-c, a=merge 2015-01-19 18:36:55 -08:00
Thomas Zimmermann
ee862b25f8 Bug 1119746: Support random postfix for Bluetooth daemon socket name, r=btian
This patch adds support for a random postfix for bluetoothd's socket
name. The postfix is re-generated for every instance of the daemon.
This prevents name collisions between mutliple sessions and malicious
programs from taking over the connection easily.
2015-01-20 10:17:45 +08:00
Thomas Zimmermann
e9656fbfb0 Bug 1119746: Listen for socket connections when starting Bluetooth, r=btian
Currently, Gecko connects to a running instance of bluetoothd when
it starts the daemon backend. This contains a race condition between
the startup of the daemon and the startup of Gecko.

This patch changes the initialization and cleanup of Bluetooth's
daemon backend so that the Bluetooth daemon connects to Gecko. The
daemon process is now started as part of the initialization and
quits during shutdown. The steps are strictly ordered, so no race
condition exists.

The initialization and cleanup procedures should now be compatible
with BlueZ 5.
2015-01-20 10:17:40 +08:00
Thomas Zimmermann
fcc2137c6d Bug 1119746: Fix ref-counting of bluetoothd channels, r=btian
The class |BluetoothDaemonChannel| for the bluetoothd channels
supports reference counting. This patch fixes the respective
variable to use |nsRefPtr| instead of |nsAutoPtr|.
2015-01-20 10:17:31 +08:00
Jamin Liu
1f883b28e2 Bug 1119734 - Delay registering Bluetooth signal handler if pairing event handlers haven't been attached. r=btian 2015-01-20 09:52:41 +08:00
Ehsan Akhgari
f0bce7122f Merge m-c into b2g-inbound 2015-01-19 14:35:38 -05:00
Fernando Jimenez
36196523b2 Bug 1097928 - Convert MozPaymentProvider to WebIDL. Android. r=wjohnston 2015-01-19 14:50:54 +01:00
Fernando Jimenez
61e3a5f489 Bug 1097928 - Convert MozPaymentProvider to WebIDL. r=bholley,fabrice 2015-01-19 14:50:32 +01:00
Ehsan Akhgari
4d13cfb6cd Bug 1122987 - Mark nsPIDOMWindow::mInnerWindow as non-owning; r=smaug
The inner window holds an owning reference to its outer window,
and the outer window holds a non-owning reference back to its
inner window.  The non-owning reference is managed by
nsGlobalWindow.
2015-01-17 21:19:17 -05:00
Phil Ringnalda
823e1db1a5 Back out 3 changesets (bug 885982, bug 1118063) for b2g mochitest-6 bustage
CLOSED TREE

Backed out changeset 865e7bc208df (bug 885982)
Backed out changeset 9ede577f5ada (bug 885982)
Backed out changeset 6ccc86f7429e (bug 1118063)

--HG--
rename : dom/network/interfaces/nsITCPServerSocketInternal.idl => dom/network/interfaces/nsIDOMTCPServerSocket.idl
2015-01-17 13:26:10 -08:00
Phil Ringnalda
ff3434a37f Merge m-c to m-i 2015-01-17 13:11:55 -08:00
Phil Ringnalda
4a642ef564 Merge b-i to m-c, a=merge 2015-01-17 13:06:16 -08:00
Andrea Marchesini
f6d9fe809a Bug 1122553 - BroadcastChannel should keep FileImpl alive when sent to the PBackground actors, r=bent 2015-01-17 07:29:15 +00:00
Wes Kocher
7c3409c078 Merge m-c to b2g-inbound a=merge 2015-01-16 18:07:28 -08:00
Wes Kocher
1f7c41def6 Merge inbound to m-c a=merge 2015-01-16 17:33:04 -08:00
Bill McCloskey
7b3fe0714a Backout bug 1118618 on a CLOSED TREE 2015-01-16 14:46:05 -08:00