Ryan VanderMeulen
77773dff70
Merge inbound to m-c.
2013-09-09 15:55:42 -04:00
Ed Morley
5eb2bdb5c4
Backed out changeset 5c9f3fb14995 (bug 910517) for Android talos failures
...
--HG--
rename : content/canvas/src/WebGLMemoryReporterWrapper.h => content/canvas/src/WebGLMemoryMultiReporterWrapper.h
2013-09-09 16:07:48 +01:00
Ms2ger
6dfe58ad79
Merge backout.
2013-09-09 16:56:18 +02:00
Ms2ger
5d5e2ac59a
Backout changesets 194d051724a8:89e680f30d31 (bug 817700) for insufficient review.
2013-09-09 16:56:00 +02: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
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
Ed Morley
3f997d4ad6
Merge mozilla-central and b2g-inbound
2013-09-09 13:30:32 +01:00
Kyle Huey
27e346e22d
Bug 911258: Part 5 - Use the unified exception handling mechanism on workers. r=bz
2013-09-08 20:29:21 -07:00
Kyle Huey
cf498d852b
Bug 910924: Give workers an nsIGlobalObject. r=bent,bholley
2013-09-08 20:28:48 -07:00
Kyle Huey
abebd382da
Bug 910937: Remove xpc_UnmarkGrayObject and use JSAPI directly. r=mccr8
2013-09-08 20:28:48 -07:00
Chris Pearce
91273541bb
Bug 910966 - Bustage fix for 48a66737dc5c. Forgot to qref. r=bustage.
2013-09-09 09:52:20 +12:00
Chris Pearce
ddd2cfddd7
Bug 910966 - Use MP3FrameParser in DirectShow's SourceFilter, to more accurately determine the offset of the first MP3 frame. This enables us to only pass the MP3 data into DirectShow, which can't handle large ID3v2 tags. r=padenot
2013-09-09 09:47:54 +12:00
Chris Pearce
82fc0dde57
Bug 910996 - Move MP3FrameParser out of B2G specific code, so it can be used on other platforms. r=padenot
...
--HG--
rename : content/media/omx/MP3FrameParser.cpp => content/media/MP3FrameParser.cpp
rename : content/media/omx/MP3FrameParser.h => content/media/MP3FrameParser.h
2013-09-09 09:47:29 +12:00
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
Randy Lin
4353dde6ad
Bug 910903 - Add logging to test_mediarecorder_avoid_recursion.html to help find out the timeout issue. r=jsmith
2013-09-07 20:41:57 +08: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
Nicholas Nethercote
85d3324d5e
Bug 910517 - Remove nsIMemoryReporter, and rename nsIMemoryMultiReporter as nsIMemoryReporter. r=mmcr8.
...
--HG--
rename : content/canvas/src/WebGLMemoryMultiReporterWrapper.h => content/canvas/src/WebGLMemoryReporterWrapper.h
extra : rebase_source : 76bf96ce8d6e16c8573584d9e8e70c80371f66eb
2013-08-27 16:24:51 -07:00
Ehsan Akhgari
8df24bbec7
Forward declare mozilla::dom::Nullable as a struct everywhere so that the MSVC linker can pick up the correct symbol name
...
This is needed for bug 848294
2013-09-09 11:43:52 +02:00
Nicholas Nethercote
3e6eda137c
Bug 910771 (part 1) - Create js/Tracer.h and gc/Tracer.cpp. r=terrence.
2013-09-02 22:01:18 -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