Commit Graph

30500 Commits

Author SHA1 Message Date
Ryan VanderMeulen
96c9f5a0b6 Merge m-c to b2g-inbound. a=merge 2014-11-07 14:04:37 -05:00
Ryan VanderMeulen
410f09054e Merge fx-team to m-c. a=merge 2014-11-07 13:35:28 -05:00
Ryan VanderMeulen
e3abb00b51 Merge inbound to m-c. a=merge 2014-11-07 13:24:00 -05:00
Carsten "Tomcat" Book
83244a2928 Backed out changeset 9fa06a2e1a98 (bug 1092156) for breaking nightly builds 2014-11-07 16:35:14 +01:00
Carsten "Tomcat" Book
45d236bfbb Backed out changeset f786dcb23eca (bug 1092156) 2014-11-07 16:34:22 +01:00
Carsten "Tomcat" Book
ba15266700 Merge mozilla-central to b2g-inbound 2014-11-07 15:39:25 +01:00
Andrea Marchesini
40f8089c74 Bug 1090142 - WebSocketChannelChild should respect the order of the runnable to be dispatched. r=jduell 2014-11-07 09:35:54 -05:00
Carsten "Tomcat" Book
20c938e8d7 Merge mozilla-central to mozilla-inbound 2014-11-07 15:34:32 +01:00
Carsten "Tomcat" Book
fd940e7691 Backed out changeset d1acde27d97e (bug 1084651) 2014-11-07 15:30:39 +01:00
Carsten "Tomcat" Book
d87e8af66c Backed out changeset 77959236fb15 (bug 1084651) 2014-11-07 15:30:16 +01:00
Carsten "Tomcat" Book
53623048bf Merge mozilla-central to b2g-inbound 2014-11-07 15:13:06 +01:00
Carsten "Tomcat" Book
7af6b066be merge mozilla-inbound to mozilla-central a=merge 2014-11-07 14:33:48 +01:00
Carsten "Tomcat" Book
7b63199d11 Backed out changeset 56d4cef7ed00 (bug 880114) for m5 test failures 2014-11-07 10:47:08 +01:00
Wes Kocher
d6ef25a0ca Merge m-c to b2g-inbound a=merge 2014-11-06 19:09:40 -08:00
Wes Kocher
7c3f7b9ce1 Merge b-i to m-c a=merge 2014-11-06 18:54:43 -08:00
Wes Kocher
2fd2330939 Merge fx-team to m-c a=merge 2014-11-06 18:26:36 -08:00
Kan-Ru Chen (陳侃如)
da33fd4bd9 Bug 1094083 - Make browser-element Handle nested alert gracefully. r=smaug
Don't delete this._windowIDDict[outerID] until the last modal prompt is
closed.

--HG--
extra : rebase_source : 22d283081532abf5fdfb7fd861127a41f238b1ea
2014-11-07 10:01:14 +08:00
Yoshi Huang
fab2c29426 Bug 1055460 - replace config request with power request. r=dimi
From 2860c6c7d3783e0f7cf71bcaacbc324dc288c8af Mon Sep 17 00:00:00 2001
---
 dom/nfc/NfcContentHelper.js        |  4 ++--
 dom/nfc/gonk/Nfc.js                | 18 +++++++-----------
 dom/nfc/gonk/NfcGonkMessage.h      |  6 +++---
 dom/nfc/gonk/NfcMessageHandler.cpp | 20 ++++++++++----------
 dom/nfc/gonk/NfcMessageHandler.h   |  4 ++--
 5 files changed, 24 insertions(+), 28 deletions(-)
2014-11-06 17:57:49 +08:00
Emanuel Hoogeveen
0d92fda72d Bug 1084651 - Part 5: Simplify Cycle Collector logic now that SliceBudget makes more sense. r=mccr8 2014-11-06 10:14:00 +01:00
Boris Zbarsky
9f372e5357 Bug 1084439 followup. Remove now-unsed enum. 2014-11-06 10:55:19 -05:00
Boris Zbarsky
59a4947078 Bug 1094544. Use [Exposed=System] some more instead of hardcoding binding bits in xpc::InitGlobalObject. r=bholley 2014-11-06 10:54:38 -05:00
Carsten "Tomcat" Book
86a29c0a53 Merge mozilla-central to fx-team 2014-11-07 15:37:27 +01:00
Michael Ratcliffe
926bf1ca5d Bug 1090913 - Make mochitests fail when it has 0 passes and 0 fails r=jmaher 2014-11-05 16:00:52 +00:00
Carsten "Tomcat" Book
6df42325a9 Merge mozilla-central to fx-team 2014-11-07 15:07:58 +01:00
Tomasz Kołodziejski
1a87a10585 Bug 1058116 - Pass referrer and isPrivate to openURIInFrame instead of nullptr as aOpener. r=mconley, r=smaug, r=Margaret, r=ally 2014-11-06 09:41:00 -05:00
Mark Goodwin
c71dc52d87 Bug 1068949 - Send SHA-1 deprecation warnings in to the web console. r=mcmanus 2014-11-04 13:25:00 -05:00
Emanuel Hoogeveen
b18bf40d85 Bug 1084651 - Part 4b: Adjust and clarify some tests using gcslice(0). r=wmccloskey 2014-11-04 08:17:00 +01:00
Edgar Chen
4e8ea293f3 Bug 1092941 - Settings lock in parent isn't finialized when receiving 'child-process-shutdown'. r=lissyx, a=me 2014-11-03 15:15:12 +08:00
Mike Habicher
c297fde5b2 Bug 1090501 - Properly handle no initial camera configuration. r=aosmond 2014-11-06 11:40:00 -05:00
Carsten "Tomcat" Book
416801d03f merge mozilla-inbound to mozilla-central a=merge 2014-11-06 13:50:25 +01:00
Jessica Jong
0ad72d5d94 Bug 1071469 - Part 4: don't use 'jsval' in nsITelephonyService.idl (gonk). r=echen 2014-11-06 10:20:54 +08:00
Jessica Jong
4bce52bb06 Bug 1071469 - Part 3: don't use 'jsval' in nsITelephonyService.idl (ipc). r=smaug 2014-11-06 10:20:53 +08:00
Jessica Jong
ecd74ced25 Bug 1071469 - Part 2: don't use 'jsval' in nsITelephonyService.idl (dom). r=smaug 2014-11-06 10:20:51 +08:00
Jessica Jong
d8819cd4cd Bug 1071469 - Part 1: don't use 'jsval' in nsITelephonyService.idl (idl). r=hsinyi 2014-11-06 10:20:48 +08:00
Ryan VanderMeulen
d83dc866b1 Merge m-c to b2g-inbound. a=merge 2014-11-05 15:22:01 -05:00
Ryan VanderMeulen
9d14d03ae0 Merge fx-team to m-c. a=merge 2014-11-05 14:51:17 -05:00
Ryan VanderMeulen
5257e798e9 Merge b2g-inbound to m-c. a=merge 2014-11-05 14:49:12 -05:00
Ryan VanderMeulen
7137d99f20 Merge inbound to m-c. a=merge 2014-11-05 14:04:21 -05:00
Sean Lin
6a2c92f2aa Bug 1091322 - Disable the TV mochitests on Linux debug e10s to wallpaper over gfx shutdown crashes. 2014-11-05 14:03:37 -05:00
Henri Sivonen
723b4d1376 Bug 1088635. r=smaug. 2014-11-05 17:44:37 +02:00
Thomas Zimmermann
e4602de029 Bug 1091577: Remove unused helpers from daemon backend, r=shawnjohnjr
This patch removes unused unpack functions, notification and
interface runnables from Bluetooth's daemon backend.
2014-11-05 15:43:07 +01:00
Thomas Zimmermann
950fe08ddb Bug 1091577: Use general-purpose result runnable in Bluetooth daemon backend, r=shawnjohnjr
This patch converts all interface runnables in Bluetooth's daemon
backend by generic result runnables. Init operator classes replace
unpack functions. Init operator classes will warn about unused data
at the end of a PDU.
2014-11-05 15:43:07 +01:00
Thomas Zimmermann
9b568234e1 Bug 1091577: Use general-purpose notification runnable in Bluetooth daemon backend, r=shawnjohnjr
This patch converts all notification runnables in Bluetooth's daemon
backend to use the generic implementation. Unpack functions are replaced
by init operator classes. The init operator classes also validate the
complete unpacking of a PDU and warn about unused trailing data.
2014-11-05 15:43:07 +01:00
Thomas Zimmermann
c286dab4fe Bug 1091577: Added general-purpose notification runnables for Bluetooth, r=shawnjohnjr
A backend notification runnable in Bluetooth is used to transfer
a notification from the I/O thread to the main thread; an interface
runnable transfers and executes a result handler. Both are currently
implemented by the Bluetooth backends.

This patch adds new runnables that are independend from any backend
code or data structures.
2014-11-05 15:43:06 +01:00
Carsten "Tomcat" Book
13de0f42c9 Backed out 7 changesets (bug 1084651) for ASAN Bustage on a CLOSED TREE
Backed out changeset dd2b3e78b425 (bug 1084651)
Backed out changeset 2711fbd91819 (bug 1084651)
Backed out changeset 59a163addd79 (bug 1084651)
Backed out changeset d36f6dbbf925 (bug 1084651)
Backed out changeset 78102b62a4a0 (bug 1084651)
Backed out changeset 06387a2343a0 (bug 1084651)
Backed out changeset 2f8e7c39573e (bug 1084651)
2014-11-05 15:20:25 +01:00
Carsten "Tomcat" Book
5fcc967a48 Backed out changeset 1f590c2c40f0 (bug 1093028) for web-platform-2 test failures on a CLOSED TREE 2014-11-05 15:19:53 +01:00
Wes Kocher
393e29a1af Merge m-c to b2g-inbound a=merge 2014-11-04 20:39:07 -08:00
Wes Kocher
052b085df2 Merge fx-team to m-c a=merge 2014-11-04 19:53:20 -08:00
Wes Kocher
26319a9e84 Merge inbound to m-c a=merge 2014-11-04 18:18:54 -08:00
Dave Townsend
57f0c49df2 Bug 1093048: Add a string overload to nsIDOMWindowUtils.removeSheet. r=bholley 2014-11-04 09:32:06 -08:00