Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
493,412 Commits 615 Branches 98 Tags 6 GiB
14d32a0990
Commit Graph

55154 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
d25a5baeb8 merge mozilla-inbound to mozilla-central a=merge 2016-09-22 11:55:12 +02:00
Carsten "Tomcat" Book
cce863628d merge fx-team to mozilla-central a=merge 2016-09-22 11:54:05 +02:00
John Dai
18aca2998b Bug 1275838 - Implement CustomElementsRegistry get function. r=smaug, r=wchen 2016-09-21 19:40:00 -04:00
JW Wang
504d6fa09c Bug 1304298. Part 4 - remove the call to waitTil(). r=kamidphish 
We want to resume video-decoding as soon as possible so playback is less likely to reach the end before finishing all tests.

MozReview-Commit-ID: 4NrbejT8LgI

--HG--
extra : rebase_source : 5c3151a212a1a797cd3d71cfae5510e494af1041
 2016-09-21 15:23:54 +08:00
JW Wang
fce9ae316e Bug 1304298. Part 3 - reduce suspend-timeout to 100ms so playback is less likely to reach the end before finishing all tests. r=kamidphish 
MozReview-Commit-ID: 2hxC8UGZfPe

--HG--
extra : rebase_source : a763d21c2bde5bfe84ce9195b4229339289d97eb
 2016-09-21 15:20:14 +08:00
JW Wang
37be2ffa27 Bug 1304298. Part 2 - remove finished elements from the DOM tree. r=kamidphish 
When a test case times out, it will dump debugging info for each media element in the tree.
We would like to remove the ones that pass the test to avoid noise.

MozReview-Commit-ID: HgyvUfpyCqA

--HG--
extra : rebase_source : 4a1187db14c13bdd976179ba3d2b25123c9acb78
 2016-09-21 15:17:04 +08:00
JW Wang
edcfbf1bee Bug 1304298. Part 1 - log |token| in testDelay() so we have a better idea which file fails the test. r=kamidphish 
MozReview-Commit-ID: x1izpH93cQ

--HG--
extra : rebase_source : 9ddaba7aabf1018fc1dd60ecc33f0950dcd33be2
 2016-09-21 15:13:05 +08:00
Phil Ringnalda
fa1e0afddb Backed out changeset b82fa1825412 (bug 1279612) for static analysis bustage 
CLOSED TREE
 2016-09-21 20:46:01 -07:00
Eric Faust
121151ec67 Bug 1263595 - Avoid deadlock between the JIT and the gecko profiler on win64. (r=froydnj) 2016-09-15 21:35:14 -07:00
Thomas Wisniewski
3c6249dd4b Bug 884693 - Do not log console warnings for XHR parse failures if HTTP status is 204 or 304. r=smaug 2016-09-21 13:48:05 -04:00
Wes Kocher
4fec8fe947 Backed out changeset 7e898928c51b (bug 838954) for lint failures a=backout CLOSED TREE 2016-09-21 12:44:31 -07:00
John Dai
2e88ad8701 Bug 1275832 - Implement custom element name validation for custom elements. r=wchen 
--HG--
extra : rebase_source : e3c3adef09a3b5ae6f8ecb508ef782a9b39998c0
 2016-09-20 23:26:00 -04:00
Cervantes Yu
4cbbce3d03 Bug 1279612 - Block xpcom-will-shutdown before GMPServiceParent instances are shut down. r=gerald 
MozReview-Commit-ID: HdF1RDxVXv1

--HG--
extra : rebase_source : caf2279eb5aa57a74a035c45d81fcb4ee29ef42f
 2016-09-08 11:08:27 +08:00
Florian Quèze
6f480b3e80 Bug 1299783 - change the name of the temporary permission from 'camera' to something not exposed in the UI, r=gcp. 2016-09-21 17:19:07 +02:00
Carsten "Tomcat" Book
4f900773f5 merge mozilla-inbound to mozilla-central a=merge 2016-09-21 12:03:31 +02:00
Carsten "Tomcat" Book
f918af64da Backed out 16 changesets (bug 1288618) for bustage on a CLOSED TREE 
Backed out changeset 06187d250f7a (bug 1288618)
Backed out changeset 2a47f8ea1d89 (bug 1288618)
Backed out changeset e179c8e8265d (bug 1288618)
Backed out changeset 25396a1af922 (bug 1288618)
Backed out changeset e98f835c6ee5 (bug 1288618)
Backed out changeset 24df0e89b273 (bug 1288618)
Backed out changeset f8bbdabdb6da (bug 1288618)
Backed out changeset 8b0adeab93df (bug 1288618)
Backed out changeset 95f23366de82 (bug 1288618)
Backed out changeset 63a9c689e1d5 (bug 1288618)
Backed out changeset 8f67443dccb8 (bug 1288618)
Backed out changeset 4e7fe69d5f45 (bug 1288618)
Backed out changeset 53b113acee42 (bug 1288618)
Backed out changeset 2583ae4e2e3b (bug 1288618)
Backed out changeset 75a61d0e71b7 (bug 1288618)
Backed out changeset da740b4fd484 (bug 1288618)
 2016-09-21 08:44:11 +02:00
Matthew Gregan
8a99e587f7 Bug 1303247 - Add a dev-only pref to treat mismatches between Rust and Stagefright as a fatal error. r=rillian 
MozReview-Commit-ID: Jl69N9VQTXR
 2016-09-21 17:45:47 +12:00
Matt Woodrow
3fda415233 Bug 1288618 - Part 15: Add media code interface RemoteVideoDecoder. r=cpearce,dvander 
--HG--
extra : rebase_source : 54a983d25885722ec24a8c68fda54b08b2820a7c
 2016-09-21 15:36:41 +12:00
Matt Woodrow
bd0f6ed588 Bug 1288618 - Part 14: Add PVideoDecoder protocol for individual decoders. r=cpearce,dvander 
--HG--
extra : rebase_source : 547708bb8d2f3502f1fe89378afe8da6def42005
 2016-09-21 15:36:41 +12:00
Matt Woodrow
c4fcc19e35 Bug 1288618 - Part 13: Add VideoDecoderManager protocol. r=dvander 
--HG--
extra : rebase_source : f330066c3e301299f541939ac170217625dcdca5
 2016-09-21 15:36:39 +12:00
Matt Woodrow
3689c6beb9 Bug 1288618 - Part 11: Add a pref to enable GPU process video decoding. r=cpearce 
--HG--
extra : rebase_source : 41d489b9e8d0450d01ba5c3afa50c90aabeccf25
 2016-09-21 15:36:10 +12:00
Matt Woodrow
8702620c57 Bug 1288618 - Part 5: Add IPC serialization helpers for some media structs/enums. r=dvander 
--HG--
extra : rebase_source : 6660c2c20b5f92765fab9ce4ed2d94478d5f0e01
 2016-09-21 15:36:09 +12:00
Matt Woodrow
f1a988d8b3 Bug 1288618 - Part 4: Fix some namespace collisions in media code. r=jya 
--HG--
extra : rebase_source : 1dc38db46d939be4b96d087101f99e8fb45b81b5
 2016-09-21 15:36:09 +12:00
Matt Woodrow
56fc7b3464 Bug 1288618 - Part 3: Avoid accessing MediaPrefs from the GPU process within WMF code. r=cpearce 
--HG--
extra : rebase_source : 8c8d88ed1b858d59555e2c698f7faf653c8a75e6
 2016-09-21 15:36:09 +12:00
Matt Woodrow
30d2768a45 Bug 1288618 - Part 2: Allow allocating D3D9/11 Images when we don't have a recycling allocator available. r=nical 
--HG--
extra : rebase_source : 23db70f7fed43217f8e8a27b0ab73435cdd3b895
 2016-09-21 15:36:09 +12:00
Chris Pearce
7e7b3c9f0f Bug 1280829 - Only block non-MSE content which is encrypted once it reaches load metadata. r=jya 
Previously, we'd block loading of non-MSE content when there was a MediaKeys
attached, that is, we'd assume that all content was EME content if a MediaKeys
was attached. But some sites attach a MediaKeys and then load non-MSE non-EME
content, and that (despite being a bit silly) shouldn't fail.


MozReview-Commit-ID: 9LupWaehXim

--HG--
extra : rebase_source : 6db281feb27a61b49dc565d4d4562a3d2366fc89
 2016-09-21 13:04:01 +12:00
JW Wang
60028eead2 Bug 1303666 - Move the code of StepDecoding() into Decodingstate::Step(). r=kikuo 
MozReview-Commit-ID: FW7BVyrRA7s

--HG--
extra : rebase_source : 224fccec46a5e47eefad0416294b818392b9a3be
 2016-09-06 17:36:53 +08:00
JW Wang
27301d20dd Bug 1303665. Part 2 - Move mSentPlaybackEndedEvent into CompletedState. r=kikuo 
MozReview-Commit-ID: 3JJ25POozsk

--HG--
extra : rebase_source : 0efec67ff5be62168979b29b1bd1b2e8aa42bc46
 2016-09-06 17:33:12 +08:00
JW Wang
67ca3ec64c Bug 1303665. Part 1 - Move StepCompleted() into CompletedState::Step(). r=kikuo 
MozReview-Commit-ID: Gm2osCqwPMS

--HG--
extra : rebase_source : fe632a712f6139265ac6d88d7f7a57b199eecf93
 2016-09-06 17:28:08 +08:00
Cervantes Yu
a703779628 Bug 1279612 - Block xpcom-will-shutdown before GMPServiceParent instances are shut down. r=gerald 
MozReview-Commit-ID: HdF1RDxVXv1

--HG--
extra : rebase_source : f532fd60bd07ab91c6e089822258a0e3d7102a7b
 2016-09-08 11:08:27 +08:00
Jeff Gilbert (:jgilbert)
80826a7490 Bug 1303814 - WebGL 2 isn't Nightly-only. - r=mrbkap 
MozReview-Commit-ID: I059mORhrn4

--HG--
extra : rebase_source : 6876fa88903a8b2a1dd9268a7a7155450c103c7a
 2016-09-19 18:51:09 -07:00
Chris Pearce
3d1e5d28dd Bug 1304207 - Add telemetry to track when EME CDMs are instantiated. r=francois,gerald 
Add opt-out telemetry probe to track which EME CDMs are being instantiated.
This will enable us to determine when it's safe to remove the Adobe CDM.


MozReview-Commit-ID: iEPSTk7UtP

--HG--
extra : rebase_source : fb51d77f4c15fe2d9ef0adf3c87f6125bb758b9c
 2016-09-21 10:45:02 +12:00
Matthew Woodrow
cc6a2ea1e1 Bug 1288618 - Part 1: Use gfxVars for CanUseHardwareVideoDecoding so we can access it in the GPU process. r=dvander 
--HG--
extra : rebase_source : 3e5e4d3cebeda21a080a0f5c9bcec95ba54f960c
 2016-08-25 15:48:35 +12:00
Iris Hsiao
a2a48a3de7 Backed out changeset 6fb622c938de (bug 884693) for crashed @mozilla::dom::XMLHttpRequestMainThread 
CLOSED TREE
 2016-09-21 13:00:50 +08:00
Iris Hsiao
2b06627798 Backed out changeset 85cacbef3243 (bug 1303247) for GTest Assertion failures 
CLOSED TREE
 2016-09-21 12:25:36 +08:00
Matthew Gregan
1b172c6726 Bug 1303247 - Add a dev-only pref to treat mismatches between Rust and Stagefright as a fatal error. r=rillian 2016-09-19 14:31:45 +12:00
Bill McCloskey
26c5049b5a Bug 1303967 - Don't set mIPCOpen until TabChild is initialized (r=mrbkap) 2016-09-20 19:20:42 -07:00
David Parks
2e014f8e84 Bug 1303755 - Flash code using GetKeyState crashes attempting IPC from non-main thread. r=jimm 
On Windows, when not already running on the main thread, post GetKeyState calls to main thread and wait for result with a semaphore.

--HG--
extra : rebase_source : 38c3b2fa678d2eb05681139de521177253942ff7
 2016-09-19 13:41:45 -07:00
Thomas Wisniewski
d65949bf5c Bug 884693 - Do not log console warnings for XHR parse failures if HTTP status is 204 or 304. r=smaug 2016-09-19 19:36:03 -04:00
Arthur Edelstein
dfebfaa34a Bug 1268726 - isolate shared worker by first party domain. r=baku 
Tor 15564: Isolate SharedWorker by first party domain
uplift/refactor by Dave Huseby <dhuseby@mozilla.com>

review tweaks
 2016-09-19 21:13:00 -04:00
Marcos Caceres
f72da28539 Bug 1290980 - Fix intermittent e10s issue with oninstall. r=mconley 2016-09-18 21:28:00 -04:00
Horatiu
6b0f543b92 Bug 1292299 - Combine tests for bug 704320 into a single file. r=jdm 2016-08-11 08:45:48 -04:00
Nathan Froyd
817fe1571d Bug 1304017 - improve MultipartBlobImpl refcounting; r=baku 
MultipartBlobImpl always requires copying the incoming BlobImpl array.
This copying, and its associated refcounting, is unnecessary in many
cases, as we're just going to delete the copied-from array anyway.  We
might as well pass in ownership when creating the multipart blob and
avoid all the overhead associated with copying and refcounting.
 2016-09-20 21:29:28 -04:00
Nathan Froyd
9709651f99 Bug 1303910 - remove superfluous FallibleTArray in Blob.cpp; r=baku 
This array only exists to be initialized fallibly so we can swap it into
the infallible array we actually want to use.  But we can fallibly
initialize the infallible array directly, so let's do that.
 2016-09-20 21:29:28 -04:00
Domenic Denicola
8052df3b1f Bug 230307. When cloning a <textarea>, preserve the current value just like we do for <input>. r=ehsan 
The web platform test is just lifted wholesale from
<https://github.com/w3c/web-platform-tests/pull/3734>.
 2016-09-15 13:52:37 -04:00
Boris Zbarsky
4d0f8a0705 Bug 1302858. Remove unnecessary JS_WrapValue from dom::MaybeWrapObjectValue. r=peterv 2016-09-20 13:25:05 +01:00
Boris Zbarsky
87d24a4a1d Bug 1297304. Fix our named property DOM proxy code to handle deletion correctly when expandos are involved. r=peterv 2016-09-20 13:24:34 +01:00
Boris Zbarsky
ca48a2a2c0 Bug 1303397. nsScriptLoader should just use nsContentUtils::CheckForBOM instead of rolling its own copy. r=bkelly 2016-09-20 13:24:06 +01:00
Andrea Marchesini
72d886f7a3 Bug 1301249 - nsIDocument::GetDocumentURI() should be fallible, r=smaug 2016-09-20 14:03:05 +02:00
Andrea Marchesini
3d45a22bac Bug 1301254 - nsINode::GetBaseURI() should be fallible, r=smaug 2016-09-20 14:02:33 +02:00
Carsten "Tomcat" Book
17d545681a Merge mozilla-central to mozilla-inbound 2016-09-20 12:02:20 +02:00
Carsten "Tomcat" Book
8910ca900f merge mozilla-inbound to mozilla-central a=merge 2016-09-20 12:01:29 +02:00
JW Wang
58c8cdaad6 Bug 1302040 - don't enter buffering while prerolling. r=cpearce 
MozReview-Commit-ID: Br9wC8PNorA

--HG--
extra : rebase_source : b8f878a25d168f040e63833afa0f436c090ba684
 2016-09-12 15:45:36 +08:00
JW Wang
65f9a58156 Bug 1302006. Part 4 - Let StateObject handle dormant request. r=kikuo 
MozReview-Commit-ID: FK3UwbYDexV

--HG--
extra : rebase_source : 3cf984cc0b7a82e88cf6eb6297976f7fc47dcfa8
 2016-09-12 10:49:46 +08:00
JW Wang
2034a55895 Bug 1302006. Part 3 - Let SeekingState handle dormant request. r=kikuo 
MozReview-Commit-ID: ADVsUSpE8Az

--HG--
extra : rebase_source : 6038bbd56567ac051d5a7738c6890548e8d36e46
 2016-09-12 10:41:20 +08:00
JW Wang
5696ce5c1f Bug 1302006. Part 2 - Let ShutdownState handle dormant request. r=kikuo 
MozReview-Commit-ID: 1uw7YjQps0i

--HG--
extra : rebase_source : 1f65ba000d86f5d8ddc5a76b3e6d08d7b10e25c1
 2016-09-12 10:34:35 +08:00
Aaron Klotz
b9b9c1ca1f Bug 1297549: Part 2 - Propagate changes in tab native window down to content for a11y; r=jimm 
MozReview-Commit-ID: 4akhzCtYciq
 2016-09-15 13:37:04 -06:00
Chris H-C
140f722c49 bug 1218576 - Turn canRecordExtended on for browser_use_counters.js r=gfritzsche 
With the content accumulations now being aggregated in the parent, both the
child and parent must be allowed to record for Telemetry accumulations to work.

MozReview-Commit-ID: 2j9YZIPqbZr
 2016-09-19 13:30:25 -04:00
Chris H-C
2079cedba0 bug 1218576 - Update test browser_use_counters.js to use aggregated child telemetry r=gfritzsche 
waitOnCondition is used to wait for the telemetry batch to be processed
(roughly every 2s). It resolves and rejects to the same value as there are a
couple of xfail tests that need the wrong answer.

MozReview-Commit-ID: I1JqEXQSL7d
 2016-09-19 13:30:25 -04:00
Chris H-C
7876f2ef1e bug 1218576 - Accumulate child histograms in the parent process r=froydnj 
Batch the accumulations to only transmit every so often, so we don't incur
too much in the way of IPC overhead penalties.

What this doesn't do:
* remove or restructure child telemetry code to adapt to the new way
* send the telemetry anywhere
* allow for the child process to clear child histograms
* support anything but histograms (but this is expected and okay)

MozReview-Commit-ID: JnUkcmN3Ya7
 2016-09-19 13:30:25 -04:00
Andrea Marchesini
34c6a13c4c Bug 1303517 - File CTOR for chrome must be fully thread-safe, r=bz 2016-09-19 16:02:40 +02:00
Andrea Marchesini
5994c71158 Bug 1301251 - Handle GetSpec() failure in nsContentUtils::GetWrapperSafeScriptFilename(), r=smaug 2016-09-19 15:50:22 +02:00
Christoph Kerschbaumer
f41283f981 Bug 1298680 - Use uint64_t consistently for windowID within CSP. r=freddyb 2016-09-19 12:57:20 +02:00
Carsten "Tomcat" Book
698071b90e Merge mozilla-central to mozilla-inobund 2016-09-19 12:17:58 +02:00
Carsten "Tomcat" Book
026552c22f merge mozilla-inbound to mozilla-central a=merge 2016-09-19 12:14:36 +02:00
Christoph Kerschbaumer
9f2e941749 Bug 1296027 - CSP: Include 'Source' within error message when logging to the console. r=freddyb,bgrins 2016-09-19 10:18:55 +02:00
Kershaw Chang
6c373070a1 Bug 1228474 - Support sending blob/arraybuffer for data channel. r=smaug 2016-09-17 19:42:00 -04:00
Thomas Wisniewski
e2d5d5425f Bug 1302937 - Remove -moz-mac-lion-theme. r=mstange 2016-09-16 14:42:19 -04:00
Manish Goregaokar
63e75ca24b Bug 1302993 - Mark more expectations for stylo tests, make reftest-stylo green; r=heycam 
MozReview-Commit-ID: 9rKqASXgKZH

--HG--
extra : rebase_source : ea4d2cdc5623673827676e52d255c8b6fa34f7dd
 2016-09-12 19:18:10 +05:30
Shing Lyu
74414dd285 Bug 1302993 - Update some stylo reftest expectations; r=heycam 
MozReview-Commit-ID: 5UUDlAUfBYP

--HG--
extra : rebase_source : c8aff1382e492bc07c59becc697abfb4f7bd8f95
 2016-09-12 11:05:21 +05:30
Phil Ringnalda
fbee0c8359 Merge m-c to m-i 2016-09-18 18:46:58 -07:00
Phil Ringnalda
99be2eef50 Backed out changeset d1cfae63f790 (bug 1297549) for talos bustage 2016-09-18 11:18:17 -07:00
Matthew Gregan
f0efb94bfd Bug 1303083 - Make CubebUtils::PreferredSampleRate handle InitPreferredSampleRate failures. r=padenot 2016-09-18 16:32:22 +12:00
Phil Ringnalda
c58d0d6900 Merge m-i to m-c, a=merge 2016-09-17 13:44:34 -07:00
Randell Jesup
94c164b386 Bug 1303419: Audio gUM allocate/free improvements and nullptr crash fix r=drno 2016-09-17 04:13:00 -04:00
Andrea Marchesini
97aceec5a3 Bug 1303029 - nsLocation doesn't have username/password, r=smaug 2016-09-17 10:10:31 +02:00
Andrea Marchesini
e380831793 Bug 1287747 - GetFilesHelper must release mFiles and mGlobal on the main-thread, r=smaug 2016-09-17 09:55:30 +02:00
Bill McCloskey
50c44c717c Bug 1279086 - Allow painting for tab switch when JS is running (r=dvander,mconley,mrbkap) 2016-09-16 20:35:11 -07:00
Bill McCloskey
a51047b439 Bug 1279086 - Allow multiple interrupt callbacks (r=dvander) 2016-09-16 20:33:49 -07:00
Randell Jesup
1d37a92675 Backed out changeset 4624432ec08e (bug 1303419) 2016-09-16 21:59:28 -04:00
Randell Jesup
b376604f81 Bug 1303419: Audio gUM allocate/free improvements and nullptr crash fix r=drno 2016-09-16 21:56:44 -04:00
JW Wang
24fab5557b Bug 1302006. Part 1 - Let DormantState handle dormant request. r=kikuo 
MozReview-Commit-ID: 8JqqAnlXzh4

--HG--
extra : rebase_source : 80fe5abca12eef1cbd97bb67175fb5a8e528c9d3
 2016-09-06 15:15:48 +08:00
Wes Kocher
04d0da0ae2 Merge m-c to autoland, a=merge 2016-09-16 14:35:31 -07:00
Sebastian Hengst
2d34ce9458 Backed out changeset e0d755ab4cbd (bug 1302380) for timeouts reftest with e10s invariable-declaration-XX.html on Linux 32 bit. r=backout a=merge 
--HG--
extra : source : 8e2af231e0c321f010ebdf1a83eb028589225d27
 2016-09-16 18:55:44 +02:00
Wes Kocher
76bf2680e6 Merge inbound to m-c a=merge CLOSED TREE 2016-09-16 14:31:34 -07:00
Ralph Giles
ac2fb54670 Bug 1300805 - Remove media.webvtt.enabled pref. r=kinetik,smaug 
This API has been deployed to release for some time. There isi
no longer value to being able to quickly disable it.

MozReview-Commit-ID: Jj6CyWzP93g

--HG--
extra : rebase_source : 2dc0547229b53865a4f7cfcf7ca417eb3dec0356
 2016-09-15 14:10:17 -07:00
Carsten "Tomcat" Book
0b196abd94 Merge mozilla-central to mozilla-inbound 
--HG--
rename : devtools/shared/css-color-db.js => devtools/shared/css/color-db.js
rename : devtools/shared/css-color.js => devtools/shared/css/color.js
rename : devtools/shared/css-lexer.js => devtools/shared/css/lexer.js
rename : devtools/shared/css-parsing-utils.js => devtools/shared/css/parsing-utils.js
rename : devtools/shared/css-properties-db.js => devtools/shared/css/properties-db.js
extra : rebase_source : ee56c3191034e51bcc5e558e32c9a4f1b9da92cf
 2016-09-16 13:06:24 +02:00
Carsten "Tomcat" Book
8689785991 merge mozilla-inbound to mozilla-central a=merge 2016-09-16 12:56:33 +02:00
Phil Ringnalda
6beabc555f Backed out changeset 48694b762a84 (bug 1263595) for -Werror bustage 
CLOSED TREE
 2016-09-15 22:04:50 -07:00
Phil Ringnalda
cd6041148f Backed out 5 changesets (bug 1302632) for forthcoming failures 
Backed out changeset f2ced742d6aa (bug 1302632)
Backed out changeset 55e7962d4fc0 (bug 1302632)
Backed out changeset b20f7c887e6c (bug 1302632)
Backed out changeset 22772e4a9c72 (bug 1302632)
Backed out changeset 7d7558864a66 (bug 1302632)
 2016-09-15 21:39:00 -07:00
Eric Faust
c725e729c5 Bug 1263595 - Avoid deadlock between the JIT and the gecko profiler on win64. (r=froydnj) 2016-09-15 21:35:14 -07:00
Phil Ringnalda
c4610bd093 Backed out changeset a4ef0b5b78cb (bug 1294747) for debug Android jsreftest crashes 
CLOSED TREE
 2016-09-15 20:47:39 -07:00
Phil Ringnalda
f6ee0a3336 Backed out changeset 27f8a2467b31 (bug 1302935) for jsep_session_unittest failures 
CLOSED TREE
 2016-09-15 19:37:25 -07:00
Phil Ringnalda
069b27b0aa Backed out changeset e684bf18e5d9 (bug 1299040) for bad implicit conversion constructor bustage 
CLOSED TREE
 2016-09-15 19:31:32 -07:00
Randell Jesup
6ec5958a84 bug 1302935: enable vp9 in webrtc and fix missing gof fields in codecSpecific r=pkerr,drno 
Also required fixing tests to handle more codecs
 2016-09-15 21:17:09 -04:00
Jean-Yves Avenard
b3ae2c3e66 Bug 1302632: P5. Update mochitests. r=gerald 
The tests expected that the error code would be MEDIA_ERR_DECODE whenever we fail to open a video. However, MEDIA_ERR_DECODE is to be used only when "An error of some description occurred while decoding the media resource, after the resource was established to be usable."

All those files have errors in their metadata. Which makes the resource unusable to start with.

Similarly, networkState would be set to  NETWORK_NO_SOURCE if the metadata couldn't be read.

MozReview-Commit-ID: KXVJmD3ZQlT

--HG--
extra : rebase_source : 0aa759ceff22f0c30e650593190a4d0e85292a07
 2016-09-16 11:14:07 +10:00
Jean-Yves Avenard
4faaba2ab5 Bug 1302632: P4. Do not change network state to NETWORK_EMPTY. r=jwwang 
There's no such step defined in the spec. Despite, this code can no longer be called when readyState is HAVE_NOTHING

MozReview-Commit-ID: 2fDoNHt1COp

--HG--
extra : rebase_source : baa542cdf3144db8b941c20f22548c67bfc06346
 2016-09-15 16:20:43 +10:00
Jean-Yves Avenard
64dda2968c Bug 1302632: P3. Provide failures details to error attribute. r=jwwang 
MozReview-Commit-ID: 3eIXOF96UR4

--HG--
extra : rebase_source : 7f5b03e3a6f5dbb40b16b1460132993b60d071e6
 2016-09-15 16:17:10 +10:00
Jean-Yves Avenard
6f81b3394d Bug 1302632: P2. Only have Description return a non-empty string in case of error. r=jwwang 
Will simplify the code in the following patch, not having to perform unnecessary test.

MozReview-Commit-ID: 5zUzSZgzrG9

--HG--
extra : rebase_source : dc11f757ece90a5fb00459de0938a9dfc63ca36a
 2016-09-14 16:49:56 +10:00
Jean-Yves Avenard
f359140d9d Bug 1302632: P1. Set proper error code when readyState is HAVE_NOTHING. r=jwwang 
MozReview-Commit-ID: CMQkW5pPDF2

--HG--
extra : rebase_source : 2bd7828104b8f3ac5bb1d8bdc3f84b652300cabe
 2016-09-14 16:45:52 +10:00
James Cheng
ac56d342f7 Bug 1302591 - Fix compile Wmaybe-uninitialized warning on WebVTTListener.cpp. r=rillian 
MozReview-Commit-ID: BAMUvll1p1n

--HG--
extra : transplant_source : f3%AFA%01%0Caw%A0%82%F2i%27%C8%F5%81%A3%1Ee%AE
 2016-09-14 10:16:34 +08:00
Carsten "Tomcat" Book
a07a9f05fc Merge mozilla-central to autoland 2016-09-16 14:28:01 +02:00
Ethan Lin
bb3e5efbec Bug 1301551 - Don't do anti-alias if 'imageSmoothingEnabled' is false. r=bas 2016-09-09 03:04:00 -04:00
Kershaw Chang
048198ad45 Bug 1299040 - Implement transport builder constructor. r=smaug 2016-09-15 07:09:00 -04:00
Randell Jesup
5f4f5f0fc6 bug 1302935: enable vp9 in webrtc and fix missing gof fields in codecSpecific r=pkerr,drno 
Also required fixing tests to handle more codecs
 2016-09-15 21:17:09 -04:00
Matthew Gregan
0ebace12e5 Bug 1302348 - Report cubeb context init failures via telemetry. r=padenot 2016-09-16 12:54:24 +12:00
Wes Kocher
8805e85679 Backed out 3 changesets (bug 1297549) for Windows VM Mn-e10s failures a=backout 
Backed out changeset c3f82cedfb27 (bug 1297549)
Backed out changeset c643278d88c8 (bug 1297549)
Backed out changeset 3d515669d3e0 (bug 1297549)
 2016-09-15 16:45:31 -07:00
Wes Kocher
9013078b1e Merge m-c to inbound a=merge 2016-09-15 16:40:23 -07:00
Wes Kocher
14c8653f72 Merge inbound to central, a=merge 2016-09-15 16:28:10 -07:00
Jean-Yves Avenard
aa40888631 Bug 1279348: Avoid division by 0. r=kentuckyfriedtakahe 
MozReview-Commit-ID: DSwB3J9jADK

--HG--
extra : rebase_source : 147ba3e98d203ffcf7b477e2b38c63b1286fa881
 2016-09-14 11:20:41 +10:00
Andrea Marchesini
4f62933f76 Bug 1303095 - XMLHttpRequestString should be fallible, r=mccr8 2016-09-16 00:09:17 +02:00
Andrew McCreight
311e370e1c Bug 1300211 - Trace XULDocument::mCurrentPrototype. r=smaug 
This ensures that if mCurrentPrototype gets added to mPrototypes, it
won't go from gray to black.

MozReview-Commit-ID: 7PyZEa1kpt6

--HG--
extra : rebase_source : 5c736ae896a024aea53523664ab24aafc70648da
 2016-09-08 15:14:28 -07:00
Aaron Klotz
cd649a45e3 Bug 1297549: Part 2 - Propagate changes in tab native window down to content for a11y; r=jimm 
MozReview-Commit-ID: E96pONRnHt0

--HG--
extra : rebase_source : 10d653b125c0916d7c432a42a9011a7dc7985630
 2016-09-15 13:37:04 -06:00
Wes Kocher
b39fcf65f2 Backout revisions b80d560e0102 and fc593dd9a280 (bug 838954) a=backout 
--HG--
extra : source : 7008e3ee291ec274025d72ebd157eef7588da291
 2016-09-21 11:42:16 -07:00
Kannan Vijayan
c92fd92649 Bug 1303865 - Fix shutdown leak of FlyWebService. r=mconley 2016-09-21 11:32:36 -04:00
Kannan Vijayan
bfacd8d171 Bug 1303454 - Change FlyWeb addon check to use paths from both desktop and android resources. r=ehsan 2016-09-21 11:31:15 -04:00
Kartikaya Gupta
6d057a3060 Bug 1298173 - Push HandleTap from the GPU process back to the parent process before passing it on to the child process. r=dvander 
Sending it back via the parent process ensures that it will take the same path
that regular touch events do, and so guarantees that the Tap event won't overtake
the touch events and get dispatched to content first.

MozReview-Commit-ID: 8TiHY2PFPvE
 2016-09-21 10:26:33 -04:00
Kartikaya Gupta
15ae08f0b4 Bug 1298173 - Remove redundant parameter. r=dvander 
The parameter is always true if the tap type is a eSingleTap and false in
all other cases, so it's redundant. As it was added as an optimization in bug
1020199 removing it should be safe.

MozReview-Commit-ID: IPB8BUagQl6
 2016-09-21 10:25:05 -04:00
Andrea Marchesini
9d38619302 Bug 1288997 - memory blob should not be shared across processes - part 3 - SendStream for memory blobs, r=bkelly 2016-09-21 12:27:26 +02:00
Ethan Lin
20b88c7843 Bug 1301551 - Remove unnecessary debug lines. r=nical 2016-09-16 10:33:26 +02:00
Nicolas Silva
f4d4ceeeed Bug 1302380 - Report canvas memory usage through the buffer provider. r=gw280 2016-09-16 10:13:19 +02:00
Andrea Marchesini
56c54a3930 Bug 1302987 - Rename nsLocation to mozilla::dom::Location, r=smaug 
--HG--
rename : dom/base/nsLocation.cpp => dom/base/Location.cpp
rename : dom/base/nsLocation.h => dom/base/Location.h
 2016-09-16 09:18:18 +02:00
Jamie Nicol
22f1d4f009 Bug 1245959 - Check video frame has non-zero dimensions before sending image to compositor. r=nical 
MozReview-Commit-ID: 6PlWqE6is7Z

--HG--
extra : rebase_source : df4ff6689eea6ff8e95dd0f6d7e3e37b994875a1
 2016-09-19 14:41:36 +01:00
Jamie Nicol
dc6488e7d5 Bug 1245959 - Check plugin has non-zero dimensions before sending image to compositor. r=nical 
MozReview-Commit-ID: KEd5IBUGlo6

--HG--
extra : rebase_source : b1719e8c1a5cbca40a3940cf9262a4bb28b93abe
 2016-09-19 13:28:05 +01:00
Munro Chiang
c86b6515ad Bug 1297337 - implement mediaDevices.ondevicechange for Linux; r=jesup 
MozReview-Commit-ID: 6cEq7xVUkhf

--HG--
extra : rebase_source : ee71fea0aa49452bcd403678b3c22c3fe3dd297c
 2016-09-01 11:06:49 +08:00
Jean-Yves Avenard
7fb621f0d6 Bug 1303902: [FLAC] Actually check that we found the first frame. r=kamidphish 
MozReview-Commit-ID: 3VRf49DqB00

--HG--
extra : rebase_source : b357a310bf6242b07a1c72ce05ae285fe18cd2a1
 2016-09-20 11:43:23 +10:00
Jean-Yves Avenard
40284ca39a Bug 1303673: P9. Make some GMP errors non fatal. r=cpearce 
MozReview-Commit-ID: LMWQtJElle7

--HG--
extra : rebase_source : 02e9a30cf049d26b6e7f7f78c98d8b595a72cac5
 2016-09-20 16:56:58 +10:00
Jean-Yves Avenard
84106ef146 Bug 1303673: P8. Details for the H264 converter. r=cpearce 
Mark some errors as OOM as that's what they are.

MozReview-Commit-ID: 2YEgBjqzMEm

--HG--
extra : rebase_source : 2ae43c8252f93adf9d4b0f86de96875152f739a1
 2016-09-20 16:32:04 +10:00
Jean-Yves Avenard
5bb9584b9b Bug 1303673: P7. Provide MFT error code. r=cpearce 
MozReview-Commit-ID: BnKR6CKk3eU

--HG--
extra : rebase_source : 53c105d1da372bd89698756988723f9e5ce8bed0
 2016-09-20 16:18:17 +10:00
Jean-Yves Avenard
78ecdd8c4e Bug 1303673: P6. Provide further error details for the apple decoders. r=cpearce 
MozReview-Commit-ID: 1A0k5BWAlWW

--HG--
extra : rebase_source : da0e24eb45bbe3c07468ae84a8485a5d2f9671af
 2016-09-20 16:05:32 +10:00
Jean-Yves Avenard
f8966bc13b Bug 1303673: P5. Provide warning when a MediaDataDecoder error occurs. r=cpearce 
Warnings were provided earlier on and got removed. So we instead make it consistent across all decoders.

MozReview-Commit-ID: 53obtEClq98

--HG--
extra : rebase_source : f2e22e0d8ff33e8198b39f5a955b8f233a97daa6
 2016-09-20 15:59:42 +10:00
Jean-Yves Avenard
485daa6ea7 Bug 1303673: P4. Provide GMP error code in MediaResult. r=cpearce 
MozReview-Commit-ID: LfXNfMymvk4

--HG--
extra : rebase_source : 12c1bf1fe0245802429bbbbf75910f2906fde9f2
 2016-09-20 15:57:32 +10:00
Jean-Yves Avenard
37455bf7f4 Bug 1303673: P3. Provide decryption status in error. r=cpearce 
MozReview-Commit-ID: GGWAYcJAZ3R

--HG--
extra : rebase_source : f88b6fee5d9e5582e7fa43f9a13f9f3d1ce7af90
 2016-09-20 15:56:17 +10:00
Jean-Yves Avenard
83619b5bc0 Bug 1303673: P2. Change error code to OOM. r=cpearce 
Only time this error can occur is if we failed to allocate memory.

MozReview-Commit-ID: A37SQnraC54

--HG--
extra : rebase_source : b05dcdaf1c91d2f94255cd870872ec80e23c81c7
 2016-09-20 15:51:54 +10:00
Jean-Yves Avenard
c38cb38487 Bug 1303673: P1. Add RESULT_DETAIL convenience macro. r=cpearce 
MozReview-Commit-ID: 12YaMnNsvNI

--HG--
extra : rebase_source : afb2d9f4c167c53d7515558d28d0fc74a0402c73
 2016-09-20 15:50:31 +10:00
Carsten "Tomcat" Book
79ec7bf1c3 Merge mozilla-central to autoland 2016-09-20 12:05:52 +02:00
JW Wang
939d348ad4 Bug 1303655. Part 3 - Move mDecodeStartTime into Decodingstate. r=kikuo 
MozReview-Commit-ID: ELUr9AHaE2P

--HG--
extra : rebase_source : 8cdfbdd076c8a518226aee02b1574d005d3295de
 2016-09-06 16:59:02 +08:00
JW Wang
31666a223c Bug 1303655. Part 2 - Remove unused functions. r=kikuo 
MozReview-Commit-ID: 3Y7gVZXledn

--HG--
extra : rebase_source : d5d88879459465f6ab6d4ca299b1de70a044b5c2
 2016-09-06 16:54:14 +08:00
JW Wang
2f0220fa93 Bug 1303655. Part 1 - Move some code to Decodingstate::Enter(). r=kikuo 
MozReview-Commit-ID: JjhmE0cgOn

--HG--
extra : rebase_source : d46aed6ca12a60de946c0720cdc49bbd2dcbeba3
 2016-09-06 16:51:45 +08:00
Hiroyuki Ikezoe
d41794cec3 Bug 1303793 - Part 2: Run test which uses the Web Animations API in an iframe with the Web Animations API preference. r=birtles 
MozReview-Commit-ID: 233vs8Aiw5j

--HG--
rename : dom/animation/test/mozilla/test_set-easing.html => dom/animation/test/mozilla/file_set-easing.html
extra : rebase_source : 13653c93c20c987121773546f71496a30ccd061e
 2016-09-20 16:54:09 +09:00
Hiroyuki Ikezoe
e0f666d6eb Bug 1303793 - Part 1: Use testharness.js instead of SimpleTest.js to run the test in an iframe easily. r=birtles 
MozReview-Commit-ID: FlT34Npg8uH

--HG--
extra : rebase_source : 6046b27aeb51ca51a965dd5ca990079ab20208a2
 2016-09-20 16:53:33 +09:00
JW Wang
5564be70f2 Bug 1300711 - Remove MediaDecoderStateMachine::mQuickBuffering. r=cpearce 
MozReview-Commit-ID: GW7bhY6ruKG

--HG--
extra : rebase_source : 272c297ffa1e5b1034992b6a2b35e5949fb26b84
 2016-09-06 16:28:20 +08:00
JW Wang
8599325724 Bug 1302045. Check if we have [GetMediaTime(), GetMediaTime() + aUsecs] in the buffer ranges to decide whether we are in low buffered data. r=cpearce 
Note we consider [endOfDecodedData, GetMediaTime()] is always in the buffer ranges.

MozReview-Commit-ID: F6ez3KYMjht

--HG--
extra : rebase_source : c5f53125f509a58c1abf8151847df0f3d2d08674
 2016-09-12 16:20:11 +08:00
Chris Pearce
ee9ca0dd5e Bug 1289968 - [Part1] Ensure ClearKey doesn't assume keyIds can only be 16 bytes. r=cpearce 
MozReview-Commit-ID: Hf2IQsAHa4r

--HG--
extra : transplant_source : %D1%2C%B2j%1C%F5%A7%A9%D8%0B%EEE%92%B1%DC1%A5A%BC%8B
 2016-08-01 16:28:10 +12:00
David Parks
17683f933c Bug 1251202 - Implement Default Audio Device Notifications for NPAPI plugins on Windows. r=jimm 
Adds plugin variables NPPVpluginRequiresAudioDeviceChanges and NPNVaudioDeviceChangeDetails on Windows.

--HG--
extra : rebase_source : ff18bbca9772352b18be1dfcde90570775e8d5cc
 2016-09-19 14:05:41 -07:00
Andi-Bogdan Postelnicu
f0fc76e6d7 Bug 1282408 - Add ignore-initialization-check annotation to mForcePaintEpoch from HangMonitorChild. r=baku 
MozReview-Commit-ID: EkreJsiAIZH
 2016-09-20 12:13:40 +03:00
Ethan Lin
752790c966 Bug 1176997 - Part1. Support focus-within. r=xidron r=smaug 2016-09-09 00:12:00 +02:00
David Anderson
f2cfe86ef2 Recreate PLayerTransactions for TabChildren when the compositor restarts. (bug 1300936 part 4, r=mattwoodrow, r=billm) 
--HG--
extra : rebase_source : ea92ecc5738e830a86f3b323d262f3537afe4534
 2016-09-20 01:19:32 -07:00
David Anderson
81234feb8d Recreate content compositor endpoints when the GPU process dies. (bug 1300936 part 3, r=mattwoodrow,billm) 
--HG--
extra : rebase_source : 054937d0adf92ab90c0a630034808e5069b6a956
 2016-09-20 01:18:50 -07:00
David Anderson
27c5a863e6 Send content compositor bridges atomically rather than individually. (bug 1300936 part 1, r=billm) 
--HG--
extra : rebase_source : 3d642f674ecb21c4a1c95ad9312c7afd87c5931a
 2016-09-20 01:15:49 -07:00
Andrea Marchesini
db15f776a7 Bug 1288997 - memory blob should not be shared across processes - part 1 -PSendStream should use nsIContentChild, r=jld, f=bkelly 2016-09-21 12:27:26 +02:00
Carsten "Tomcat" Book
23879d2b18 Merge mozilla-central to mozilla-inbound 2016-09-21 12:07:46 +02:00
Matt Woodrow
d57dae2c04 Bug 1288618 - Part 15: Add media code interface RemoteVideoDecoder. r=cpearce,dvander 2016-09-21 21:25:41 +12:00
Matt Woodrow
a64365e7ad Bug 1288618 - Part 14: Add PVideoDecoder protocol for individual decoders. r=cpearce,dvander 2016-09-21 21:25:41 +12:00
Matt Woodrow
7756c8a512 Bug 1288618 - Part 13: Add VideoDecoderManager protocol. r=dvander 2016-09-21 21:25:33 +12:00
Matt Woodrow
d4df25998c Bug 1288618 - Part 11: Add a pref to enable GPU process video decoding. r=cpearce 2016-09-21 21:24:44 +12:00
Matt Woodrow
616f2003f2 Bug 1288618 - Part 5: Add IPC serialization helpers for some media structs/enums. r=dvander 2016-09-21 21:24:43 +12:00
Matt Woodrow
fd9a067c7e Bug 1288618 - Part 4: Fix some namespace collisions in media code. r=jya 2016-09-21 21:24:43 +12:00
Matt Woodrow
32054a681a Bug 1288618 - Part 3: Avoid accessing MediaPrefs from the GPU process within WMF code. r=cpearce 2016-09-21 21:24:43 +12:00
Matt Woodrow
fb5b16533d Bug 1288618 - Part 2: Allow allocating D3D9/11 Images when we don't have a recycling allocator available. r=nical 2016-09-21 21:24:43 +12:00
Matthew Woodrow
76c0ae8105 Bug 1288618 - Part 1: Use gfxVars for CanUseHardwareVideoDecoding so we can access it in the GPU process. r=dvander 2016-08-25 15:48:35 +12:00
Kilik Kuo
cb76db051f Bug 1257116 - Shorten media files to make mochitest faster. r=cpearce 
MozReview-Commit-ID: ArMrUBvPMct

--HG--
extra : rebase_source : 5d86c92c8cb3c6c4e3b7632b3d10f578c20fc0fa
 2016-09-13 15:20:12 +08:00
Bryce Van Dyk
dcc44df7e1 Bug 1300653 - Update youtube puppeteer to store snapshots of state to prevent racing. r=maja_zf 
This is follow up work to the VideoPuppeteer changes that have it take snapshots
to prevent racing. For this work the motivations are the same: prevent racing by
querying a stable snapshot of video state, rather than making sequential JS
requests to the browser between which video state may change.

Much of the YouTubePuppeteer has been made internal, so the class can
encapsulate its snapshotting. The property methods have been rolled into the
snapshotted data named tuple to make it clear they're derived from snapshotted
data.

A number of broken parts of the code have been removed or reworked:
- Disabling autoplay was not working and has been removed. This is partially
  addressed by using embedded URLs (in another commit) -- embedded videos do not
  play next video automatically. However, there may be merit in reinstating a
  working version of this in future if possible - particularly for videos that
  can't be embedded, which we have some of in our tests.
- Ad skipping was not working. The getOption('ad', 'displaystate') JS call
  appears to always report an ad is not skippable even if it is. Code related to
  skipping ads has been removed for now, and ads are waited out. This may also
  be something worth revisiting if a working implementation is possible.

***
Review feedback: update YT puppeteer to use more concise calling conventions,
compatibility with changes to VideoPuppeteer.

MozReview-Commit-ID: CCxf9ItFYtl

--HG--
extra : rebase_source : 99aac08fd86d41e7fa3df9b00604dd583ca27bf8
 2016-09-21 15:38:41 +12:00
Bryce Van Dyk
9746da4a07 Bug 1300653 - Update VideoPuppeteer to store state snapshots to prevent racing. r=maja_zf 
The tests that use VideoPuppeteer often expect the state queried by the
puppeteer to be consistent if done closely in the code. However, this has not
been the case, as there can be significant lags in the data returning from
marionette. This means that if one line queries the current time of the
underlying video, and the very next line queries the same thing, there can be
significantly different results.

This causes issues with tests making multiple sequential checks on the
underlying video, and the state changing between checks. On test fails it means
that the information logged my be inconsistent with the state that resulted in
the test failing, as time passes between the fail check and the logging.

This patch attempts to address this by having the VideoPuppeteer store a
snapshot of state and examining that instead. This snap shot should be
internally consistent.

I've removed a large number of public members from the class, and moved a couple
of the testing functions into the class. The thinking here is that the new logic
complicates the internal state of the class, and I want to keep the interface
slim to hide that complexity.

***
Review feedback: Log interval, expected duration, stall wait time, and timeout
times in VideoPuppeteer string.
***
Review feedback: make video var script a class var instead of a staticmethod.
***
Review feedback: move _fetch_state_script to be a property on VideoPuppeteer.
***
Review feedback: simplify calling of _create_video_state_info with a dict.
Fix played docstring.
***
Review feedback: simplify _create_video_state_info using kwargs.

MozReview-Commit-ID: 6mN56bFMge0

--HG--
extra : rebase_source : a25a9a45c8dced9439360b9664b1d768100ed2be
 2016-09-21 14:08:34 +12:00
Carsten "Tomcat" Book
2c29ecf6ea Merge mozilla-central to autoland 
--HG--
rename : browser/themes/shared/controlcenter/conn-degraded.svg => browser/themes/shared/controlcenter/connection.svg
rename : browser/themes/shared/identity-block/identity-mixed-active-loaded.svg => browser/themes/shared/identity-block/connection-mixed-active-loaded.svg
rename : browser/themes/shared/identity-block/identity-mixed-passive-loaded.svg => browser/themes/shared/identity-block/connection-mixed-passive-loaded.svg
rename : browser/themes/shared/identity-block/identity-secure.svg => browser/themes/shared/identity-block/connection-secure.svg
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/ANRReporter.java => mobile/android/base/java/org/mozilla/gecko/ANRReporter.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoJavaSampler.java => mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java
rename : mobile/android/geckoview/src/main/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java => mobile/android/base/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java
rename : taskcluster/ci/signing/signing.yml => taskcluster/ci/build-signing/android-signing.yml
rename : taskcluster/ci/signing/kind.yml => taskcluster/ci/build-signing/kind.yml
extra : rebase_source : d069a089538d77ef97a2ea10095f66eb814879eb
 2016-09-21 12:10:25 +02:00
Hiroyuki Ikezoe
7de848f9c8 Bug 1294651 - Don't apply iterationComposite value if the preference for Web Animations API is not enabled. r=boris 
MozReview-Commit-ID: 5ckKyDSBv3S

--HG--
extra : rebase_source : 5bf069db17cecac17035bd2c9c925abc4c4e5f2c
 2016-09-21 19:17:18 +09:00
JW Wang
d96f0b8741 Bug 1303660. Part 3 - Move mBufferingStart into BufferingState. r=kikuo 
MozReview-Commit-ID: IpTrMl1mWfb

--HG--
extra : rebase_source : 9230535e4f4ea93edb545ecef66d501e022d9fe2
 2016-09-06 17:22:29 +08:00
JW Wang
41550c101f Bug 1303660. Part 2 - Move the code of StepBuffering() into BufferingState::Step(). r=kikuo 
MozReview-Commit-ID: 1uGOXV996X

--HG--
extra : rebase_source : 5e1b9daff07a780f4365c96e7f56c0e9f8726863
 2016-09-06 17:15:51 +08:00
JW Wang
e7db9f03f6 Bug 1303660. Part 1 - Move some code to BufferingState::Enter() and remove unused functions. r=kikuo 
MozReview-Commit-ID: G6PrACxfiF5

--HG--
extra : rebase_source : 19bf3a38d96a5f9f58ad99d72b79daf9063e50fd
 2016-09-06 17:05:48 +08:00
Jean-Yves Avenard
e555d04fbf Bug 1303970: P2. Fix "If the media data fetching process is aborted by the user steps". r=jwwang 
MozReview-Commit-ID: 6n91VY00gAo

--HG--
extra : rebase_source : 61aab7eecb527c55199a597db7b08681206c3f2f
 2016-09-20 19:52:06 +10:00
Jean-Yves Avenard
3eae3b5916 Bug 1303970: P1. MEDIA_ERR_ABORTED can be returned even if readyState is HAVE_NOTHING. r=jwwang 
So change assertion accordingly.

MozReview-Commit-ID: AuaDlyF0MAL

--HG--
extra : rebase_source : 60f1b34c8320d8ad47845bfd9d8f23e27d3a8620
 2016-09-20 19:36:09 +10:00
Jean-Yves Avenard
2010639f50 Bug 1304252: P3. Further error details for agnostic decoders. r=gerald 
MozReview-Commit-ID: 1tb4f9xQKyr

--HG--
extra : rebase_source : 37bd772240de01d9fcb2fac765f58b27e6f86c9c
 2016-09-21 13:25:00 +10:00
Jean-Yves Avenard
5b5bc32ab4 Bug 1304252: P2. Provide further error details for android decoder. r=gerald 
MozReview-Commit-ID: 8xi9MBnZsfQ

--HG--
extra : rebase_source : 529c5185802b9e9a954e3993129a9c774210de7c
 2016-09-21 13:22:31 +10:00
Jean-Yves Avenard
0ac98dd6e1 Bug 1304252: P1. Provide error details for ffmpeg decoder. r=gerald 
MozReview-Commit-ID: A0qbYNm4CjX

--HG--
extra : rebase_source : 4c9c719e9a4310ef34b99bf491c7f76bd1e5e3e4
 2016-09-21 13:21:27 +10:00
JW Wang
00c05e18ae Bug 1300714 - Don't force entering DECODING when playState becomes PLAYING. r=cpearce 
For it doesn't guarantee a smooth playback with a little data buffered.

MozReview-Commit-ID: 5NNQ4Q8uz39

--HG--
extra : rebase_source : dab53162cc06ddc74cca08e910a19eff01446703
 2016-09-06 16:40:30 +08:00
JW Wang
5e9751305f Bug 1303347 - add assertions for debugging if Observe() could ever happen after Unsubscribe(). r=cpearce 
MozReview-Commit-ID: 9XhGYI3fTqb

--HG--
extra : rebase_source : b42dce2b15cb044871e355090dade17abf651ee9
 2016-09-20 11:27:46 +08:00
Jean-Yves Avenard
4387906eae Bug 1302632: P5. Update mochitests. r=gerald 
The tests expected that the error code would be MEDIA_ERR_DECODE whenever we fail to open a video. However, MEDIA_ERR_DECODE is to be used only when "An error of some description occurred while decoding the media resource, after the resource was established to be usable."

All those files have errors in their metadata. Which makes the resource unusable to start with.

Similarly, networkState would be set to  NETWORK_NO_SOURCE if the metadata couldn't be read.

MozReview-Commit-ID: KXVJmD3ZQlT

--HG--
extra : rebase_source : 1ec3d7e764d832702e662f0b650363498e0b0761
 2016-09-16 11:14:07 +10:00
Jean-Yves Avenard
26629fd77e Bug 1302632: P4. Do not change network state to NETWORK_EMPTY. r=jwwang 
There's no such step defined in the spec. Despite, this code can no longer be called when readyState is HAVE_NOTHING

MozReview-Commit-ID: 2fDoNHt1COp

--HG--
extra : rebase_source : d8b79acee85b00331f55153626038e26cd4a72c7
 2016-09-15 16:20:43 +10:00
Jean-Yves Avenard
895efe36db Bug 1302632: P3. Provide failures details to error attribute. r=jwwang 
MozReview-Commit-ID: 3eIXOF96UR4

--HG--
extra : rebase_source : eeeb298d46bd8c6957560e475b7b1c4728a392dc
 2016-09-15 16:17:10 +10:00
Jean-Yves Avenard
9b10344e7c Bug 1302632: P2. Only have Description return a non-empty string in case of error. r=jwwang 
Will simplify the code in the following patch, not having to perform unnecessary test.

MozReview-Commit-ID: 5zUzSZgzrG9

--HG--
extra : rebase_source : c409a70d1aa5975b1a990a884856b3b5712bc190
 2016-09-14 16:49:56 +10:00
Jean-Yves Avenard
8a54c1a711 Bug 1302632: P1. Set proper error code when readyState is HAVE_NOTHING. r=jwwang 
MozReview-Commit-ID: CMQkW5pPDF2

--HG--
extra : rebase_source : f0286af0b2daa2f91bbea66ab7bcf6de1a6d2207
 2016-09-14 16:45:52 +10:00
Julian Hector
4946f018b4 Bug 1303275 - Fix ShmemPool code to resolve 'not declared' compiler error. r=gcp 
--HG--
extra : amend_source : 7fde47fe1c2f25069f85904df7b06774129acc4b
 2016-09-16 06:44:00 -04:00
Kershaw Chang
5bb5c52b40 Bug 1299040 - Implement transport builder constructor. r=smaug 2016-09-16 08:59:00 -04:00
Wes Kocher
0677d5dc43 Merge m-c to inbound, a=merge 2016-09-16 14:35:12 -07:00
Markus Stange
bf8d999061 Bug 1302551 - Add AnonymousContent::SetCutoutRectsForElement to allow a more efficient find bar highlighter implementation. r=smaug 
This part just sets a cutoutregion property on the element node and schedules a paint.
The next part will check for that property and create a display item for the element
in question.

MozReview-Commit-ID: EbPr8it5Lpw
 2016-09-15 14:58:15 -04:00
Markus Stange
f53e3f5131 Bug 1302556 - Start AnonymousContent::GetElementById iteration at mContentNode. r=smaug 
This renames kid to node and starts the iteration at mContentNode instead of at mContentNode->GetFirstChild().

MozReview-Commit-ID: HFiHXZg0gLS
 2016-09-13 18:19:07 -04:00
Wes Kocher
611fb66887 Backed out changeset 39da44265946 (bug 1263595) for build bustage a=backout CLOSED TREE 2016-09-16 14:19:22 -07:00
Eric Faust
db0cfdc6bc Bug 1263595 - Avoid deadlock between the JIT and the gecko profiler on win64. (r=froydnj) 2016-09-15 21:35:14 -07:00
Boris Zbarsky
5afc8a9e03 Bug 1294747. Make sure we expose the expando of a [OverrideBuiltins] proxy to active JS when it gets cleared from the proxy. r=peterv 
This should also fix bug 1296775 and bug 1290359.

There's a very good chance it will also fix bug 1293386, bug 1292855, bug
1289452, and bug 1303340: those would get hit if we happened to start _another_
gc after the expando died but while it was still in the Rooted.  All of them
seem to be dying under the domClass->mGetProto call, which could finish up a GC
that kills the expando and then do _another_ one, causing the Rooted to try to
mark a dead object.
 2016-09-15 15:04:56 -04:00
Jim Chen
8e0ad67a7a Bug 1291375 - 5. Use Fennec bindings where needed; r=snorp 
Switch include statements from GeckoView bindings to Fennec bindings
where needed.
 2016-09-16 15:13:48 -04:00
Aaron Klotz
6775220daf Bug 1297549: Part 2 - Propagate changes in tab native window down to content for a11y; r=jimm 
MozReview-Commit-ID: LA5yLIGufEb
 2016-09-15 13:37:04 -06:00
Sebastian Hengst
548f7778a1 Backed out changeset e0d755ab4cbd (bug 1302380) for timeouts reftest with e10s invariable-declaration-XX.html on Linux 32 bit. r=backout 2016-09-16 18:55:44 +02:00
Nicolas Silva
79bb9f5c0e Bug 1284837 - Disallow implicit conversions from float to integer when creating. r=botond 2016-09-16 17:49:39 +02:00
Boris Zbarsky
7afde49b04 Bug 1096267. Stop calling into the nsIInputStream overload of XMLHttpRequest.send() if a random object is passed in (except in chrome code, where we will keep doing that). r=smaug 2016-09-22 16:58:37 +01:00
Boris Zbarsky
99faedc1aa Bug 1304515. Remove the unused WebIDL version of ImageLoadingContent.loadImageWithChannel. r=ehsan 2016-09-22 16:58:35 +01:00
John Dai
67c1584d51 Bug 838954 - Backout newlines lost in .innerHTML serialization of <pre> when first character is a newline. r=smaug 2016-09-22 02:42:00 -04:00
cku
8fc664c532 Bug 1304706 - Replace nsSVGUseElement by SVGUseElement in comment. r=dholbert; DONTBUILD 
MozReview-Commit-ID: 4rfjuQ9M3PB

--HG--
extra : amend_source : 6b9ddbb294c4333add9b1063da1c1aaa3248d3a2
 2016-09-22 22:33:42 +08:00
Randell Jesup
e82ae15c8c Bug 1275554: clear mImage aggressively when no longer needed r=perhsons 
MozReview-Commit-ID: GNU7p3CyzjH
 2016-09-21 15:49:38 -04:00
Andrea Marchesini
fd5175f4d1 Bug 1303638 - file.webkitRelativePath must contain the leafName of the parent directory, r=smaug 2016-09-22 13:48:46 +02:00
Carsten "Tomcat" Book
ce8c91d458 Merge mozilla-central to mozilla-inbound 2016-09-22 11:56:22 +02:00
Andrea Marchesini
8a4cdaa0a2 Bug 1303231 - Fixing comments in FileSystem webIDL files, r=smaug 2016-09-22 11:08:15 +02:00
Chris Pearce
7a191ffc4f Bug 1304604 - Use EventTarget to simplyfy HTMLMediaElement.onencrypted implementation. r=smaug 
MozReview-Commit-ID: EUpZX4ODgNj

--HG--
extra : rebase_source : dae4ac3da64b61bf282455f2b6e054e13e4cadc1
 2016-09-22 16:25:38 +12:00
Chris Pearce
39789bfc59 Bug 1304250 - Implement MediaKeySession.onmessage. r=smaug 
MozReview-Commit-ID: FDpvsoFwy6C

--HG--
extra : rebase_source : d569107d6c473d24800e2e4c97d6408ac81eb09b
 2016-09-21 14:56:20 +12:00
Chris Pearce
a509ea65bc Bug 1304249 - Implement MediaKeySession.onkeystatuseschange. r=smaug 
MozReview-Commit-ID: 1LnDi1MmXi2

--HG--
extra : rebase_source : e12a4085ad2462f1157ab4ea0552a239cd7499dc
 2016-09-21 14:31:15 +12:00
Chris Pearce
d42821ee80 Bug 1304247 - Implement HTMLMediaElement.onwaitingforkeys. r=smaug 
MozReview-Commit-ID: DhNV30BfksS

--HG--
extra : rebase_source : 5fab8f1b3333ff8607c0325907fbe7214234c001
 2016-09-21 14:10:26 +12:00
Gabor Krizsanits
9f5afabda0 Bug 1294381 - Delayed process script for test_bug803225.html. r=mrbkap 2016-09-22 09:26:26 +02:00
Eitan Isaacson
f9db412633 Bug 1279842 - Explicitly escape markup instead of using generic HTML escape function. r=m_kato 
MozReview-Commit-ID: 2vk8lffmDh4

--HG--
extra : rebase_source : b01c1f922b9cd88b33b1732c46d069c6ce0a7935
 2016-09-21 10:33:45 -07:00
Carsten "Tomcat" Book
762cd18602 Merge mozilla-central to autoland 2016-09-28 16:52:13 +02:00
Alex Chronopoulos
2da14d6518 Bug 1256079 - Append video element to the document. r=pehrsons 
MozReview-Commit-ID: F0tGd4kk0mD

--HG--
extra : rebase_source : 843bbaa0f3f54424862645e2c0fbe139b501fb9f
 2016-09-28 13:43:41 +03:00
James Cheng
48efb9caad Bug 1300654 Part1-Remove MOZ_EME from code base. r=cpearce,smaug 
MozReview-Commit-ID: JboGO0w4tcE

--HG--
extra : rebase_source : abfe53f30081f74fc39c900cab48d08c7574bfec
 2016-09-08 18:06:20 +08:00
Carsten "Tomcat" Book
08b3e66490 Merge mozilla-central to autoland 2016-09-15 12:08:47 +02:00
Alexandre Lissy
f6ee6d53f2 Bug 1302641 - Update ImageBridgeChild::GetSingleton() use after 1298938 r=nical 
MozReview-Commit-ID: Cs7xUcPnPoz
 2016-09-14 19:01:21 +02:00
Michael Layzell
5980e6a33e Bug 1302275 - Add a way to track Constellations (Units of related similar origin browsing contexts) to nsGlobalWindow, r=billm 
MozReview-Commit-ID: AjbVZHEL9WZ
 2016-09-14 12:22:40 -04:00
Nathan Froyd
ca183ff3cd Bug 1298149 - explicitly ignore the result of SendUpdateWindow in ContentParent::SendAsyncUpdate; r=baku 
This change doesn't modify the behavior of the code, but it does silence
a clang-cl warning.
 2016-09-14 19:28:26 -04:00
Andreas Pehrson
c16451f7df Bug 1300600 - Use TrackIter with for loop in AudioCaptureStream. r=padenot 
Let's kill TrackIter with fire!

MozReview-Commit-ID: KNDoEtX1iFk

--HG--
extra : rebase_source : 582307a8da4ce3fa745cfe43aceaad56374c3854
 2016-09-14 15:31:21 +02:00
Jan de Mooij
919372cf5c Bug 1302448 part 3 - Rename WorkerJSRuntime to WorkerJSContext. r=baku 
--HG--
extra : rebase_source : a1df9ae95f0c80f67ce21bc494bb92a20cbc5784
 2016-09-14 15:48:42 +02:00
Jan de Mooij
7f794780e0 Bug 1302448 part 2 - Rename XPCJSRuntime to XPCJSContext. r=mrbkap 
--HG--
rename : js/xpconnect/src/XPCJSRuntime.cpp => js/xpconnect/src/XPCJSContext.cpp
extra : rebase_source : e6b435ab1ca2739e340669195dff77c561ea573e
 2016-09-14 15:48:17 +02:00
Jan de Mooij
a53986bf29 Bug 1302448 part 1 - Rename CycleCollectedJSRuntime to CycleCollectedJSContext. r=mccr8 
--HG--
rename : xpcom/base/CycleCollectedJSRuntime.cpp => xpcom/base/CycleCollectedJSContext.cpp
rename : xpcom/base/CycleCollectedJSRuntime.h => xpcom/base/CycleCollectedJSContext.h
extra : rebase_source : 075214b5057f151520926715b6154e99ae80a0b3
 2016-09-14 15:47:32 +02:00
Carsten "Tomcat" Book
515bca4fca merge mozilla-inbound to mozilla-central a=merge 2016-09-14 15:41:48 +02:00
Carsten "Tomcat" Book
6520e60ddb Merge mozilla-central to autoland 2016-09-14 12:17:20 +02:00
Carsten "Tomcat" Book
9a2448ee1c Merge mozilla-central to mozilla-inbound 2016-09-14 12:11:09 +02:00
Carsten "Tomcat" Book
d2c3fe7fd3 merge autoland to mozilla-central a=merge 2016-09-14 12:07:02 +02:00
Andi-Bogdan Postelnicu
8f2af4af11 Bug 1302658 - substitute null checks with NS_ENSURE_TRUE. r=baku 
MozReview-Commit-ID: GQmfWrmhKNg

--HG--
extra : rebase_source : 50c8dbac10a8b249bccce27616159daec9d9af1a
 2016-09-14 12:15:01 +03:00
Benoit Girard
fab198cffc Bug 1288746 - Handle missing EGL failure IDs. r=jmuizel 
MozReview-Commit-ID: Kk5vFNMdhjV

--HG--
extra : rebase_source : 8a8851b91fa045c8cb13e1aee2c8c7c62d2b0a4e
 2016-09-13 14:17:29 -04:00
Ben Kelly
3ef8365a49 Bug 1300658 P6 Fix one place XHR used NS_DispatchToMainThread() directly from a worker. r=baku 2016-09-13 20:14:02 -07:00
Ben Kelly
f1f3b13517 Bug 1300658 P5 Make service worker APIs use the MainThreadTaskQueue. r=baku 2016-09-13 20:14:02 -07:00
Ben Kelly
c26c5533f0 Bug 1300658 P4 Make dom/fetch use the worker MainThreadTaskQueue. r=baku 2016-09-13 20:14:02 -07:00
Ben Kelly
adf0d2b529 Bug 1300658 P3 Don't fail test_consoleAndBlobs.html if other console messages are received. r=baku 2016-09-13 20:14:02 -07:00
Ben Kelly
e5c5dd65ac Bug 1300658 P2 Make WorkerRunnable's destined for main thread use the MainThreadTaskQueue. r=baku 2016-09-13 20:14:02 -07:00
Ben Kelly
f7c726cbfd Bug 1300658 P1 Expose a main thread TaskQueue WorkerPrivate. r=baku 2016-09-13 20:14:02 -07:00
Ben Kelly
f0d440f9d1 Bug 1300118 P1 Make TaskQueue deliver runnables to nsIEventTarget. r=bholley 2016-09-13 20:12:15 -07:00
George Wright
3480df735c Bug 1241865 - Disable canvas-2d-pixels memory reporter as it currently reports inaccurate values. r=nical 2016-09-13 23:03:09 -04:00
Daosheng Mu
9f5625a417 Bug 1300508 - Fix conformance fails for Windows 10; r=ethlin,jgilbert 
MozReview-Commit-ID: 6kR4Xfgo2Vo

--HG--
extra : rebase_source : 741415a1d3688a37ec7a6b41f4ec71edcc7c6b2b
 2016-09-13 22:25:47 +08:00
Jean-Yves Avenard
95ee05fbb7 Bug 1302465: [MSE] Schedule eviction, even if previously the source buffer was full. r=gerald 
Conditions may have changed (such as currentTime moving since the last attempt). So we try again.

MozReview-Commit-ID: 2zexl1FzOd7

--HG--
extra : rebase_source : 5c21f6edc438fb012e18eda45237383fc8b83794
 2016-09-14 09:28:01 +10:00
Thomas Wisniewski
3cf91c9343 Bug 918719 - Only fire one loading readystatechange per XHR, but keep the old behavior available behind the preference dom.send_multiple_xhr_loading_readystatechanges. r=smaug 
--HG--
extra : rebase_source : 296943a67ae8bd3065749cc424a4379320169585
 2016-09-12 22:39:01 -04:00
Thomas Wisniewski
e6afa43d92 Bug 812701 - Drop the prefixed version of the Visibility API. r=bz 
--HG--
extra : rebase_source : 2d989414b2ccbb9c712e711c8373bdca6f87fc4b
 2016-09-13 09:56:14 -04:00
Frederik Braun
fd99ac5cc2 Bug 1277248 - Add test to ensure that require-sri-for does not allow svg:scripts r=ckerschb 
MozReview-Commit-ID: 1knIYZ93UeY

--HG--
extra : rebase_source : 4c1385382ecdddf80ec45d46d440b37bf4ad47c1
 2016-09-13 11:05:37 +02:00
Stone Shih
eddb068dd7 Bug 1297635 - Add a helper function for input to check whether input events with modifier should change the value. r=smaug, f=bevistseng 
--HG--
extra : rebase_source : a5df32c01f4ee02ca2ab2a668836e87d16e8bb10
 2016-09-06 14:30:00 +08:00
David Anderson
07336b7d13 Protect ImageBridgeChild's singleton with a StaticMutex. (bug 1298938 part 5, r=mattwoodrow) 
--HG--
extra : rebase_source : 974ad32cfaf3ba6d1af75d8857f0a35da5aa3641
 2016-09-13 16:30:57 -07:00
David Anderson
62129d7cb4 Remove racy ImageBridgeChild shutdown/creation checks. (bug 1298938 part 4, r=nical) 
--HG--
extra : rebase_source : 0419df6221d59c4e9b085015d8483267fb3d446f
 2016-09-13 16:30:57 -07:00
Jean-Yves Avenard
66c6aa70b2 Bug 1300292: Call SetSeekThreshold for h264 content. r=gerald 
MozReview-Commit-ID: C7vADo0eo2E

--HG--
extra : rebase_source : 51950a23633acc10fef4e514b305daa216229a19
 2016-09-13 15:54:26 +10:00
Haik Aftandilian
9de1898bc2 Bug 1290619 - Content sandbox rules should use actual profile directory, not Profiles/*/ regex's; r=jimm 
Passes the profile dir to the content process as a -profile CLI
option so that the correct profile dir can be used in the OS X content
sandbox rules.  Only enabled on OS X for now.

On Nightly, profile directories will now be read/write protected
from the content process (apart from a few profile subdirectories) even
when they don't reside in ~/Library.

xpcshell tests invoke the content process without providing a
profile directory. In that case, we don't need to add filesystem
profile dir. read/write exclusion rules to the sandbox.

This patch adds two new macros to the content sandbox rule set:
|profileDir| holds the path to the profile or the emptry string;
|hasProfileDir| is a boolean (1 or 0) that indicates whether or
not the profile directory rules should be added. If |hasProfileDir|
is 0, profile directory exclusion rules don't need to be added
and |profileDir| is not used.

MozReview-Commit-ID: rrTcQwTNdT

--HG--
extra : rebase_source : 3d5b612c8eb3a1d0da028eba277cd9d6f0c9ac00
 2016-08-30 13:32:21 -07:00
Jean-Yves Avenard
ed9868472d Bug 1301059: Do not use H264Converter when video decode is suspended. r=jya 
MozReview-Commit-ID: FWvn3Xkalsl

--HG--
extra : rebase_source : 065979264f1dbf99659757e7edec5aaaf5d98e24
 2016-09-07 23:59:59 +10:00
Mantaroh Yoshinaga
02a6ea7d52 Bug 1298554 - Remove the animation.id mochitest. r=birtles 
MozReview-Commit-ID: 8VTAl9WO7eF

--HG--
extra : rebase_source : b9f7f257a7509ad26d839644e77b2afc7877cd2f
 2016-09-12 10:23:10 +09:00
Mantaroh Yoshinaga
01b448239f Bug 1302007 part 2 - Add the test of cancelling the transition when setting display='none'. r=birtles 
MozReview-Commit-ID: B6avXxpEpDw

--HG--
extra : rebase_source : 5994b803e7d41e43f53cdc38a473f518ca528ca7
 2016-09-13 16:59:52 +09:00
Mantaroh Yoshinaga
4bb206baf4 Bug 1302007 part 1 - Use the promise_test in transition cancel tests. r=birtles 
MozReview-Commit-ID: 7cXfwkT7kaH

--HG--
extra : rebase_source : c19372eb265fbc9d0869ac8a9ae41e05f789d5ce
 2016-09-12 12:11:15 +09:00
Carsten "Tomcat" Book
c737c8cee6 Merge mozilla-central to autoland 2016-09-13 13:09:21 +02:00
Carsten "Tomcat" Book
f77a18b1b7 merge mozilla-inbound to mozilla-central a=merge 2016-09-13 11:57:54 +02:00
Mike Hommey
935ad653b8 Bug 1299919 - Set CPP/CXXCPP from python configure. r=chmanchester 2016-09-13 13:25:18 +09:00
Hiroyuki Ikezoe
5f5f888c4b Bug 1216843 - Part 15: Update styles when current iteration changed. r=birtles 
MozReview-Commit-ID: 33JtZplxiAz
 2016-09-13 11:48:45 +09:00