Ryan VanderMeulen
99886e5bda
Merge inbound to m-c. a=merge
2014-07-14 15:47:36 -04:00
Ryan VanderMeulen
86a8d8d445
Backed out changeset 0d237b824f96 (bug 1017165) for causing bug 1037750 and bug 1037772.
2014-07-14 15:40:24 -04:00
Bobby Holley
b9c30b55ac
Bug 856067 - Actually push the test. r=me CLOSED TREE
2014-07-14 10:22:51 -07:00
Bobby Holley
5430dbb693
Bug 856067 - Tests. r=me
2014-07-14 10:09:07 -07:00
Bobby Holley
bf077afa17
Bug 856067 - Add some helpful logging to the console when we deny access to a non-Xrayable object. r=gabor
2014-07-14 10:09:07 -07:00
Bobby Holley
fd59f850a8
Bug 856067 - Remove special case for content XBL scopes. r=gabor
...
This is now the default behavior. \o/
2014-07-14 10:09:07 -07:00
Bobby Holley
1576579a77
Bug 856067 - Make unwaived non-Xrayable objects opaque from privileged code. r=gabor
2014-07-14 10:09:07 -07:00
Bobby Holley
2d413f3c11
Bug 856067 - Waive Xrays when SpecialPowers encounters an Opaque XrayWrapper. r=gabor
2014-07-14 10:09:06 -07:00
Bobby Holley
b7d711f17b
Bug 856067 - Fix up test_xrayToJS.xul. r=gabor
2014-07-14 10:09:06 -07:00
Bobby Holley
2365c577d6
Bug 856067 - Fix Object Actor Previews. r=past
2014-07-14 10:09:06 -07:00
Lucas Rocha
e967112dd4
Bug 1034167 - Part 2: Explicit set scrollbars in TabsTray (r=mfinkle)
2014-07-14 17:31:50 +01:00
Lucas Rocha
ce62717f49
Bug 1034167 - Part 1: Update TwoWayView from upstream (r=mfinkle)
2014-07-14 17:31:50 +01:00
Octoploid
d808249c97
Bug 1035092 - "bool functions shouldn't return nullptr" [r=sfink]
...
--HG--
extra : rebase_source : 0a0f2549b0a34c759384d8293f6227e112610147
2014-07-12 06:26:00 -07:00
Kartikaya Gupta
429ba38c8a
Bug 1037409 - Remove some gtests that don't map to real-world scenarios. r=nicklebedev
2014-07-14 12:48:48 -04:00
Mike Conley
fe3d89d8bc
Backed out bdf72cebcd85 to fix a CLOSED TREE.
...
--HG--
extra : histedit_source : 0a3977407abecc55d5564a69531d5d6ca804cd86
2014-07-14 12:20:16 -04:00
Mike Conley
cb86278081
Backed out e623938ea6c7 to fix a CLOSED TREE.
...
--HG--
extra : histedit_source : b4c9b387a8007748f9421df5c347b2f96e537f27
2014-07-14 12:19:23 -04:00
Mike Conley
caa568f6c5
Follow-up for Bug 1002354 - remove dual GetId in nsScreenGtk injected during rebase foul-up. r=bustage-fix on a CLOSED TREE.
...
--HG--
extra : histedit_source : c510de9918cfd73652e9e1c278e0bee93c7fdcdc
2014-07-14 12:10:34 -04:00
Mike Conley
5cd8d891e5
Bug 1002354 - Proxy nsIScreenManager and nsIScreen's from the child process to the parent process, with caching. r=roc,jimm,smichaud,snorp.
...
Changes to nsIScreen and nsIScreenManager were reviewed by roc.
Changes to dom/ipc were reviewed by jimm.
Changes to gfx/src/nsDeviceContext.cpp were reviewed by roc.
Changes to widget/android were reviewed by snorp.
Changes to widget/cocoa were reviewed by smichaud.
Changes to widget/gtk were reviewed by roc.
Changes to widget/windows were reviewed by jimm.
Changes to widget/xpwidgets were reviewed by roc.
--HG--
extra : rebase_source : 90d263235b40f6f6937d361705a4dfa44253318e
extra : histedit_source : bab4e689269c67fe3eb65033b6987b93caf9a482%2C86645be32f82f0d80724532e528e597db165b1d1
2014-07-14 11:57:06 -04:00
Gijs Kruitbosch
db1f8c69f1
Bug 1023304 - auto-add new builtin widgets in customizable areas, r=mconley
...
--HG--
extra : rebase_source : a6a1b073e7bc886704e2ee998ba46618f70d62f2
2014-07-09 23:57:19 +01:00
Lucas Rocha
c63176d5d3
Bug 1037439 - Remove DISPLAY column from TopSitesCursorWrapper (r=rnewman)
2014-07-14 16:52:41 +01:00
Carsten "Tomcat" Book
56957ca3bf
Merge mozilla-central to fx-team
2014-07-14 15:24:04 +02:00
Carsten "Tomcat" Book
6c44904307
merge fx-team to mozilla-central a=merge
2014-07-14 15:14:40 +02:00
Carsten "Tomcat" Book
e8b6fc4e72
merge mozilla-inbound to mozilla-central a=merge
2014-07-14 14:34:36 +02:00
Carsten "Tomcat" Book
88e3fb39bc
merge b2g-inbound to mozilla-central a=merge
...
--HG--
extra : amend_source : 6e2548ed562a40244895d9c341546e09f46cb6f4
2014-07-14 12:55:09 +02:00
B2G Bumper Bot
cb3660fa4a
Bumping manifests a=b2g-bump
2014-07-14 00:16:17 -07:00
B2G Bumper Bot
58ca61e3a1
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/168c5ba3a072
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #21655 from pivanov/bug-1035708
Bug 1035708 - [Bluetooth] - remove unused images
========
https://hg.mozilla.org/integration/gaia-central/rev/6835a0ba204a
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 1035708 - [Bluetooth] - remove unused images
2014-07-14 00:10:30 -07:00
B2G Bumper Bot
07c60779b5
Bumping manifests a=b2g-bump
2014-07-13 23:36:13 -07:00
B2G Bumper Bot
8bd2a42ba5
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/52fddab5675c
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #21602 from RudyLu/keyboard/Bug1034210_commit
Bug 1034210 - send correct keycode for non-latin IME.
r=timdream.
========
https://hg.mozilla.org/integration/gaia-central/rev/40ff9d8b6369
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 1034210 - send correct keycode for non-latin IME.
2014-07-13 23:30:29 -07:00
B2G Bumper Bot
d3606c893a
Bumping manifests a=b2g-bump
2014-07-13 23:21:21 -07:00
B2G Bumper Bot
4e17c0dc7a
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/66734c1175c0
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #21660 from wilsonpage/1038024
Bug 1038024 - [Camera] Update camera to use gaia-icons v0.2.0
========
https://hg.mozilla.org/integration/gaia-central/rev/f4edd9a4a3c7
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1038024 - [Camera] Update camera to use gaia-icons v0.2.0
2014-07-13 23:15:36 -07:00
B2G Bumper Bot
8aa6bf6a0a
Bumping manifests a=b2g-bump
2014-07-13 22:47:01 -07:00
B2G Bumper Bot
b32b523393
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fc54daf499af
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #18007 from huchengtw-moz/system2/Bug_971554-reland-3
Bug 971554 - [System2] Instantiable SoundManager, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/0b39d9acab2a
Author: John Hu <johu@mozilla.com>
Desc: Bug 971554 - [System2] Instantiable SoundManager
========
https://hg.mozilla.org/integration/gaia-central/rev/4b8ff547d652
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #19865 from wilsonpage/1008187
Bug 1008187 - [Camera] Update to use <gaia-header>
========
https://hg.mozilla.org/integration/gaia-central/rev/10f454ed0a59
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1008187 - [Camera] Update to use <gaia-header>
2014-07-13 22:45:34 -07:00
Nicholas Nethercote
34ee1047b5
Bug 1037302 - Avoid excess string creation in WifiCommand.jsm's getConnectionInfoICS(). r=hchang.
...
This changes the code to use search() and indexOf() to find the boundaries of
the relevant values, and substring() to extract them. This reduces the number
of strings created on each invocation by 8x.
The patch changes the behaviour if a key appears more than once. With the old
code the last occurrence would be used. With the new code the first one is
used. Hopefully this doesn't matter.
2014-07-13 22:05:27 -07:00
B2G Bumper Bot
3bfe92eca5
Bumping manifests a=b2g-bump
2014-07-13 21:06:13 -07:00
B2G Bumper Bot
2d010e65c5
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/50e6f76436eb
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #21654 from timdream/keyboard-alt-sublayout
Bug 1037942 - Normalize alt in overwrite alternative layouts, r=rudyl
========
https://hg.mozilla.org/integration/gaia-central/rev/f54018b582b3
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1037942 - Normalize alt in overwrite alternative layouts
2014-07-13 21:00:29 -07:00
Ben Tian
a0660bf735
Bug 1037291 - Make BluetoothDiscoveryHandle expire when discovery is stopped, r=echou
2014-07-14 11:23:58 +08:00
B2G Bumper Bot
ebf9127ba1
Bumping manifests a=b2g-bump
2014-07-13 20:11:15 -07:00
B2G Bumper Bot
368fc6e2a4
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/2b52e85304b9
Author: Luke Chang <lchang@mozilla.com>
Desc: Merge pull request #21427 from begeeben/1024333_no_recent_app
Bug 1024333 - [v1.4][UX]Cannot turn off recent app page by tapping screen when "No recent app" is display, r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/60dbba3d3e58
Author: Yi-Fan Liao <begeeben@gmail.com>
Desc: Bug 1024333 - [v1.4][UX]Cannot turn off recent app page by tapping screen when "No recent app" is display
* Check if the cardsView is empty and should be closed or not in the onStartEvent event handler.
* Add test for closing empty cardsview by touchstart.
2014-07-13 20:05:29 -07:00
Jocelyn Liu
39d4f3b885
Bug 1006315: Revise BluetoothDevice.webidl and implement it for new WebBluetooth API. r=btian, r=bz
2014-07-14 10:47:19 +08:00
Michael Ratcliffe
fe26293910
Backed out changeset e2360d41bd66 (bug 1033387) for loader test failures
2014-07-14 01:00:35 +01:00
Michael Ratcliffe
9145239afd
Bug 1033387 - Update JSBeautify and move it into toolkit r=fitzgen
...
--HG--
rename : browser/devtools/shared/Jsbeautify.jsm => toolkit/devtools/jsbeautify/beautify.js
2014-07-13 23:25:19 +01:00
Michael Ratcliffe
bf31683688
Backed out changeset 0ba8be1413f7 (bug 1033387) for xpc test failures
2014-07-13 23:12:50 +01:00
Michael Ratcliffe
bde7f04d29
Bug 1033387 - Update JSBeautify and move it into toolkit r=fitzgen
...
--HG--
rename : browser/devtools/shared/Jsbeautify.jsm => toolkit/devtools/jsbeautify/beautify.js
2014-07-13 21:46:14 +01:00
Wes Kocher
448660fdb2
Merge b2g-inbound to m-c a=merge
2014-07-13 11:56:58 -07:00
B2G Bumper Bot
190c45c491
Bumping manifests a=b2g-bump
2014-07-12 23:41:52 -07:00
B2G Bumper Bot
9bbda00fbb
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/db540afcf32e
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #21647 from tanay1337/master
Update README.md r=kgrandon
========
https://hg.mozilla.org/integration/gaia-central/rev/971678f584c1
Author: Tanay Pant <tanay1337@gmail.com>
Desc: Update README.md
2014-07-12 23:40:29 -07:00
B2G Bumper Bot
ba7fe6387f
Bumping manifests a=b2g-bump
2014-07-12 21:36:19 -07:00
B2G Bumper Bot
19e6fd1192
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
...
========
https://hg.mozilla.org/integration/gaia-central/rev/cb957e1ec137
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1017002 - [Homescreen] Disable intermittent Marionette JS failure on Travis: 1) Homescreen navigation > Going to the homescreen and back to a warm app: AssertionError: we got 2 reflows instead of 0
2014-07-12 21:30:35 -07:00
Michael Ratcliffe
bb7f72c81b
Bug 1032721 - Re-enable browser_inspector_infobar.js when oranges are fixed r=pbrosset
...
--HG--
rename : browser/devtools/inspector/test/browser_inspector_infobar.js => browser/devtools/inspector/test/browser_inspector_infobar_01.js
2014-07-12 20:20:28 +01:00
B2G Bumper Bot
a6c3bb5862
Bumping manifests a=b2g-bump
2014-07-12 11:43:09 -07:00