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

416901 Коммитов

Автор SHA1 Сообщение Дата
Ehsan Akhgari bbbc7baec8 Bug 1149987 - Part 8: Do not store or match Response objects with a Vary:* header; r=bkelly 2015-04-15 15:55:51 -04:00
Ehsan Akhgari 643ab9ca43 Bug 1149987 - Part 7: Send the full ErrorResult in the AddAllResponse IPC message; r=bkelly
This is needed so that we can throw a TypeError from
FetchPut::FetchComplete.  In order to be able to do this, we need to
store the entire ErrorResult in the FetchPut object and deliver it to
the other side.
2015-04-15 15:55:39 -04:00
Ehsan Akhgari f56fe99956 Bug 1149987 - Part 6: Release the FetchPut object on the right thread in FetchObserver::OnResponseEnd(); r=bkelly 2015-04-15 15:55:28 -04:00
Ehsan Akhgari 402e7e602a Bug 1149987 - Part 5: Hold a kungfu death grip in FetchPut::MaybeNotifyListener; r=bkelly 2015-04-15 15:55:16 -04:00
Ehsan Akhgari 5d5a053562 Bug 1149987 - Part 4: Do not attempt to delete ErrorResult::mMessage when deserializing the object from IPDL; r=bzbarsky
In opt builds, we do not initialize mMessage, so the null check is going
to be ineffective to test whether mMessage has a value that we should
delete.  But in IPDL, the ParamTraits Read method is only called with
freshly allocated objects, so we don't need to free anything here.
In order to be safe and ensure that we don't leak this memory, this
patch adds a number of assertions to check whether mMessage is
indeed only initialized where we expect it to.
2015-04-15 15:55:01 -04:00
Ryan VanderMeulen f4d90a3b7a Merge m-c to inbound. a=merge 2015-04-15 15:34:40 -04:00
Ryan VanderMeulen 22018c1631 Bug 1123563 - Remove extra space that was accidentally added. a=bustage 2015-04-15 15:33:19 -04:00
Ryan VanderMeulen 3ebfa611d7 Merge m-c to inbound. a=merge
IGNORE IDL

--HG--
extra : amend_source : 778e98f1365079cf61c444c6e9b3114e069c5b7b
2015-04-15 15:15:32 -04:00
Ryan VanderMeulen d65cb1db7a Merge fx-team to m-c. a=merge
IGNORE IDL CHANGES

--HG--
extra : amend_source : 1ae4b480ab28633bef90e05797089fb8cdbf3889
2015-04-15 15:10:44 -04:00
James Graham 3c62ff5797 Bug 1154761 - Disable crash dialogs that interfere with debugging in mozrunner, r=ted 2015-04-15 20:06:55 +01:00
Ryan VanderMeulen bda75266f8 Merge inbound to m-c. a=merge 2015-04-15 14:52:15 -04:00
Ryan VanderMeulen 538d531c99 Merge b2g-inbound to m-c. a=merge 2015-04-15 14:50:48 -04:00
Ryan VanderMeulen 12b90de11b Bug 1123563 - Annotate test-animated-image-layers.html and test-animated-image-layers-background.html as random on Android and Linux. 2015-04-15 14:45:05 -04:00
Ryan VanderMeulen 1686b9d83b Bug 1092202 - Skip testGetUserMedia for frequent failures. 2015-04-15 14:39:02 -04:00
Ryan VanderMeulen 5615c15366 Bug 1097721 - Skip test_mozaudiochannel.html on OSX 10.6 due to intermittent crashes. 2015-04-15 14:35:59 -04:00
Ryan VanderMeulen 7501681b86 Bug 1021174 - Skip test_bug495145.html on OSX 10.6 due to intermittent crashes. 2015-04-15 14:35:58 -04:00
Ryan VanderMeulen d7aa41835d Bug 847903 - Skip 691096-1.html on OSX 10.6 due to intermittent crashes. 2015-04-15 14:35:58 -04:00
B2G Bumper Bot d17c8e5d6b Bumping manifests a=b2g-bump 2015-04-15 11:12:56 -07:00
B2G Bumper Bot fed5cd4d49 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/71d98e4d750c
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1153445 - merge pull request #29512 from sfoster:homescreen-rtl-labels-bug-1153445 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/ff6e0c9436b9
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1153445 - Icon labels shouls be dir=auto. r=kgrandon
2015-04-15 11:10:21 -07:00
David Anderson 2b209e0cb6 Fix wheel events being misrouted in APZ-less widgets when APZ is enabled. (bug 1154734, r=kats)
--HG--
extra : rebase_source : 264f089cb888d806cfaf4bee93b0a5cd0e65c477
2015-04-15 12:28:47 -04:00
B2G Bumper Bot 69b1004b48 Bumping manifests a=b2g-bump 2015-04-15 09:20:00 -07:00
B2G Bumper Bot 6853bff3a1 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1989e8286330
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152772 - merge pull request #29508 from KevinGrandon:bug_1152772_downloaded_event_role to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/0749322a9213
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1152772 - [Search] Wait until downloadapplied to filter hidden roles
2015-04-15 09:17:49 -07:00
Martijn Wargers e096ca96f0 Bug 970728 - Disable test_bug344861.html on b2g because popup window sizing doesn't work well there. r=RyanVM 2015-04-15 17:47:34 +02:00
Kartikaya Gupta aec78d5467 Bug 1154614 - Don't try to pick up the same non-reentrant lock twice. r=dvander a=RyanVM 2015-04-15 12:49:28 -04:00
Robert Strong 5905715bf2 Bug 1154603 - useless defined(ANDROID) in nsUpdateDriver.cpp. r=spohl 2015-04-15 08:45:49 -07:00
Robert Strong f3f5c3e99f Bug 1154591 - getCanStageUpdates has incorrect checks for Windows and B2G. r=bbondy, r=spohl 2015-04-15 08:44:48 -07:00
Carsten "Tomcat" Book 6fc008ccfc Backed out changeset 145f6347bb11 (bug 1137285) depending on the backout of bug 1145049
--HG--
extra : rebase_source : 3910ece62d2aafe466ce3aff65ebd164052d11cf
2015-04-15 17:24:06 +02:00
Carsten "Tomcat" Book 26799a7307 Backed out changeset 120d272971a6 (bug 1137285)
--HG--
extra : rebase_source : 890cba751909152d0e7d7f51db43c10672831d6e
2015-04-15 17:23:18 +02:00
Carsten "Tomcat" Book bad3cd3153 Backed out changeset 998c4e53c1f8 (bug 1137285)
--HG--
extra : rebase_source : 9bad5a7e2d54257b22e290a4d3a354454d9002ea
2015-04-15 17:23:14 +02:00
Carsten "Tomcat" Book 2c95d28b6b Backed out changeset 3570dbae06e2 (bug 1137285)
--HG--
extra : rebase_source : 1f3f448a438812c7e5810ebc8d735755936fdb72
2015-04-15 17:23:10 +02:00
Brian Grinstead e1f2963567 Bug 1149346 - DevTools sourceeditor: make selection of an autocomplete item include the full text of the item;r=pbrosset
Previously, there was a case where typing 'a' and then selecting '#about' would
end up with 'about' in the editor.  The selection wasn't taking this situation
into account, so now if the prefix of the autocomplete item contains the entire
text of the line, then replace the first part of the line with the item
2015-04-15 08:15:22 -07:00
Patrick Brosset 4ae0fca079 Bug 1149346 - First word in selector-search also matches classes and ids; r=harth 2015-04-15 08:15:20 -07:00
Brian Grinstead 0511749b55 Bug 969914 - Make developer toolbar match the light devtools theme when applied;r=jwalker,r=pbrosset 2015-04-15 08:12:49 -07:00
Ryan VanderMeulen b8bfa41dd9 Merge m-c to fx-team. a=merge 2015-04-15 11:09:13 -04:00
Ryan VanderMeulen 47673d1444 Merge m-c to b2g-inbound. a=merge 2015-04-15 11:07:45 -04:00
Ryan VanderMeulen 5d36f17a50 Bug 1154434 - Bump mozharness.json to revision 4567c42063b7. a=me 2015-04-15 11:03:41 -04:00
B2G Bumper Bot 81817081e6 Bumping manifests a=b2g-bump 2015-04-15 07:22:19 -07:00
B2G Bumper Bot 41e9a9030c Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/0ecde425b576
Author: Greg Weng <snowmantw@gmail.com>
Desc: Revert "Merge pull request #28584 from snowmantw/bug1138799"

This reverts commit 8b899668a5ef6effcd8b2bd84eea5c1450a3f207, reversing
changes made to db200d75c9fa50b78de6f448e234f9bfc6feb9c9.
2015-04-15 07:20:09 -07:00
Carsten "Tomcat" Book 357fe2f6b4 Merge mozilla-central to b2g-inbound 2015-04-15 15:11:39 +02:00
Carsten "Tomcat" Book 40ae721556 merge mozilla-inbound to mozilla-central a=merge 2015-04-15 14:28:05 +02:00
B2G Bumper Bot f73bac9545 Bumping manifests a=b2g-bump 2015-04-15 04:32:28 -07:00
B2G Bumper Bot 2df5935628 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d692267ff838
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152675 - merge pull request #29419 from ian-liu:bluetooth/bug1152675_btv2_JS_error_while_goes_into_Bluetooth_panel to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/c09674460d39
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 1152675 - Bluetooth v2, JS error while goes into settings::bluetooth panel, r=arthur
2015-04-15 04:30:16 -07:00
B2G Bumper Bot 7bb2153c36 Bumping manifests a=b2g-bump 2015-04-15 03:42:48 -07:00
B2G Bumper Bot e689b8a386 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/54a9866e1de2
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1152938 - merge pull request #29453 from albertopq:1152938-rocketbar-sim to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/f91849f78e80
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1152938 - Preventing rocketbar when search input is not visible

========

https://hg.mozilla.org/integration/gaia-central/rev/69c424997207
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1149443 - merge pull request #29514 from crh0716:1149443 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/94665883df49
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1149443 - Add missing attribute for multiple buttons
2015-04-15 03:40:14 -07:00
Carsten "Tomcat" Book 07bcc385b7 merge fx-team to mozilla-central a=merge 2015-04-15 12:36:46 +02:00
Thomas Zimmermann e270538a95 Bug 1153796: Update CLOBBER, r=btian
The patch set renames and removes source files, which requires a cleanup
of the file dependencies. The corresponding build-system bug is 1154232.
2015-04-15 11:46:33 +02:00
Thomas Zimmermann 8b16914471 Bug 1153796: Share BluetoothInterfaceHelpers.{cpp,h} between Bluetooth v1 and v2, r=btian
The v1 implementation of BluetoothInterfaceHelpers.{cpp,h} is more
up-to-date than the v2 variant. So we can just use the v1 version and
remove the v2 version entirely. Bluetooth v2 contains its own version
of |Convert(nsresult, BluetoothStatus)|, which has been removed in
favor of the shared implementation.

--HG--
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.cpp => dom/bluetooth/BluetoothInterfaceHelpers.cpp
rename : dom/bluetooth/bluetooth1/BluetoothInterfaceHelpers.h => dom/bluetooth/BluetoothInterfaceHelpers.h
2015-04-15 11:46:33 +02:00
Thomas Zimmermann 25c352176c Bug 1153796: Share BluetoothInterface.{cpp,h} between Bluetooth v1 and v2, r=btian
With this patch, Bluetooth v1 and v2 share the same interfaces classes
for their backend code. Bluetooth v1 doesn't yet support GATT, so the
GATT interfaces are still not implemented.

The patch also fixes the GATT-specific classes to compile under recent GCC
versions 4.8 and later, which are used with Android L.

The patch also preserves the prefered backend for each version. Bluetooth
v1 defaults to 'bluetoothd,' v2 defaults to 'bluedroid.'
2015-04-15 11:46:33 +02:00
Thomas Zimmermann c3608191ca Bug 1153796: Move dom/bluetooth/bluetooth2/BluetoothInterface.{cpp,h} to dom/bluetooth, r=btian
--HG--
rename : dom/bluetooth/bluetooth2/BluetoothInterface.cpp => dom/bluetooth/BluetoothInterface.cpp
rename : dom/bluetooth/bluetooth2/BluetoothInterface.h => dom/bluetooth/BluetoothInterface.h
2015-04-15 11:46:33 +02:00
Thomas Zimmermann af21064b9c Bug 1153796: Unify variants of |BluetoothInterface::SspReply|, r=btian
Bluetooth use different types for the second argument of their variant
of |BluetoothInterface::SspReply|. This patch standardizes them on the
v2 version.
2015-04-15 11:46:33 +02:00