Phil Ringnalda
1dffe9f769
Merge fx-team to m-c
2013-09-08 08:26:23 -07:00
Paul Rouget
6db329d493
Bug 913440 - Implement a pseudo class to highlight element easily. r=bz
2013-09-07 11:39:50 +02:00
Ryan VanderMeulen
b244547589
Merge inbound to m-c.
2013-09-06 20:55:41 -04:00
Ryan VanderMeulen
ad4ed2d45b
Merge m-c to b2g-inbound.
2013-09-06 18:01:09 -04:00
Stephen Pohl
5654874098
Bug 817700 - Fix test_toBlob canvas test. r=roc
2013-09-06 12:30:36 -04:00
Stephen Pohl
8427b38ba8
Bug 817700 - Fix test_mozGetAsFile canvas test. r=roc
2013-09-06 12:30:30 -04:00
Stephen Pohl
b088ad8577
Bug 817700 - Make <canvas>.toBlob run asynchronously - canvas changes. r=roc
2013-09-06 12:30:21 -04:00
Stephen Pohl
7af562d0f2
Bug 817700 - Make <canvas>.toBlob run asynchronously. r=seth,roc
2013-09-06 12:30:17 -04:00
Bobby Holley
686a940c6e
Bug 912322 - Fix tests. r=bz
...
The crashtest changes are untested (aside from the fact that they don't crash).
2013-09-06 09:12:56 -07:00
Ed Morley
098c3f7141
Merge latest green b2g-inbound changeset and mozilla-central
2013-09-06 16:17:55 +01:00
Ed Morley
a7f0c8ab55
Merge mozilla-central and b2g-inbound
2013-09-06 12:32:33 +01:00
Ms2ger
2ca21d1a9c
Bug 909003 - Part e: Remove some includes from SpeechGrammarList.h; r=bz
2013-09-06 08:43:19 +02:00
Ms2ger
6db88a31ed
Bug 909003 - Part c: Remove some includes from WebSocket.h; r=bz
2013-09-06 08:43:12 +02:00
Ms2ger
42820f24fd
Bug 909003 - Part b: Sort includes in WebSocket.h; r=bz
2013-09-06 08:43:07 +02:00
Ms2ger
84672db888
Bug 909953 - Introduce a HTMLAllCollection class; r=smaug
2013-09-06 08:41:42 +02:00
Ms2ger
f8962d36e5
Bug 903080 - Move CSP tests in content/base/test into a subdir; r=ddahl+mshal
...
--HG--
rename : content/base/test/file_CSP.css => content/base/test/csp/file_CSP.css
rename : content/base/test/file_CSP.sjs => content/base/test/csp/file_CSP.sjs
rename : content/base/test/file_CSP_bug663567.xsl => content/base/test/csp/file_CSP_bug663567.xsl
rename : content/base/test/file_CSP_bug663567_allows.xml => content/base/test/csp/file_CSP_bug663567_allows.xml
rename : content/base/test/file_CSP_bug663567_allows.xml^headers^ => content/base/test/csp/file_CSP_bug663567_allows.xml^headers^
rename : content/base/test/file_CSP_bug663567_blocks.xml => content/base/test/csp/file_CSP_bug663567_blocks.xml
rename : content/base/test/file_CSP_bug663567_blocks.xml^headers^ => content/base/test/csp/file_CSP_bug663567_blocks.xml^headers^
rename : content/base/test/file_CSP_bug802872.html => content/base/test/csp/file_CSP_bug802872.html
rename : content/base/test/file_CSP_bug802872.html^headers^ => content/base/test/csp/file_CSP_bug802872.html^headers^
rename : content/base/test/file_CSP_bug802872.js => content/base/test/csp/file_CSP_bug802872.js
rename : content/base/test/file_CSP_bug802872.sjs => content/base/test/csp/file_CSP_bug802872.sjs
rename : content/base/test/file_CSP_bug885433_allows.html => content/base/test/csp/file_CSP_bug885433_allows.html
rename : content/base/test/file_CSP_bug885433_allows.html^headers^ => content/base/test/csp/file_CSP_bug885433_allows.html^headers^
rename : content/base/test/file_CSP_bug885433_blocks.html => content/base/test/csp/file_CSP_bug885433_blocks.html
rename : content/base/test/file_CSP_bug885433_blocks.html^headers^ => content/base/test/csp/file_CSP_bug885433_blocks.html^headers^
rename : content/base/test/file_CSP_bug888172.html => content/base/test/csp/file_CSP_bug888172.html
rename : content/base/test/file_CSP_bug888172.sjs => content/base/test/csp/file_CSP_bug888172.sjs
rename : content/base/test/file_CSP_evalscript_main.html => content/base/test/csp/file_CSP_evalscript_main.html
rename : content/base/test/file_CSP_evalscript_main.html^headers^ => content/base/test/csp/file_CSP_evalscript_main.html^headers^
rename : content/base/test/file_CSP_evalscript_main.js => content/base/test/csp/file_CSP_evalscript_main.js
rename : content/base/test/file_CSP_evalscript_main_allowed.js => content/base/test/csp/file_CSP_evalscript_main_allowed.js
rename : content/base/test/file_CSP_evalscript_main_allowed_getCRMFRequest.js => content/base/test/csp/file_CSP_evalscript_main_allowed_getCRMFRequest.js
rename : content/base/test/file_CSP_evalscript_main_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html
rename : content/base/test/file_CSP_evalscript_main_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.html^headers^
rename : content/base/test/file_CSP_evalscript_main_getCRMFRequest.js => content/base/test/csp/file_CSP_evalscript_main_getCRMFRequest.js
rename : content/base/test/file_CSP_evalscript_main_spec_compliant.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html
rename : content/base/test/file_CSP_evalscript_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant.html^headers^
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed.html^headers^
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_allowed_getCRMFRequest.html^headers^
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html
rename : content/base/test/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^ => content/base/test/csp/file_CSP_evalscript_main_spec_compliant_getCRMFRequest.html^headers^
rename : content/base/test/file_CSP_evalscript_no_CSP_at_all.html => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html
rename : content/base/test/file_CSP_evalscript_no_CSP_at_all.html^headers^ => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.html^headers^
rename : content/base/test/file_CSP_evalscript_no_CSP_at_all.js => content/base/test/csp/file_CSP_evalscript_no_CSP_at_all.js
rename : content/base/test/file_CSP_frameancestors.sjs => content/base/test/csp/file_CSP_frameancestors.sjs
rename : content/base/test/file_CSP_frameancestors_main.html => content/base/test/csp/file_CSP_frameancestors_main.html
rename : content/base/test/file_CSP_frameancestors_main.js => content/base/test/csp/file_CSP_frameancestors_main.js
rename : content/base/test/file_CSP_frameancestors_main_spec_compliant.html => content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.html
rename : content/base/test/file_CSP_frameancestors_main_spec_compliant.js => content/base/test/csp/file_CSP_frameancestors_main_spec_compliant.js
rename : content/base/test/file_CSP_frameancestors_spec_compliant.sjs => content/base/test/csp/file_CSP_frameancestors_spec_compliant.sjs
rename : content/base/test/file_CSP_inlinescript_main.html => content/base/test/csp/file_CSP_inlinescript_main.html
rename : content/base/test/file_CSP_inlinescript_main.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main.html^headers^
rename : content/base/test/file_CSP_inlinescript_main_spec_compliant.html => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html
rename : content/base/test/file_CSP_inlinescript_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant.html^headers^
rename : content/base/test/file_CSP_inlinescript_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html
rename : content/base/test/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_inlinescript_main_spec_compliant_allowed.html^headers^
rename : content/base/test/file_CSP_inlinestyle_main.html => content/base/test/csp/file_CSP_inlinestyle_main.html
rename : content/base/test/file_CSP_inlinestyle_main.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main.html^headers^
rename : content/base/test/file_CSP_inlinestyle_main_spec_compliant.html => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html
rename : content/base/test/file_CSP_inlinestyle_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant.html^headers^
rename : content/base/test/file_CSP_inlinestyle_main_spec_compliant_allowed.html => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html
rename : content/base/test/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^ => content/base/test/csp/file_CSP_inlinestyle_main_spec_compliant_allowed.html^headers^
rename : content/base/test/file_CSP_main.html => content/base/test/csp/file_CSP_main.html
rename : content/base/test/file_CSP_main.html^headers^ => content/base/test/csp/file_CSP_main.html^headers^
rename : content/base/test/file_CSP_main.js => content/base/test/csp/file_CSP_main.js
rename : content/base/test/file_CSP_main_spec_compliant.html => content/base/test/csp/file_CSP_main_spec_compliant.html
rename : content/base/test/file_CSP_main_spec_compliant.html^headers^ => content/base/test/csp/file_CSP_main_spec_compliant.html^headers^
rename : content/base/test/file_CSP_main_spec_compliant.js => content/base/test/csp/file_CSP_main_spec_compliant.js
rename : content/base/test/file_bothCSPheaders.html => content/base/test/csp/file_bothCSPheaders.html
rename : content/base/test/file_bothCSPheaders.html^headers^ => content/base/test/csp/file_bothCSPheaders.html^headers^
rename : content/base/test/file_csp_bug768029.html => content/base/test/csp/file_csp_bug768029.html
rename : content/base/test/file_csp_bug768029.sjs => content/base/test/csp/file_csp_bug768029.sjs
rename : content/base/test/file_csp_bug773891.html => content/base/test/csp/file_csp_bug773891.html
rename : content/base/test/file_csp_bug773891.sjs => content/base/test/csp/file_csp_bug773891.sjs
rename : content/base/test/file_csp_redirects_main.html => content/base/test/csp/file_csp_redirects_main.html
rename : content/base/test/file_csp_redirects_page.sjs => content/base/test/csp/file_csp_redirects_page.sjs
rename : content/base/test/file_csp_redirects_resource.sjs => content/base/test/csp/file_csp_redirects_resource.sjs
rename : content/base/test/test_CSP.html => content/base/test/csp/test_CSP.html
rename : content/base/test/test_CSP_bug663567.html => content/base/test/csp/test_CSP_bug663567.html
rename : content/base/test/test_CSP_bug802872.html => content/base/test/csp/test_CSP_bug802872.html
rename : content/base/test/test_CSP_bug885433.html => content/base/test/csp/test_CSP_bug885433.html
rename : content/base/test/test_CSP_bug888172.html => content/base/test/csp/test_CSP_bug888172.html
rename : content/base/test/test_CSP_evalscript.html => content/base/test/csp/test_CSP_evalscript.html
rename : content/base/test/test_CSP_evalscript_getCRMFRequest.html => content/base/test/csp/test_CSP_evalscript_getCRMFRequest.html
rename : content/base/test/test_CSP_frameancestors.html => content/base/test/csp/test_CSP_frameancestors.html
rename : content/base/test/test_CSP_inlinescript.html => content/base/test/csp/test_CSP_inlinescript.html
rename : content/base/test/test_CSP_inlinestyle.html => content/base/test/csp/test_CSP_inlinestyle.html
rename : content/base/test/test_bothCSPheaders.html => content/base/test/csp/test_bothCSPheaders.html
rename : content/base/test/chrome/test_csp_bug768029.html => content/base/test/csp/test_csp_bug768029.html
rename : content/base/test/chrome/test_csp_bug773891.html => content/base/test/csp/test_csp_bug773891.html
rename : content/base/test/test_csp_redirects.html => content/base/test/csp/test_csp_redirects.html
2013-09-06 08:41:38 +02:00
Ms2ger
7a4aac7117
No bug - Remove a stray semicolon
2013-09-06 08:41:34 +02:00
Ms2ger
43a9e1728e
Bug 910238 - Part b: Export nsImageLoadingContent.h; r=bz
2013-09-06 08:40:49 +02:00
Ms2ger
98ad509afa
Bug 910238 - Part a: Remove some includes from HTMLInputElement.h; r=bz
2013-09-06 08:40:45 +02:00
Ms2ger
9d638a3403
Bug 774124 - Part c: Include nsContentUtils.h in HTMLSplitOnSpacesTokenizer.h; r=dzbarsky
2013-09-06 08:40:33 +02:00
Ms2ger
fd908554b1
Bug 774124 - Part a: Include nsAttrValue.h in nsAttrValueInlines.h; r=dzbarsky
2013-09-06 08:40:03 +02:00
Yuan Xulei
55f3f41a8e
Bug 902847 - Don't trim spaces before newline for contentEditable. r=hsivonen
2013-09-05 16:10:04 -04:00
Ehsan Akhgari
92ad73ef93
Backed out changeset 2f15518f566e (bug 912702) because of B2G JB Emulator build bustage
...
--HG--
extra : rebase_source : 6c01ad3bc2f91b0e7e3edab84aedbfe064310a8b
2013-09-05 13:29:38 -04:00
Ehsan Akhgari
bdb172ee45
Bug 913619 - Minimize the #includes in image/src; r=jrmuizel
...
This patch was generated by running include-what-you-use on image/src,
and then removing the #include statements suggested by that tool, either
replacing them with forward declarations of the used names in headers,
or dropping the ones that were completely unnecessary, and then adding
new #include statements in other places that were implicitly relying on
some of the removed #include statements.
2013-09-07 09:01:08 -04:00
Benoit Jacob
bd8899eab6
Bug 913603 - Avoid needlessly including nsRect.h - r=jrmuizel
2013-09-06 22:15:49 -04:00
Benoit Jacob
4b58797235
Bug 912974 - Split two classes out of GLContext.h, and remove many #includes in GLContext.h - r=jrmuizel
2013-09-06 22:13:37 -04:00
Christoph Kerschbaumer
70fb50a38c
Bug 663567 - Verify that content added by XSLT stylesheet is subject to document's CSP - test update. r=sstamm
...
--HG--
rename : content/base/test/file_CSP_bug663567_allows.xsl => content/base/test/file_CSP_bug663567.xsl
2013-09-04 09:36:00 -07:00
Ehsan Akhgari
36280b9569
Bug 913531 - Remove the unnecessary #includes from nsIXPConnect.idl; r=bholley
2013-09-06 13:50:24 -04:00
Jeff Gilbert
e359259b6e
Bug 912606 - Test that mismatched webgl context request ids fails. - r=bjacob
2013-09-06 11:48:47 -07:00
Jeff Gilbert
faa3453aa4
Bug 912606 - Warn on webgl context requests with mismatched ids. - r=bjacob
2013-09-06 11:48:18 -07:00
Ed Morley
aff8240bf6
Merge mozilla-central and b2g-inbound
2013-09-06 16:24:22 +01:00
Shih-Chiang Chien
bfa6d4226f
Bug 912960 - Use nsString for mDeviceName and mUniqueId. r=rjesup
2013-09-06 09:14:15 -04:00
Benoit Jacob
71a7e3748f
Bug 905227 - Adjust WebGL reftest.list for UNEXPECTED-PASS - r=nical
2013-09-06 08:03:53 -04:00
Benoit Jacob
924b4b3cab
Bug 905227 - Introduce 128 px threshold for Skia/GL, overridable by gfx.canvas.min-size-for-skia-gl preference - r=nical
2013-09-06 08:02:04 -04:00
Ms2ger
4abf38566a
Merge m-c to inbound.
2013-09-06 12:31:58 +02:00
Matthew Gregan
62b428d5f9
Bug 911051 - Fix some namespace/type name related potential build errors in content/media. r=doublec
2013-09-06 18:31:50 +12:00
Matthew Gregan
3a7ae1de35
Bug 911050 - Use mfbt/Endian.h rather than a local version in WaveReader. r=doublec
2013-09-06 18:31:50 +12:00
Edwin Flores
dd810a473b
Bug 752796 - Stop MediaDecoderStateMachine::SendStreamData from trying to A/V sync unnecessarily r=roc
2013-09-06 15:14:48 +12:00
Edwin Flores
0101780c06
Bug 884651 - Stop gstreamer from trying to sync video and audio for us r=cpearce
2013-09-06 15:14:48 +12:00
Mike Hommey
9219a5fbd2
Bug 912980 - Don't use VPATH in content/media/webspeech/recognition. r=gps
2013-09-06 09:22:09 +09:00
Mike Hommey
8808e9970f
Bug 912862 - Cleanup some wrong assignments in moz.build. r=ted
2013-09-06 09:19:08 +09:00
Nicholas Nethercote
6ed33677cf
Bug 912411 (part 1) - Removed some jsapi.h includes in Gecko. r=bz.
...
--HG--
extra : rebase_source : c0b73945bcd6978a616fd846e33e69fae9162d78
2013-09-05 16:08:06 -07:00
David Dahl
a428ac61c7
Bug 882467 - Mixed Content Telemetry - How many times do users click Disable Protection r=dolske
2013-09-05 18:18:04 -05:00
Olli Pettay
7fe77ad7b9
Bug 911162 - Fix default value for aWantsUntrusted on Workers, r=khuey
...
--HG--
extra : rebase_source : c3b79695b24253a19018adb91626656bff88fbf7
2013-09-06 00:08:24 +03:00
Ehsan Akhgari
143454cc1a
Bug 912702 - Minimize the #includes in content/media; r=roc
2013-09-05 16:25:17 -04:00
Boris Zbarsky
24c69b775f
Bug 909642. Don't include nsNPAPIPluginInstance in headers so much, since it pulls in lots of gunk. r=bsmedberg
2013-08-27 01:05:29 -04:00
Ehsan Akhgari
be1e68caf3
Bug 912702 - Minimize the #includes in content/media; r=roc
2013-09-04 17:58:14 -04:00
Steven Lee
3893487dbe
Bug 902856 - Generate fake audio data in MediaEngineDefaultAudioSource. r=jesup, r=derf
2013-09-05 08:34:49 -04:00
Frederik Braun
2d852e29d3
Bug 607067 - Improve CSP violation messages for base restrictions and fix affected testcases. r=imelven, r=sstamm
2013-08-12 12:34:40 +02:00
Robert Longson
754959f30a
Bug 705584 - Improve/increase use of nsCharSeparatedTokenizerTemplate in nsSMILParserUtils. r=dholbert
2013-09-05 13:08:47 +01:00