32112 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
7fc565c303 Merge mozilla-central to fx-team 2015-11-25 13:59:23 +01:00
Carsten "Tomcat" Book
1edd1500db merge mozilla-inbound to mozilla-central a=merge 2015-11-25 12:51:53 +01:00
Jared Wein
d464a0a985 Bug 1227717 - Tweak the margin-end on the gear button on Windows to better align with the alert close button. r=MattN
--HG--
extra : rebase_source : 1789a4c9cbb5a4e501b6eef293e7db2e9b67ae30
2015-11-24 20:07:56 -05:00
Wes Kocher
28cb6089db Merge m-c to fx-team, a=merge
--HG--
extra : commitid : 86BszxSMu06
2015-11-24 16:56:56 -08:00
Wes Kocher
d04352af5d Merge fx-team to central, a=merge
--HG--
extra : commitid : GWsEhTdRTPF
2015-11-24 16:33:15 -08:00
Wes Kocher
bee783ac06 Merge inbound to m-c a=merge
--HG--
extra : commitid : C5ZGJHM8FSu
2015-11-24 13:54:06 -08:00
Tooru Fujisawa
9ac197b45d Bug 1226936 - Part 2: Update Histograms.json description to follow jscompartment.h. r=bsmedberg
--HG--
extra : rebase_source : 2914bfa0317a95b0e4aec100c486e254ca047f4f
2015-11-24 23:19:04 +09:00
Hector Zhao
c2ba6eaea5 Bug 1227428 - Update partner section with correct information once available. r=gfritzsche 2015-11-24 16:18:03 +08:00
Kris Maglione
3b218341fa Bug 1208761: [webext] Support l10n.getMessage in content scripts. r=billm
--HG--
extra : commitid : Iuj6mzu3KIU
extra : rebase_source : 08612b809866cf35057dc690bdf62dd74a330b46
2015-11-23 17:52:23 -08:00
Jim Chen
3f2aedd313 Bug 1221270 - Let AddonUpdateService use AddonManagerPrivate to check for updates; r=mfinkle
The Android-specific AddonUpdateService has a bit of redundant code
because AddonManagerPrivate has a backgroundUpdateCheck method that does
a lot of the same thing. This patch makes AddonUpdateService call that
method so there's less code and more consistency.

This requires flipping the "extensions.update.enabled" pref, which was
disabled in bug 528588 for showing the XUL addon update dialog. I don't
think this is relevant anymore in native Fennec and with the later
rewrite of AddonManager, so I'm fairly certain it's okay to flip that
pref.

The patch also disables the AddonManager update timer because we have
our own update timer on Android.
2015-11-23 23:31:49 -05:00
Felipe Gomes
e94f5becc6 Bug 1226487 - Allow e10s to run on Beta. r=mconley 2015-11-23 23:59:47 -02:00
Kris Maglione
9e04ae1c2d Bug 1209184: Part 1a - [webext] Make localization work in content processes. r=billm
--HG--
extra : commitid : ABk7hGXVH2U
extra : rebase_source : 20b78132b0ec5e3cc2c3e33b142593c7e8574fcf
2015-11-21 12:07:14 -08:00
Kris Maglione
74af7d53bc Bug 1226423: [webext] Add tests for API injection into background pages. r=billm
--HG--
extra : commitid : 70rSfBGK8XG
extra : rebase_source : 829a3f270e89f4a64262a5e5f4f5499ed3251424
2015-11-20 15:14:25 -08:00
Kris Maglione
e826fe671b Bug 1226423: Don't inject WebExtension APIs into documents without WebExtension principals. r=billm
--HG--
extra : commitid : L1KjekH6dHI
extra : rebase_source : b4acb2ab011c175b6316793da4a99da2ee4de660
2015-11-20 15:09:28 -08:00
J. Ryan Stinnett
5dfb0fb402 Bug 1226661 - DevTools client JSM global tweak for B2G. r=ochameau 2015-11-23 18:10:11 -06:00
Mark Banner
fbca33b0b0 Bug 1227138 - Fix browser_AddonWatcher not to fail if system add-ons are present. r=Mossop 2015-11-23 19:45:24 +00:00
Carsten "Tomcat" Book
5f1ac1afb3 merge mozilla-inbound to mozilla-central a=merge 2015-11-23 14:08:50 +01:00
Andreas Wagner
9b54d50fea Bug 1195256 - preferences: Align question mark to the header of the pane, r=gijs
--HG--
extra : commitid : BqAw6PW94ip
2015-11-24 09:14:46 +00:00
Carsten "Tomcat" Book
e0d8a174d7 Backed out changeset 098f2c2291ef (bug 634063) for causing merge conflicts when merging to mozilla-central
--HG--
extra : rebase_source : 16ae5b7fb5fb67d9900a17c4a9d1cc76b4110aec
2015-11-24 16:56:32 +01:00
Carsten "Tomcat" Book
4478aaa8da Merge mozilla-central to b2g-inbound 2015-11-25 14:00:32 +01:00
Johann Hofmann
75a90ffc8e Bug 1200674 - Allow flexible icon sizes in ExtensionUtils. r=dtownsend 2015-11-24 18:20:26 +01:00
David Rajchenbach-Teller
a775946746 Bug 1216972 - OS.File AsyncShutdown for content processes. r=froydnj
--HG--
extra : amend_source : 3c491f00ff06c12c710eefcd29fd0b6975bc07f7
extra : transplant_source : %95%E6%5Bet%5E%88%A57%1E%A2N%82%EE%8C%D6%C7X%B2%1D
2015-11-19 00:11:14 +01:00
David Rajchenbach-Teller
59aae33ad8 Bug 1216972 - AsyncShutdown for content processes. r=froydnj
--HG--
extra : transplant_source : %16t_%0C%DC%B3I%CB%03GL%DD%10%BA%20%FA%E9q%97%C3
2015-11-19 00:09:58 +01:00
jignesh
8095302fd7 Bug 1216704 - [webext] Fix incorrect parameter to getManifest in content scripts and test for the same. r=billm 2015-11-18 12:36:00 +01:00
Wes Kocher
3236d241db Merge m-c to fx-team, a=merge
--HG--
extra : commitid : 3hKx4ECzupv
2015-11-20 14:45:33 -08:00
Wes Kocher
fbb52f9651 Merge fx-team to central, a=merge
--HG--
extra : commitid : KwOnWVSJFTU
2015-11-20 14:41:45 -08:00
Gijs Kruitbosch
161662dac8 Bug 1191468 - always load app dir add-ons irrespective of enabledScopes, r=Mossop,froydnj
--HG--
extra : commitid : 4O0JNbchonb
extra : rebase_source : f218722dd70f74a45e4dbb461a7faaa3ef1d1d81
extra : amend_source : 538b86815da89ccf5b3e7e42412019064123ccfe
2015-11-17 13:55:31 +00:00
Matt Brubeck
575c52edc2 Bug 967982 - Show findbar after unsuccessful Find Again [r=mikedeboer] 2015-11-19 13:49:48 -08:00
Carsten "Tomcat" Book
ae43aac96a Merge mozilla-central to mozilla-inbound 2015-12-01 15:27:23 +01:00
Gian-Carlo Pascutto
125704b36a Bug 1229051 - Reenable C++ unit tests for UrlClassifier by converting to gtest. r=francois
--HG--
rename : toolkit/components/url-classifier/tests/TestUrlClassifierUtils.cpp => toolkit/components/url-classifier/tests/gtest/TestUrlClassifierUtils.cpp
2015-12-01 11:04:25 +01:00
Jan Varga
38ee7f95d8 Bug 961049 - Part 4: QuotaManager on PBackground core changes; r=baku
--HG--
rename : dom/quota/QuotaManager.cpp => dom/quota/ActorsParent.cpp
rename : dom/quota/nsIUsageCallback.idl => dom/quota/nsIQuotaCallbacks.idl
rename : dom/quota/nsIQuotaManager.idl => dom/quota/nsIQuotaManagerService.idl
rename : dom/quota/nsIQuotaRequest.idl => dom/quota/nsIQuotaRequests.idl
2015-11-22 10:43:55 +01:00
Kartikaya Gupta
c595c834db Bug 1221694 - Add a basic telemetry probe for checkerboarding. r=botond,vladan
--HG--
extra : commitid : LkGcnQbivKT
2015-11-20 23:25:37 -05:00
Francois Marier
f6fd256206 Bug 1216723 - Add tests for the new -forbid- Safe Browsing list type. r=gcp 2015-11-20 20:25:11 -08:00
Francois Marier
67506f65a6 Bug 1216723 - Add a new -forbid- Safe Browsing list type. r=gcp,r=smaug 2015-11-20 20:24:50 -08:00
Wes Kocher
a02a3f64d5 Merge m-c to inbound, a=merge
--HG--
extra : commitid : 7agHgfFx0Vv
2015-11-20 14:44:04 -08:00
Kris Maglione
6713ba9ac7 Bug 1192435: Support updates for WebExtensions. r=Mossop
--HG--
extra : commitid : 2NZYNYBpFs4
extra : rebase_source : 06a5d6fe9b91872f31f17323766e74fc4dc24646
2015-11-17 16:23:15 -08:00
Robert Helmer
e339903d0b Bug 1209341 - allow loading unsigned restartless add-ons at runtime. r=mossop
--HG--
extra : transplant_source : %9EhX%F7%9D%AE%F5%14%18%E6%3B%A7%D3w%E3%3B%CAl%27%05
2015-11-03 10:07:08 -08:00
Yoshi Huang
4b500464f5 Bug 1209162 - Create OriginAttributes subtypes. IGNORE IDL r=sicking. 2015-11-03 09:50:54 +08:00
Phil Ringnalda
53745073f0 Back out 13 changesets (bug 1170760) for Gu bustage in homescreen/test/unit/apps_test.js
CLOSED TREE

Backed out changeset 5d84599a8846 (bug 1170760)
Backed out changeset 6104fe33d5f5 (bug 1170760)
Backed out changeset 1dfb229da01d (bug 1170760)
Backed out changeset f380faddfdd8 (bug 1170760)
Backed out changeset 541831dc6b57 (bug 1170760)
Backed out changeset 6a5b7dfab882 (bug 1170760)
Backed out changeset ee514a256922 (bug 1170760)
Backed out changeset 3c2c1acc34ee (bug 1170760)
Backed out changeset dc2a7f5dc5d6 (bug 1170760)
Backed out changeset b312a08fbab5 (bug 1170760)
Backed out changeset cb6aba9b8497 (bug 1170760)
Backed out changeset 39e4f5b1ba40 (bug 1170760)
Backed out changeset 7d79cce3630a (bug 1170760)
2015-11-25 21:02:55 -08:00
Mike Hommey
0cc838448f Backout changeset 0104f1c911ca (bug 1223530) because it breaks running on Windows XP on a CLOSED TREE
--HG--
rename : toolkit/components/maintenanceservice/Makefile.in => xpcom/windbgdlg/Makefile.in
2015-11-26 08:38:16 +09:00
Boris Zbarsky
93faa5b1b0 Bug 1170760 part 10. Add subclassing support to Promise::Resolve. r=baku,efaust 2015-11-25 15:48:09 -05:00
Ted Mielczarek
879065de9d bug 1223530 - Move MOZ_WINCONSOLE to configure. r=glandium
This patch moves the logic for selecting MOZ_WINCONSOLE out of individual
Makefile.in files and into configure. It also changes config.mk to only
pass -SUBSYSTEM:CONSOLE if MOZ_WINCONSOLE=1. The MSDN docs state that
in the absence of -SUBSYSTEM, the linker will select the proper subsystem
based on whether the program contains [w]main or [w]WinMain, so let it
do that.

One program (windbgdlg) needed a tweak to add a wmain for when MOZ_WINCONSOLE
is defined.

This patch leaves one instance in security/sandbox/win/wow_helper/Makefile.in,
that Makefile has its own separate bug.

--HG--
extra : commitid : 8acDjmfKivj
extra : rebase_source : 03b4fa4c8ae077a894b08f3762ef93541e34ac1a
2015-11-11 06:24:39 -05:00
Ted Mielczarek
8b765abfbe bug 1224308 - Remove some Makefile cruft. r=gps
--HG--
extra : commitid : JdDnpW7zfHf
extra : rebase_source : 9eca8f978c43eb6f26c8d14d5d13fee5ea556a02
2015-11-12 06:39:11 -05:00
Mike Conley
1d12b0b6ba Bug 1220929 - Add test for RemotePage's portsForBrowser. r=Mossop
--HG--
extra : commitid : Ihne6zL4EkU
extra : rebase_source : d3baa7fb7503e97c24019878322cdd7e334a36d9
2015-11-05 10:43:09 -05:00
Mike Conley
77e74077e5 Bug 1220929 - RemotePageManager should let us get all ports for a browser. r=Mossop
--HG--
extra : commitid : KskXZGLHVfM
extra : rebase_source : ac92a506356bbb7a61a3b3dd8b9e7f4d107cfb2d
2015-11-02 16:03:00 -05:00
Mike Conley
ae38391972 Bug 1220929 - RemotePageManager should use documentURI and allow special URLs with query params. r=Mossop
--HG--
extra : commitid : 9RNSIkfV0gx
extra : rebase_source : d0e6f112efba1d42936fc785b098a0f8217fbbaf
extra : amend_source : 1ce76fc0b6eb47a3dc189c38ee9acb6e8451ce4e
extra : histedit_source : ea64f6ecb938c791a43465d1b401491c569e7ffc
2015-11-02 20:46:37 -05:00
Mark Finkle
0ae71e6ba8 Bug 1223526 - Create an empty theme for mobile/native UI r=margaret,mossop,gbrown 2015-11-20 12:03:01 -05:00
Aaron Klotz
9162a0feda Bug 1218473: Add check for presence of NVIDIA Optimus drivers to WindowsNopSpacePatcher; r=ehsan
--HG--
extra : rebase_source : f179d1f950faccf71415c9a694160bc65d014fbb
2015-11-27 13:01:23 -07:00
Christoph Kerschbaumer
d89b2a6a22 Bug 1225362 - Use channel.asyncOpen2 in toolkit/components/search/nsSearchService.js (r=sicking) 2015-11-30 20:27:05 -08:00
Christoph Kerschbaumer
8110e391b7 Bug 1225361 - Use channel.asyncOpen2 in toolkit/components/places/tests/test_bug_411966.html (r=sicking) 2015-11-30 20:26:19 -08:00