Граф коммитов

17722 Коммитов

Автор SHA1 Сообщение Дата
Wes Kocher e4fc739f11 Merge m-c to fx-team, a=merge CLOSED TREE 2015-09-23 13:26:00 -07:00
Wes Kocher 46c7f8fbad Merge fx-team to central, a=merge CLOSED TREE 2015-09-23 13:22:10 -07:00
Carsten "Tomcat" Book 8c6fb25f01 Merge mozilla-central to fx-team
--HG--
rename : ipc/chromium/src/third_party/libevent-avoid-empty-sighandler.patch => ipc/chromium/src/third_party/libevent/patches/avoid-empty-sighandler.patch
rename : ipc/chromium/src/third_party/libevent-dont-use-issetugid-on-android.patch => ipc/chromium/src/third_party/libevent/patches/dont-use-issetugid-on-android.patch
rename : ipc/chromium/src/third_party/libevent/mac-arc4random-buf.patch => ipc/chromium/src/third_party/libevent/patches/mac-arc4random-buf.patch
rename : ipc/chromium/src/third_party/libevent/openbsd-no-arc4random_addrandom.patch => ipc/chromium/src/third_party/libevent/patches/openbsd-no-arc4random_addrandom.patch
rename : ipc/chromium/src/third_party/libevent-use-non-deprecated-syscalls.patch => ipc/chromium/src/third_party/libevent/patches/use-non-deprecated-syscalls.patch
rename : testing/web-platform/mozilla/tests/service-workers/service-worker/getregistrations.sub.html => testing/web-platform/mozilla/tests/service-workers/service-worker/getregistrations.https.html
extra : rebase_source : 67b20330e6107d82c58c1fb0d90926d799380b54
2015-09-23 12:40:30 +02:00
Carsten "Tomcat" Book 292376c78a merge mozilla-inbound to mozilla-central a=merge 2015-09-23 12:28:10 +02:00
Carsten "Tomcat" Book 8a80234ef3 merge fx-team to mozilla-central a=merge 2015-09-23 12:24:46 +02:00
Wes Kocher 6451ce33a7 Merge m-c to b2ginbound, a=merge 2015-09-22 16:47:26 -07:00
Wes Kocher fd19a9f213 Merge fx-team to central, a=merge 2015-09-22 16:39:01 -07:00
Nick Alexander faa87abc9b Bug 1194365 - Bump Andoid NDK to r10e; manually install Android SDK and NDK on Mac OS X. r=mcomella
This bumps the NDK version to r10e.

Previously, we used brew to install android-sdk and a custom version
of android-ndk.  That makes it hard to control the installed versions.
This installs from downloaded archives, which unifies the Mac OS X
approach with the straight-forward Linux approach.

--HG--
extra : commitid : E7hEqsyy8Gw
extra : rebase_source : 9ea27e7d2ae3fbaaa3efbabdd701521981bec877
extra : histedit_source : c07c80c50ac066dc6808e7ccf96f0bc14dc09df2
2015-09-22 13:56:17 -07:00
Fabrice Desré 93b9d0868c Bug 1207279 - Use $FIREFOX_VERSION in confvar.sh to get the right version number. r=nalexander 2015-09-22 13:48:12 -07:00
Wes Kocher 468b697f04 Backed out 3 changesets (bug 1192924) for Android bustage CLOSED TREE
Backed out changeset 30d612836685 (bug 1192924)
Backed out changeset a6860f880e01 (bug 1192924)
Backed out changeset 10e1fa2cc23a (bug 1192924)

--HG--
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app1/features/system1@tests.mozilla.org.xpi
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system2_1.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app1/features/system2@tests.mozilla.org.xpi
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_2.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app2/features/system1@tests.mozilla.org.xpi
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system3_1.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app2/features/system3@tests.mozilla.org.xpi
rename : toolkit/mozapps/extensions/test/xpcshell/data/system_addons/system1_1_badcert.xpi => toolkit/mozapps/extensions/test/xpcshell/data/system_addons/app3/features/system1@tests.mozilla.org.xpi
2015-09-22 11:02:55 -07:00
Martyn Haigh 873bc3d810 Bug 1207201 - Fix tab selection bugs; r=mcomella
--HG--
extra : commitid : 37CDqAbaO03
extra : rebase_source : 77c5926157073c5573a10783ce345edf6036ba3a
2015-09-22 16:48:36 +01:00
Fabrice Desré c9541bd177 Bug 1206792 - Crash when launching the camera from the gallery app r=snorp 2015-09-22 08:05:24 -07:00
vivek 124fe53d3a Bug 1178378 - Register for web channel notications and update account profile on callback r=nalexander
--HG--
extra : rebase_source : ac2e38877dda9c927965d137fa2547d857d485ae
2015-09-22 19:06:48 +03:00
Carsten "Tomcat" Book 651a168616 merge mozilla-inbound to mozilla-central a=merge
--HG--
rename : toolkit/devtools/server/actors/styleeditor.js => devtools/server/actors/styleeditor.js
rename : toolkit/devtools/server/actors/stylesheets.js => devtools/server/actors/stylesheets.js
rename : toolkit/devtools/gcli/commands/screenshot.js => devtools/shared/gcli/commands/screenshot.js
2015-09-22 12:35:13 +02:00
Michael Comella 0f64136f8d Bug 1203628 - Don't use gecko style on share overlay dialog. r=sebastian
--HG--
extra : commitid : 17nPFC00PWc
extra : rebase_source : a0c4f87f764e33e996f1fbbd824e1a6dc121b6e6
2015-09-18 17:43:04 -07:00
Nick Alexander e64e2764fe Bug 1204260 - Post: remove platforms/android-* from --with-android-sdk. r=glandium
--HG--
extra : commitid : DnJd62BdbKF
extra : rebase_source : e56f1aaa8fcc0dd154f7f9d00e4f43717eaa6a9b
extra : histedit_source : f3958b43b143c4d32be0e0117febe40698b9aeb4
2015-09-12 15:35:40 -04:00
J. Ryan Stinnett 2236dbad11 Bug 912121 - Create shims for popular DevTools modules in add-ons. rs=devtools
For popular modules used by many DevTools add-ons, add shim files which wrap the
modules and make them available at their previous location.

Each shim includes a deprecation warning to make devs and users aware of the
issue.

--HG--
rename : devtools/server/dbg-server.jsm => devtools/server/shims/dbg-server.jsm
rename : devtools/shared/client/dbg-client.jsm => devtools/shared/shims/dbg-client.jsm
extra : commitid : H7Y9k2ADf0u
extra : rebase_source : 2bd193ecd4f2baeb8b14c14c63884d3a318a0840
2015-09-17 16:28:42 -05:00
J. Ryan Stinnett 4f1af0e003 Bug 912121 - Update misc. DevTools paths and comments. rs=devtools
--HG--
extra : commitid : BSf4D59s9HF
extra : rebase_source : 4d14e1aa3ad93bbb426861336e8b703bc1e0b3af
2015-09-21 12:07:31 -05:00
J. Ryan Stinnett efe328f1b2 Bug 912121 - Rewrite require / import to match source tree. rs=devtools
In a following patch, all DevTools moz.build files will use DevToolsModules to
install JS modules at a path that corresponds directly to their source tree
location.  Here we rewrite all require and import calls to match the new
location that these files are installed to.

--HG--
extra : commitid : F2ItGm8ptRz
extra : rebase_source : b082fe4bf77e22e297e303fc601165ceff1c4cbc
2015-09-21 12:04:18 -05:00
Dave Townsend a22c2d1f9e Bug 1192924: Expose the update URL formatting code a new UpdateUtils module. r=rstrong
The GMP manager uses a copy of the update service's url formatting code and has
since fallen out of sync. We'll also want to use the same formatting code for
the system add-on update checks so this just exposes it in a shared API.

I've moved the contents of UpdateChannel.jsm to UpdateUtils.jsm and exposed
formatUpdateURL there as well as a few properties that the update service still
needs access to.

UpdateUtils.UpdateChannel is intended to be a lazy getter but isn't for now
since tests expect to be able to change the update channel at runtime.

--HG--
extra : commitid : KsbH21csjH4
extra : rebase_source : bc7c08de1ec6e802261b8cd294d88ee2c4e75c2d
2015-09-14 11:04:19 -07:00
Martyn Haigh cd5d26a334 Backed out changeset dd6c9d2f07da
--HG--
extra : commitid : CdSZnPbw8YA
2015-09-23 17:32:24 +01:00
Martyn Haigh edcfb518d4 Bug 1207201 - Fix tab selection bugs; f?rnewman
Rather than just add suport for a new homepage, I think it's wise that we add support for android preferences from distro files.

I've added support from within the preferences.json file, an example file would look like this:

{
  "Global": {
    "id": "sample",
    "version": 1.0,
    "about": "Sample Distribution"
  },
  "Preferences": {
    "privacy.donottrackheader.enabled": true
  },
  "LocalizablePreferences": {
    "browser.search.defaultenginename": "Bugzilla@Mozilla"
  },
  "AndroidPreferences": {
    "homepage": "http://www.mozilla.com"
  }
}

--HG--
extra : commitid : INGL1YVHSdf
extra : rebase_source : 8b0ebc5a94e653c86254232ca6c752f09602a4b7
extra : amend_source : b5627935333b0f1dbae8a9e76c427eef21c962ca
2015-09-23 17:21:08 +01:00
Dave Townsend fb7653707b Bug 1192924: Expose the update URL formatting code a new UpdateUtils module. r=rstrong
The GMP manager uses a copy of the update service's url formatting code and has
since fallen out of sync. We'll also want to use the same formatting code for
the system add-on update checks so this just exposes it in a shared API.

I've moved the contents of UpdateChannel.jsm to UpdateUtils.jsm and exposed
formatUpdateURL there as well as a few properties that the update service still
needs access to.

UpdateUtils.UpdateChannel is intended to be a lazy getter but isn't for now
since tests expect to be able to change the update channel at runtime.

--HG--
extra : commitid : FuPUB9X4oYJ
extra : rebase_source : cfcd31d7da5f5b636a2ec11546dbada973d681de
extra : histedit_source : 3df840dc502c6ee4177f1858920d1260e4dc27af
2015-09-14 11:04:19 -07:00
Martyn Haigh 134bd68a6b Bug 1203122 - Current tab is not selected in tab tray on gingerbread devices; r=mcomella
--HG--
extra : commitid : IB8B5yOQUpL
2015-09-22 15:01:59 +01:00
Martyn Haigh 1af066c7e4 Backed out changeset a7090080e871
--HG--
extra : commitid : 5RLjQNTFkQ0
2015-09-22 15:00:32 +01:00
Martyn Haigh 94194c8be3 Bug 1203122 - Current tab is not selected in tab tray on gingerbread devices; r=mcomella
--HG--
extra : commitid : BecvsS52yMZ
extra : rebase_source : 97c008346e606e680564e2f1f687e22b387ef42d
2015-09-22 14:46:17 +01:00
Martyn Haigh d04323c116 Bug 1204851 - reinstate changes behind nightly flag; r=mfinkle
--HG--
extra : commitid : GJ0yKqIKgNb
extra : rebase_source : c5aa973359b95eb54db41cf79ddc1221f21017f6
2015-09-15 16:18:55 +01:00
Martyn Haigh a61026a267 Bug 1204851 - Revert back button removal; r=mfinkle
--HG--
rename : mobile/android/base/resources/drawable-hdpi/tabs_panel_nav_back.png => mobile/android/base/resources/drawable-large-hdpi-v11/tabs_panel_nav_back.png
rename : mobile/android/base/resources/drawable-xhdpi/tabs_panel_nav_back.png => mobile/android/base/resources/drawable-large-xhdpi-v11/tabs_panel_nav_back.png
rename : mobile/android/base/resources/drawable-xxhdpi/tabs_panel_nav_back.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/tabs_panel_nav_back.png
extra : commitid : AyeM1vxIakA
extra : rebase_source : ec9361a7a1f78a959bcb2df3f95974260f6a7502
2015-09-15 13:00:02 +01:00
Carsten "Tomcat" Book 16ceb64560 Merge mozilla-central to fx-team 2015-09-22 12:51:39 +02:00
Prateek Arora ab6636afdd Bug 1201340 - update aboutBase.css to include an explicit background color. r=ally 2015-09-06 17:49:48 +05:30
Ahmed Khalil b2af39acdc Bug 1182270 - Avoid race conditions when deleting Firefox Accounts. r=vivek 2015-09-21 13:22:00 +02:00
Prabhjyot Sodhi b3e7045388 Bug 1167382 - Reset scroll state of SearchEngineBar in BrowserSearch Fragment before it is shown everytime. r=mcomella
--HG--
extra : rebase_source : 569ae5d5881602e26afd5e07240f14a642110a4e
2015-09-05 05:06:00 +02:00
Phil Ringnalda 085aeff8f5 Merge f-t to m-c, a=merge 2015-09-20 17:58:11 -07:00
Josh Matthews 2d0398ffa7 Bug 885982 - Part 4: Remove all traces of JS implementation. r=asuth 2015-09-20 05:57:15 -04:00
dominique vincent aba012f7d0 Bug 1200181 - Zoomed view and Form Assistant should not be displayed at the same time. r=mcomella 2015-09-14 14:10:16 +02:00
Christian Schmitz 99a86591a6 Bug 1204655 - Respond to a main launcher intent with category APP_BROWSER selector. r=mcomella 2015-09-14 22:52:05 +02:00
Seth Fowler 3e6e1a075a Bug 1146663 (Part 1) - Remove HQ scaling, which is now dead code. r=tn 2015-09-19 16:20:56 -07:00
Nick Alexander fc744de89e Bug 1108782 - Part 3: Update releng tooltool manifests to use android-sdk-linux with extras/*/m2repository directories. r=glandium
The new tar.xz file was produced by taking the existing file, removing
extras/*/support, and copying over the extras/*/m2repository from my
local machine.  These directories are all the same across all
installs, to the best of my knowledge.  I used |xz --compress| with no
additional options.

--HG--
extra : commitid : 3gSpjaOw7Xj
extra : rebase_source : 2cdc5039cc2046f8f716ca650f18d53e8d700877
extra : histedit_source : 52eeb368a09cf7a39af82dca1b85c173a101c070
2015-09-03 16:11:51 -07:00
Nick Alexander 416f8c64aa Bug 1108782 - Part 2: Explode AAR files at configure time. r=glandium
This gets us a limited version of AAR support: we can consume static
AAR libraries, where here static does not refer to linking, but to
static assets that are fixed at build-backend time and not modified
(or produced) during the build.  This lets us pin our dependencies
(and move to Google's versioned Maven repository packages, away from
Google's unversioned ad-hoc packages).

By restricting to static AAR libraries, we avoid having to handle
truly complicated dependency trees, as changing parts of generated AAR
files require delicate rebuilding of the APKs (and internal libraries)
that depend on the AAR files.

It is possible that we will generate AARs in the tree at some time.
Right now, we don't do that, even for GeckoView: the AARs produced are
assembled as artifacts at package time and are intended for external
consumption.  We might want this for GeckoView and Fennec at some
time; we should consider using Gradle everywhere at that point.

The patch itself does the simplest possible thing (which has precedent
from Gradle and other build systems): it simply "explodes" the AAR
into the object directory and uses existing mechanisms to refer to the
exploded pieces.

AARs have both required and optional components.  Each component is
defined with an expected and required flag. If a component is expected
and not present, or not expected and is present, an error is raised.
If the component is expected and present, autoconf's ifelse() macro is
used to define the relevant AAR_* component variables.  If the
component is not expected and not present, no action is taken.  A
consuming build backend therefore can guard all AAR_* component
variables with just the top-level AAR variable.

Many AAR files have empty assets/ directories.  This patch doesn't
explode empty assets/ directories, protecting against trivial changes
to AAR files that don't impact the build.

There's a lot not to like in this approach, including:

* We need to manually reference internal AAR libs;
* I haven't separated the pinned version numbers out of configure.in.

However, it's closer to what we want than what we have!

--HG--
extra : commitid : 11kUhDAkCn5
extra : rebase_source : 2454c9842ab3296d53ca5fa394a5a962aa382c8d
extra : histedit_source : e2f97502d215016925e93500b8fd93f8b32fba3a
2015-09-22 10:04:26 -07:00
Nick Alexander c8ee8a09cf Bug 1108782 - Part 1: straighten out Java classpaths. r=glandium
This commit is us getting out of our own way.  We were specifying
-classpath twice, once in $(JAVAC) and once in java-build.mk.  Only
the latter of these is active.  This a problem for ANDROID_EXTRA_JARS
-- those JARs should be on the classpath and input to $(DX) -- and
JARs that should be on the classpath but *not* input to $(DX).  This
commit removes the global flags to $(JAVAC) and adds
JAVA_{BOOT}CLASSPATH_JARS.  This required some hijinkery moving
wildcards to moz.build files, but everything seems to work.

As well as clarifying some parts of the build, part 2 uses this work
to modify the classpath.

--HG--
extra : commitid : 25Ft0BFs88O
extra : rebase_source : 05e3d1da8d42fa89d06ef48baee17bb77df5bd59
extra : histedit_source : 95b82309aca15c5a3c5f5a0eafbdcf75c5e8dfc0
2015-08-31 13:35:05 -07:00
Wes Kocher 7bb88df9c4 Merge m-c to fx-team, a=merge 2015-09-22 16:48:10 -07:00
Allison Naaktgeboren 6cbea0bcc7 Bug 1207108 - Duplicated 'bookmarks_title' string in android_strings.dtd.r=nalexander 2015-09-22 13:39:48 -07:00
Allison Naaktgeboren 98127aeb6e Bug 1200367 - saved searches should have an opt-out pref in settings.r=liuche 2015-09-22 13:39:48 -07:00
vivek e1f1409f3d Bug 1178378 - Enable profile click action based on native accounts UI r=nalexander
--HG--
extra : commitid : AtIRplgWF9O
extra : rebase_source : 9ccd0809733de5b0d7c78540b9622a17635b7d97
2015-09-22 22:02:40 +03:00
Carsten "Tomcat" Book cb02da953c Merge mozilla-central to mozilla-inbound 2015-09-23 12:47:04 +02:00
Carsten "Tomcat" Book 58878018ac Backed out 1 changesets (bug 1178533) for s4 testfailures
Backed out changeset 8bbdb80f67e0 (bug 1178533)

--HG--
extra : rebase_source : 040491f382ad7b03ba803686601f1272416ab47d
2015-09-23 10:17:54 +02:00
Chris Peterson 71920a9550 Bug 1207030 - Enable -Wshadow flag in more directories that have no -Wshadow warnings. r=glandium 2015-09-22 21:39:03 -07:00
Stephanie Ouillon ad9e2b8a95 Bug 1178533 - Add nsIInstallPackagedWebapp for registering permissions when navigating to signed packages. r=bholley, r=fabrice, r=valentin 2015-09-22 11:55:00 +02:00
Wes Kocher d483efb68a Merge m-c to inbound, a=merge CLOSED TREE 2015-09-22 16:46:47 -07:00
Jordan Lund dfa1f73b98 Bug 1206106 - Create a java tarball that works on CentOS 6, r=dustin 2015-09-22 14:24:09 -07:00