Commit Graph

429459 Commits

Author SHA1 Message Date
Ryan VanderMeulen
edce9d010f Merge inbound to m-c. a=merge
CLOSED TREE
2015-07-08 14:33:24 -04:00
Ryan VanderMeulen
778701a365 Merge b2g-inbound to m-c. a=merge 2015-07-08 14:28:54 -04:00
Ryan VanderMeulen
90ee335b6e Merge fx-team to m-c. a=merge 2015-07-08 14:21:12 -04:00
Jordan Lund
45e0930c05 Bug 1154796 - update gecko tree copy of Mozharness to 43f7600b8c80, CLOSED TREE r=mshal 2015-07-08 10:44:58 -07:00
lazyparser
18e38bbcc9 Bug 1181581 - Fix some typos in comments. r=jandem
CLOSED TREE
2015-07-08 09:13:00 -04:00
Carsten "Tomcat" Book
78ef46b67d Backed out changeset 12536dbd1274 (bug 834830) for various test bustage on a CLOSED TREE 2015-07-08 15:29:27 +02:00
Carsten "Tomcat" Book
57d4c559b2 Backed out changeset 53a5746425f9 (bug 834830) 2015-07-08 15:28:35 +02:00
Ryan VanderMeulen
b2cec37c35 Bug 1181533 - Add nsCRTGlue.h and prtime.h includes to nsDownloadManager.cpp to fix --disable-safe-browsing build bustage. r=froydnj
CLOSED TREE
2015-07-08 09:07:00 -04:00
Carsten "Tomcat" Book
ca5594cb83 merge mozilla-inbound to mozilla-central a=merge 2015-07-08 11:44:32 +02:00
Carsten "Tomcat" Book
958900994a merge fx-team to mozilla-central a=merge 2015-07-08 11:30:06 +02:00
Jocelyn Liu
539e9fd925 Bug 1170071 - Part 4: Add Gatt server interfaces for Bluetooth daemon. r=shuang
CLOSED TREE
2015-07-08 04:34:00 -04:00
Jocelyn Liu
9fc0663fab Bug 1170071 - Part 3: Add gatt server support to GATT module for Bluetooth daemon. r=shuang 2015-07-08 04:33:00 -04:00
Jocelyn Liu
a1b39d5a02 Bug 1170071 - Part 2: Add helpers for Bluetooth daemon GATT server support. r=shuang 2015-07-08 04:31:00 -04:00
Jocelyn Liu
ba11710dae Bug 1170071 - Part 1: Revise BluetoothGattInterface, result handler, and interface helper for daemon support of gatt server. r=shuang 2015-07-08 04:30:00 -04:00
B2G Bumper Bot
b4fbb5b42d Bumping manifests a=b2g-bump 2015-07-08 04:37:33 -07:00
B2G Bumper Bot
1785914f1e Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/40fc25355c43
Author: Borja Salguero <borjasalguero@users.noreply.github.com>
Desc: Merge pull request #30771 from jpruden92/bug1175815-contacts

 Bug 1175815 - [Contacts][NGA] Remove 'curtainFrame' dependency when matching

========

https://hg.mozilla.org/integration/gaia-central/rev/a0dee44de4e8
Author: jpruden92 <jorgepruden@gmail.com>
Desc: Bug 1175815 - [Contacts][NGA] Remove 'curtainFrame' dependency when matching
2015-07-08 04:35:34 -07:00
B2G Bumper Bot
c9dadecb96 Bumping manifests a=b2g-bump 2015-07-08 03:47:07 -07:00
B2G Bumper Bot
a5fb25c051 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ff65a03ad65c
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #30861 from etiennesegonzac/bug-1180961

Bug 1180961 - Prevent a race condition when an edge gesture is commited while we're going home r=albertopq

========

https://hg.mozilla.org/integration/gaia-central/rev/7dc421a4dea6
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1180961 - Prevent a race condition when an edge gesture is commited while we're going home r=albertopq
2015-07-08 03:45:06 -07:00
B2G Bumper Bot
14ba0e25ab Bumping manifests a=b2g-bump 2015-07-08 03:23:43 -07:00
Carsten "Tomcat" Book
52964885b1 Merge mozilla-central to b2g-inbound 2015-07-08 12:12:07 +02:00
B2G Bumper Bot
cb256e0c6f Bumping manifests a=b2g-bump 2015-07-08 02:37:34 -07:00
B2G Bumper Bot
9ee8138b74 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/80553d0e2d3e
Author: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Desc: Merge pull request #30858 from azasypkin/bug-1179705-update-threads-js

Bug 1179705 - [Messages][NGA] Upgrade to latest version of threads.js. r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/22d53ce32333
Author: Aleh Zasypkin <azasypkin@mozilla.com>
Desc: Bug 1179705 - [Messages][NGA] Upgrade to latest version of threads.js. r=julien
2015-07-08 02:35:34 -07:00
B2G Bumper Bot
ab614eb720 Bumping manifests a=b2g-bump 2015-07-08 01:14:49 -07:00
B2G Bumper Bot
81b7d06780 Bumping manifests a=b2g-bump 2015-07-07 23:22:32 -07:00
B2G Bumper Bot
9b7312a17a Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/745def0504a8
Author: steveck-chung <schung@mozilla.com>
Desc: Merge pull request #30855 from steveck-chung/message-ignore-draft-timestamp

Bug 958105 - [Messages][Drafts] Creating a draft should not change the thread's timestamp, r=julienw

========

https://hg.mozilla.org/integration/gaia-central/rev/7ee3801345d4
Author: steveck-chung <schung@mozilla.com>
Desc: Bug 958105 - [Messages][Drafts] Creating a draft should not change the thread's timestamp, r=julienw
2015-07-07 23:20:33 -07:00
Phil Ringnalda
c9fbc08188 Back out 3 changesets (bug 1166048) for test_sourcemaps-06.js failures
Backed out changeset 171d7785a4b7 (bug 1166048)
Backed out changeset 70d1222d4c9c (bug 1166048)
Backed out changeset 5047dd91ab56 (bug 1166048)
2015-07-07 22:31:18 -07:00
Chris Pearce
e811a7d2e6 Bug 1181436 - Use 'gmp-api/' prefix consistently in includes in gmp-clearkey. r=gerald 2015-07-08 17:12:47 +12:00
Markus Stange
58390fd516 Bug 599328 - Clicking a label shouldn't draw a focus ring if clicking the control wouldn't have. r=enndeakin 2015-07-08 00:46:48 -04:00
Kyle Machulis
23445a5b80 Bug 1176300 - Add soundtouch factory functions for DLL memory handling on windows; r=padenot 2015-07-07 21:17:09 -07:00
Kyle Machulis
793be989a7 Bug 1176300 - Update libsoundtouch to patched r222; r=padenot 2015-07-07 21:17:09 -07:00
Kyle Machulis
59edeb16c7 Bug 1176300 - Move libsoundtouch to lgpllibs; r=glandium 2015-07-07 21:17:09 -07:00
Kyle Machulis
8058218a2d Bug 1176300 - Add lgpllibs library to build system; r=glandium 2015-07-07 21:17:08 -07:00
Daniel Holbert
08e61a1e4e Bug 1158561 followup: Add 'override' annotations to overriding methods added in this bug: Callback(), SitesWithData(), RecvReturnClearSiteData(), & RecvReturnSitesWithData(). rs=ehsan 2015-07-07 21:10:32 -07:00
Phil Ringnalda
a85e6c4091 Back out 694521589eb0 (bug 1177271) for leaking
CLOSED TREE
2015-07-07 21:08:19 -07:00
Marcos Caceres
9424ebb117 Bug 1171200 - Add means of checking if a document links to a manifest. r=billm.
---
 dom/ipc/manifestMessages.js                        | 166 +++++++++-----------
 ...ObjectProcessor.js => ImageObjectProcessor.jsm} |   0
 dom/manifest/ManifestFinder.jsm                    |  58 +++++++
 dom/manifest/ManifestObtainer.js                   |  92 -----------
 dom/manifest/ManifestObtainer.jsm                  | 170 +++++++++++++++++++++
 ...{ManifestProcessor.js => ManifestProcessor.jsm} |  18 +--
 .../{ValueExtractor.js => ValueExtractor.jsm}      |   4 +-
 dom/manifest/WebManifest.jsm                       |  19 ---
 dom/manifest/moz.build                             |  10 +-
 dom/manifest/test/browser.ini                      |   3 +-
 .../test/browser_ManifestObtainer_obtain.js        |   2 +-
 dom/manifest/test/browser_hasManifestLink.js       | 109 +++++++++++++
 dom/manifest/test/common.js                        |   4 +-
 dom/security/test/csp/browser_test_web_manifest.js |  12 +-
 .../csp/browser_test_web_manifest_mixed_content.js |  10 +-
 toolkit/modules/PromiseMessage.jsm                 |  36 +++++
 toolkit/modules/moz.build                          |   1 +
 17 files changed, 467 insertions(+), 247 deletions(-)
 rename dom/manifest/{ImageObjectProcessor.js => ImageObjectProcessor.jsm} (100%)
 create mode 100644 dom/manifest/ManifestFinder.jsm
 delete mode 100644 dom/manifest/ManifestObtainer.js
 create mode 100644 dom/manifest/ManifestObtainer.jsm
 rename dom/manifest/{ManifestProcessor.js => ManifestProcessor.jsm} (95%)
 rename dom/manifest/{ValueExtractor.js => ValueExtractor.jsm} (96%)
 delete mode 100644 dom/manifest/WebManifest.jsm
 create mode 100644 dom/manifest/test/browser_hasManifestLink.js
 create mode 100644 toolkit/modules/PromiseMessage.jsm

--HG--
rename : dom/manifest/ImageObjectProcessor.js => dom/manifest/ImageObjectProcessor.jsm
rename : dom/manifest/ManifestProcessor.js => dom/manifest/ManifestProcessor.jsm
rename : dom/manifest/ValueExtractor.js => dom/manifest/ValueExtractor.jsm
2015-07-08 13:26:32 +10:00
Nick Fitzgerald
545e3c0749 Bug 1166048 - Part 2: Add a test that we can load the contents of every source mapped source produced by babel and browserify; r=jlongster 2015-07-07 19:52:58 -07:00
Nick Fitzgerald
9aeee506de Bug 1166048 - Part 1: Do not set the sourceRoot of a source map that has all source contents embedded; r=jlongster 2015-07-07 19:52:58 -07:00
Nick Fitzgerald
20f60b28d4 Bug 1166048 - Part 0: Upgrade the tree's copy of the mozilla/source-map library; r=jlongster 2015-07-07 19:52:58 -07:00
B2G Bumper Bot
8d32cc0aa4 Bumping manifests a=b2g-bump 2015-07-07 19:15:51 -07:00
B2G Bumper Bot
1bf021ce81 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0f653f6e0c52
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30851 from KevinGrandon/bug_1180992_service_worker_panel_gaia_switch

Bug 1180992 - Use gaia-switch for service worker panel

========

https://hg.mozilla.org/integration/gaia-central/rev/deb3c8db3ebf
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1180992 - Use gaia-switch for service worker panel

========

https://hg.mozilla.org/integration/gaia-central/rev/c0e861ec44f7
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #30830 from KevinGrandon/bug_1180534_developer_hud_controls

Bug 1180534 - Convert developer HUD controls to web components

========

https://hg.mozilla.org/integration/gaia-central/rev/fd640da82ae1
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1180534 - Convert developer HUD controls to web components
2015-07-07 19:13:31 -07:00
B2G Bumper Bot
14dd4ad8c9 Bumping manifests a=b2g-bump 2015-07-07 18:54:35 -07:00
Michael Layzell
b29fa273f8 Bug 1034922 - Make nsSiteWindow's destructor private, and expose it to nsContentTreeOwner via friend class. r=Enn
CLOSED TREE

--HG--
extra : amend_source : 5420ac9e6296b98f4ec5ddf5b8992cf449e8d44f
2015-07-07 21:49:00 -04:00
Wes Kocher
7ea9702733 Merge m-c to fx-team, a=merge 2015-07-07 16:39:39 -07:00
Wes Kocher
280d763cb4 Merge m-c to b2ginbound, a=merge 2015-07-07 16:39:19 -07:00
Wes Kocher
0246d86e61 Merge inbound to central, a=merge 2015-07-07 16:37:07 -07:00
Wes Kocher
cea4cec9a2 Merge fx-team to central, a=merge 2015-07-07 16:18:51 -07:00
Jared Wein
9c5419f522 Bug 1180801 - Replace setDefaultBrowser and isDefaultBrowser with getConfiguration/setConfiguration options. r=MattN 2015-07-07 18:19:33 -04:00
Marco Bonardo
2cf2209515 Bug 1180375 - Avoid the url prediction query in UnifiedComplete. r=adw 2015-07-07 23:12:22 +02:00
Wes Kocher
9faed39f11 Backed out changeset b822456c6e2f (bug 1175714) for mass assertion failures on a CLOSED TREE 2015-07-07 12:31:40 -07:00
Wes Kocher
e539211474 Backed out changeset 35aee276e08f (bug 1179685) for wpt failures CLOSED TREE 2015-07-07 12:29:21 -07:00