Commit Graph

257567 Commits

Author SHA1 Message Date
Ryan VanderMeulen
c94aa4172e Merge fx-team to m-c. a=merge 2015-08-13 11:00:54 -04:00
Ryan VanderMeulen
0e1e07eb65 Bug 1192449 - Skip browser_audioTabIcon.js on e10s for frequent failures. 2015-08-13 10:49:14 -04:00
Ryan VanderMeulen
3a710febdb Merge inbound to m-c. a=merge 2015-08-13 10:43:42 -04:00
B2G Bumper Bot
fc253c07d6 Bumping manifests a=b2g-bump 2015-08-13 06:08:35 -07:00
B2G Bumper Bot
4bb3d9c62c Bumping manifests a=b2g-bump 2015-08-13 05:57:11 -07:00
B2G Bumper Bot
22a5ac1fe8 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3248bd9e707a
Author: Evan Tseng <itoyxd@gmail.com>
Desc: Merge pull request #31339 from evanxd/bug-1160374

Bug 1160374 - Bind this r=gasolin

========

https://hg.mozilla.org/integration/gaia-central/rev/e97f871e5def
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 1160374 - Bind this r=gasolin
2015-08-13 05:55:31 -07:00
B2G Bumper Bot
8496579165 Bumping manifests a=b2g-bump 2015-08-13 02:44:42 -07:00
B2G Bumper Bot
380fdebe53 Bumping manifests a=b2g-bump 2015-08-13 02:17:13 -07:00
B2G Bumper Bot
daf86ca07d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a089e40af575
Author: Ricky Chien <rickychien@users.noreply.github.com>
Desc: Merge pull request #30970 from rickychien/basemodule

Bug 1156596 - Support device type in base module r=@john-hu

========

https://hg.mozilla.org/integration/gaia-central/rev/6c19bce639d9
Author: Ricky Chien <ricky060709@gmail.com>
Desc: Bug 1156596 - Support device type in base module
2015-08-13 02:15:33 -07:00
Sebastian Hengst
7f22522c95 Backout bedff4a78d9a (bug 1190474) for B2G ICS Emulator Cpp unittests permafail. r=backout 2015-08-13 09:08:45 +02:00
John Daggett
6e58b08bf2 Bug 1192699 - eliminate the two-stage system fontlist initialization under DirectWrite. r=m_kato 2015-08-13 15:04:25 +09:00
Jean-Yves Avenard
b77989d237 Bug 1190238: P3. Do not loop calling MediaResource::Read or ReadAt, let MediaResourceIndex do it for us. r=cpearce
This allows to remove a fair amount of duplicated logic.
Most of it is in obsoleted code though.
2015-08-13 15:27:10 +10:00
Jean-Yves Avenard
1105f69a58 Bug 1190238: P2. Have MediaResourceIndex::ReadAt() only stop early when reaching EOS or error. r=cpearce
MediaResource::ReadAt() requires to loop several times to ensure that all data has been read as it may return less data than requested.
This will allow to remove the handling of this particular shortcoming in MediaResources' users.
2015-08-13 15:27:09 +10:00
Jean-Yves Avenard
b2f4db10c9 Bug 1190238: P1. Remove MediaResource::Read/Seek. r=cpearce
This functionality is now replaced with a dedicated new MediaResourceIndex class.
This allows for concurrent Read/Seek use of the MediaResource without having side effects.
2015-08-13 15:27:09 +10:00
Jamin Liu
b5e3a7eb60 Bug 1192695 - Use pref instead of pre-defined C string as origin of bluetooth app. r=btian 2015-08-13 12:56:09 +08:00
Jim Chen
03727ba844 Bug 1192082 - Iniialize/deinitialize JNI in nsAppShell; r=snorp
First we need to set the Gecko thread JNIEnv* in nsAndroidStartup, but
after that we can initialize and deinitialize the rest of JNI, including
AndroidBridge, in GeckoAppShell. This makes nsAppShell control the
AndroidBridge lifetime. Over time, parts of the AndroidBridge
functionality will be migrated to nsAppShell.
2015-08-13 00:53:40 -04:00
Jim Chen
c6ef3b5faa Bug 1192082 - De-clutter AndroidBridge init/deinit; r=snorp
Merge all the init code into AndroidBridge constructor and
AndroidBridge::ConstructBridge; merge all the deinit code into
AndroidBridge destructor and AndroidBridge::DeconstructBridge.

In particular, the SetMainThread call is obsolete and removed.
2015-08-13 00:53:39 -04:00
Jim Chen
4448fe28dd Bug 1192082 - Expose AndroidBridge arguments through GeckoThread; r=snorp
AndroidBridge needed some arguments during its initialization. We'll
provide those arguments in GeckoThread, which AndroidBridge will access.
2015-08-13 00:53:39 -04:00
Jim Chen
742bfc8ea0 Bug 1192082 - Get rid of GeckoAppShell.nativeInit; r=snorp
Instead of letting AndroidBridge be constructed separately, we'll let
Gecko construct AndroidBridge.
2015-08-13 00:53:39 -04:00
Jim Chen
3c482afe24 Bug 1192082 - Expose GeckoThread states to C++; r=me 2015-08-13 00:53:39 -04:00
Jim Chen
70ccbabd84 Bug 1192079 - Update generated code; r=me 2015-08-13 00:53:39 -04:00
Jim Chen
4d224c779a Bug 1192079 - Use unqualified names when possible; r=snorp
To reduce verbosity of the generated code, this patch makes the code
generator use unqualified names when possible, e.g. use State::Ref
instead of GeckoThread::State::Ref. To accomplish that, function
prototypes now use the C++11 -> syntax for return types.
2015-08-13 00:53:39 -04:00
Jim Chen
d56439001f Bug 1192079 - Support inner classes in generated JNI wrapper; r=snorp
Currently, when we generate JNI wrapper for an inner class, the
resulting C++ class will not actually be a nested class of the enclosing
class. As a result, the class can be confusing to use. For example,
wrapping Java class GeckoThread.State results in two unrelated C++
classes, GeckoThread and State, and it'd be confusing to use State by
itself.

This patch adds support for inner classes. We start by scanning only for
top-level classes, and when processing each top-level class, we
recursively scan for inner classes through
JarClassIterator.getInnerClasses() and CodeGenerator.generateClasses().
For each Java inner classes, the resulting C++ class will be a nested
class. For example, wrapping GeckoThread.State will produce
widget::GeckoThread and widget::GeckoThread::State.
2015-08-13 00:53:39 -04:00
Jim Chen
25353fa7f4 Bug 1192077 - Convert AndroidBridge JNIEnv calls; r=esawin 2015-08-13 00:53:39 -04:00
Jim Chen
2fb5d313bd Bug 1192077 - Move AndroidBridge JNIEnv calls to jni/Utils; r=esawin
Calls like GetJNIForThread should now belong in jni/Utils. Moving the
calls also reduce clutter in AndroidBridge.
2015-08-13 00:53:39 -04:00
Jim Chen
6d38435454 Bug 1189995 - Move GeckoAppShell.pumpMessageLoop to GeckoThread; r=esawin
This method is used by Gecko to pump the Android message loop, and it's
also more suited to GeckoThread than GeckoAppShell.
2015-08-13 00:53:39 -04:00
Jim Chen
1a10abe68c Bug 1189995 - Move GeckoAppShell.runGecko to GeckoThread; r=esawin
GeckoAppShell.runGecko really should be in GeckoThread because
GeckoThread already takes care of most of the preparation when running
Gecko. This patch merges runGecko into GeckoThread.run, but split the
argument-building code into its own method.
2015-08-13 00:53:39 -04:00
Jim Chen
3e0d9c927d Bug 1191083 - Merge pending events handling into mechanism for queued native calls: r=snorp
Right now we have a separate way of handling pending events before Gecko
is loaded. We can merge that into the new mechanism for queuing native
calls.
2015-08-13 00:53:38 -04:00
Jim Chen
2f5f80a74f Bug 1191083 - Add mechanism to queue native calls in GeckoThread; r=snorp
We cannot call native methods until Gecko is loaded. This patch adds a
mechanism in GeckoThread so that other code can queue up native method
calls and have those calls automatically delivered when Gecko is ready.
2015-08-13 00:53:38 -04:00
Jim Chen
50f2c4d19c Bug 1191083 - Implement more GeckoThread states; r=snorp
Implement the MOZGLUE_READY and JNI_READY states in GeckoThread. Also
change GeckoJavaSampler to use the new states instead of a separate
flag.
2015-08-13 00:53:38 -04:00
Jim Chen
0b113d3d99 Bug 1191083 - Rename and expand GeckoThread.LaunchState; r=snorp
GeckoThread.LaunchState now covers the entire GeckoThread lifetime and
not just launch, so it's renamed to GeckoThread.State. More utility
methods are added to check for the current state.
2015-08-13 00:53:38 -04:00
Jim Chen
60330b67bb Bug 1191161 - Followup to fix wrong annotation classpath; r=nalexander
Because we switched annoations from gecko-mozglue.jar to constants.jar,
we should update the corresponding classpaths when processing
annotations during code autogeneration.

gecko-mozglue.jar is still needed during the javah step because
gecko-browser.jar has a dependency on
org.mozilla.gecko.mozglue.JNIObject.
2015-08-13 00:53:38 -04:00
B2G Bumper Bot
a68a0a9063 Bumping manifests a=b2g-bump 2015-08-12 19:27:08 -07:00
B2G Bumper Bot
724127ba95 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/48ec214f9509
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #31337 from gasolin/issue-1194036

Bug 1194036 - [keyboard] syntaxs fix to generate doc, r=me

========

https://hg.mozilla.org/integration/gaia-central/rev/8f9b03ba2be0
Author: gasolin <gasolin@gmail.com>
Desc: Bug 1194036 - [jsdoc] syntaxs fix to generate doc, r=me
2015-08-12 19:25:30 -07:00
B2G Bumper Bot
32bf294013 Bumping manifests a=b2g-bump 2015-08-12 17:47:08 -07:00
B2G Bumper Bot
e70c061d70 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/68faecf8baea
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Merge pull request #31330 from stasm/1193766-l20n-3.0.4

Bug 1193766 - Update l20n.js to 3.0.4. r=gandalf

========

https://hg.mozilla.org/integration/gaia-central/rev/85f08d5ec49f
Author: Staś Małolepszy <stas@mozilla.com>
Desc: Bug 1193766 - Update l20n.js to 3.0.4
2015-08-12 17:45:29 -07:00
Nicholas Nethercote
c085de28ef Bug 828844 - Add a "system-heap-allocated" memory report on Linux. r=glandium.
This gives zero when jemalloc is enabled and non-zero when jemalloc is disabled
(e.g. I got 83 MiB at start-up, which sounds plausible).
2015-08-12 17:44:00 -07:00
Edwin Flores
caf971a3bc Bug 1135320 - Re-enable voucher.bin generation on Win64 - r=cpearce 2015-08-13 16:08:46 -07:00
Francois Marier
ac7008bae2 Bug 992096 - Implement Sub Resource Integrity [2/2]. r=ckerschb
Mochitests
2015-08-12 20:19:16 -07:00
Francois Marier
300306be73 Bug 992096 - Implement Sub Resource Integrity [1/2]. r=baku,r=ckerschb
Code changes
2015-08-12 20:19:11 -07:00
JW Wang
26e2e34e08 Bug 1191192 - Add DecodedStream::SetSameOrigin(). r=roc. 2015-08-13 09:22:59 +08:00
B2G Bumper Bot
a58d2b949a Bumping manifests a=b2g-bump 2015-08-12 17:26:46 -07:00
B2G Bumper Bot
ac6aa301fc Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e66e7cf04d17
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #31252 from hfiguiere/bug1191245-tests

Bug 1191245 - Wait finish scanning before checking the overlay r=squib

========

https://hg.mozilla.org/integration/gaia-central/rev/b3925c886998
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1191245 - Wait finish scanning before checking the overlay
2015-08-12 17:25:08 -07:00
B2G Bumper Bot
027c712103 Bumping manifests a=b2g-bump 2015-08-12 15:23:46 -07:00
B2G Bumper Bot
9ba79f4bf3 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/fab29041cf8b
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #31324 from sfoster/ftu-perf-markers-bug-1193369

Bug 1193369 - Add performance marks for default ftu load/init. r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/38bdf33ac847
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1193369 - Add performance marks for default ftu load/init. r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/5def1fafa6d9
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #31333 from hfiguiere/bug1193819-music-nga

Bug 1193819 - Temporarily rename the Music NGA app so we can differentiate r=justindarc

========

https://hg.mozilla.org/integration/gaia-central/rev/299a0cd0dc4f
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1193819 - Temporarily rename the Music NGA app so we can differentiate.
2015-08-12 15:22:09 -07:00
Wes Kocher
86f14b7cec Merge inbound to central, a=merge 2015-08-12 15:16:16 -07:00
Wes Kocher
5ddf13cf43 Merge b2ginbound to central, a=merge 2015-08-12 14:52:11 -07:00
Fabrice Desré
2ee84dff73 Bug 1129882 - backout 9c6fde246f6e and 847b57aaeff7 for causing 1193840 on a CLOSED TREE r=szchen, r=htsai 2015-08-12 14:35:41 -07:00
Wes Kocher
f13fc91d53 Backed out changeset 87356283d9f2 (bug 443811) for mac xpcshell permacrashes CLOSED TREE 2015-08-12 14:27:55 -07:00
Ryan VanderMeulen
cf9125daad Backed out changesets 41e3f27dd893 and efaeac1575a1 (bug 1186273) for causing frequent test_fs_app_permissions.html timeouts.
CLOSED TREE
2015-08-12 16:23:38 -04:00