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

3235 Коммитов

Автор SHA1 Сообщение Дата
Andrea Marchesini 9b34c64d31 Bug 1235576 - Fix the indentation in dom/ipc, r=smaug 2016-01-05 09:59:30 +00:00
Jim Mathies 9981852508 Bug 1227312 - Avoid calling FinalizeChildData twice in GenerateCompleteMinidump. r=ted
--HG--
extra : amend_source : 5d2f68cc58b0aa910a32ad59dc1300eb7557eff1
2015-12-03 10:25:10 -06:00
Kit Cambridge 87582e390a Bug 1227300, Part 2 - Implement `showAlert`. r=MattN,wchen
--HG--
extra : commitid : HrMh88lKFVK
extra : rebase_source : e8a8def77f0e12152ecb48986f3c1a850d6ac9c4
2015-12-31 12:04:24 -07:00
Josh Matthews 21aeea2c72 Bug 1214305 - Part 0: Ensure site security service is initialized before trying to use DataStorage via IPC. 2016-01-04 16:30:02 -05:00
Wes Kocher dbbade6e75 Backed out 10 changesets (bug 1214305) for leaks on linux debug m-e10s(bc7)
Backed out changeset 1f482566235a (bug 1214305)
Backed out changeset 001b31489756 (bug 1214305)
Backed out changeset 4e94d2088219 (bug 1214305)
Backed out changeset fba4a5bcea41 (bug 1214305)
Backed out changeset 100f8e249007 (bug 1214305)
Backed out changeset a59c453192dc (bug 1214305)
Backed out changeset 2daa86fc1fb9 (bug 1214305)
Backed out changeset c04efb57b0ed (bug 1214305)
Backed out changeset 52046e843c60 (bug 1214305)
Backed out changeset ac4fd6615828 (bug 1214305)

--HG--
extra : commitid : ILmaVumvmvH
2016-01-04 10:34:24 -08:00
Josh Matthews 1bc3fce52c Bug 1214305 - Part 0: Ensure site security service is initialized before trying to use DataStorage via IPC. 2016-01-04 09:52:35 -05:00
Dave Hylands 6ce82bea6b Bug 1232506: Make dom/devicestorage really work with e10s. r=alchen 2015-12-18 17:17:46 -08:00
Makoto Kato 5b4d938e60 Bug 1208944 - Part 10-a. Call CallWindowProc when WidgetPluginEvent isn't handled by plugin. r=masayuki 2015-12-29 22:57:38 +09:00
Makoto Kato 000416b7b5 Bug 1208944 - Part 9. Hook IMM32 APIs on plugin process. r=masayuki 2015-12-29 22:57:38 +09:00
Makoto Kato 7530d01116 Bug 1208944 - Part 5. Send PluginEvent to content process. r=jmathies 2015-12-29 22:57:38 +09:00
Kearwood (Kip) Gilbert 0c83ce5c05 Bug 1182048 - Part 2: Implement e10s support for WebVR,r=vlad 2015-09-17 14:23:13 -07:00
Sebastian Hengst e082884d78 Backed out 15 changesets (bug 1208944) for failing tests M(2,5) on OSX. r=backout
Backed out changeset c29de223de2f (bug 1208944)
Backed out changeset 3d99da255be1 (bug 1209844)
Backed out changeset 3c915942af38 (bug 1209844)
Backed out changeset 759b425b5503 (bug 1208944)
Backed out changeset bf73cf8f0fda (bug 1208944)
Backed out changeset 0e337d912b7d (bug 1208944)
Backed out changeset 31c47f2980b5 (bug 1208944)
Backed out changeset 3e0d70a6e809 (bug 1208944)
Backed out changeset 7685dcb63e5f (bug 1208944)
Backed out changeset 3c2b9372dd36 (bug 1208944)
Backed out changeset 18160d306493 (bug 1208944)
Backed out changeset 4974e397b655 (bug 1208944)
Backed out changeset fde7e439844d (bug 1208944)
Backed out changeset 4213a355fbdc (bug 1208944)
Backed out changeset 33cfddbbf5f2 (bug 1208944)
2015-12-29 17:42:02 +01:00
Makoto Kato b0adec59a2 Bug 1208944 - Part 10-a. Call CallWindowProc when WidgetPluginEvent isn't handled by plugin. r=masayuki 2015-12-29 22:57:38 +09:00
Makoto Kato 836a9aee5c Bug 1208944 - Part 9. Hook IMM32 APIs on plugin process. r=masayuki 2015-12-29 22:57:38 +09:00
Makoto Kato 4ac6c97dcd Bug 1208944 - Part 5. Send PluginEvent to content process. r=jmathies 2015-12-29 22:57:38 +09:00
Henry Chang 24ab7ce66a Bug 1216443 - "moz-safe-about:blank" to signed content should switch process. r=kanru 2016-01-18 00:07:00 +01:00
Randell Jesup f955d91200 Bug 1226200: Don't assume a TCPSocket has only one managee (and rename LoneManagedOrNull) r=jdm 2015-12-22 10:14:23 -05:00
Carsten "Tomcat" Book 717016fa6e Merge mozilla-central to mozilla-inbound 2015-12-22 11:47:56 +01:00
Carsten "Tomcat" Book d0f1701bc8 merge mozilla-inbound to mozilla-central a=merge 2015-12-22 11:47:07 +01:00
Carsten "Tomcat" Book 54777c67a2 Merge mozilla-central to b2g-inbound 2015-12-21 13:15:16 +01:00
Carsten "Tomcat" Book 956117e0df Backed out changeset 0f2a62a45b00 (bug 1232506) for causing a talos perma failure 2015-12-21 13:00:59 +01:00
Carsten "Tomcat" Book aaad85ab2f Merge mozilla-central to b2g-inbound 2015-12-21 12:01:32 +01:00
Alexandre Lissy 3601667fc4 Bug 1233922 - Skip Camera preinit for browser elements. r=fabrice
--HG--
extra : rebase_source : bde01b4e80b1f868a8b2a497c9031c766fd803ac
2015-12-19 17:02:00 +01:00
Morris Tseng 8181a0e4ec Bug 1215438 - Part 2: Add transfer support for ImageBitmap. r=baku
--HG--
extra : commitid : 79U2wpZIJ6W
2015-12-18 14:52:16 +08:00
Andrea Marchesini f64dd19a60 Bug 1214148 - patch 2 - from toplevel iframe to the nested iframe, r=alwu 2015-12-11 11:17:33 -05:00
Henry f090013aed Bug 1223678 - Use package-identifier from argument to create principal. r=kanru. 2015-12-22 11:08:56 +08:00
Dave Hylands 1eabadf7aa Bug 1232506: Make dom/devicestorage really work with e10s. r=alchen 2015-12-18 17:17:46 -08:00
Carsten "Tomcat" Book 73da51a3e1 Backed out changeset debd1ce280de (bug 1214148) 2015-12-15 14:44:50 +01:00
Nicholas Nethercote 9c93b28807 Bug 1231256 (part 2) - Remove unused BlobDirState parameters from SetLazyData(). r=jld.
--HG--
extra : rebase_source : f88823ad01734efedf275dc67c1e4e1d2bc6a3ba
2015-12-07 14:00:51 -08:00
Catalin Badea 54a27691d4 Bug 1221992 - Prevent ServiceWorkerClients.OpenWindow from opening tabs in private mode windows. r=smaug 2015-12-11 13:32:15 -05:00
Andrea Marchesini 4f57cd1c8f Bug 1214148 - patch 2 - from toplevel iframe to the nested iframe, r=alwu 2015-12-11 11:17:33 -05:00
Jim Mathies 114d93fb4c Bug 1198459 - Prevent accessibility from initializing in content processes when e10s is running. r=tbsaunde
--HG--
extra : transplant_source : %A0R%E2Nhk%25%F7%BE%9D%E1%96W_%AD%27%DEC%F2%AC
2015-12-10 14:28:33 -05:00
Masayuki Nakano 6a05ca7e0d Bug 1179632 part.4 Clean up the code to request IME to commit composition across process boundary r=smaug 2015-12-11 15:15:58 +09:00
Masayuki Nakano 618611d2c2 Bug 1179632 part.3 TabParent::RecvEndIMEComposition() shouldn't return true with aNoCompositionEvent when there is no widget r=smaug 2015-12-04 18:38:28 +09:00
Masayuki Nakano 6cad726628 Bug 1179632 part.1 native IME context should not be stored in InputContext but should be able to retrieve with nsIWidget::GetNativeData() r=smaug 2015-12-11 15:15:57 +09:00
Carsten "Tomcat" Book 8431613ae5 Backed out changeset bcb4ebf6ffac (bug 1198459) for bustage 2015-12-10 11:14:27 +01:00
Jim Mathies 33f95db847 Bug 1198459 - Prevent accessibility from initializing in content processes when e10s is running. r=tbsaunde
--HG--
extra : transplant_source : %BA%D2uF7%D5%C1jg%0E%BA%9B%84u%3D%10n%C0%93%8B
2015-12-09 08:35:06 -05:00
Phil Ringnalda 631f58c4f9 Back out 3 changesets (bug 1214148) for b2g test_browserElement_inproc_AudioPlayback.html, test_browserElement_oop_AudioChannel.html, etc. failures
CLOSED TREE

Backed out changeset e716d9ac93d7 (bug 1214148)
Backed out changeset 5f693237c8c1 (bug 1214148)
Backed out changeset 3a4865d79416 (bug 1214148)
2015-12-09 18:19:33 -08:00
Andrea Marchesini 4ddcd9bade Bug 1214148 - patch 2 - from toplevel iframe to the nested iframe, r=alwu 2015-12-09 16:46:25 -05:00
Andrea Marchesini c2230f21f8 Bug 1231100 - Get rid of nsIDOMFileReader - patch 1, r=sicking 2015-12-09 15:52:15 -05:00
Nicholas Nethercote 53b8d741ea Bug 1230047 (part 1) - Make SynthesizeNativeTouch{Point,Tap}() take ScreenIntPoints. r=kats.
--HG--
extra : rebase_source : f9a4490edf840b0b506d33076d1b4738bb705fd5
2015-12-02 21:45:38 -08:00
Sebastian Hengst 114ca318d6 Backed out 2 changesets (bug 1221992) for almost permafailing M-e10s(2) on Linux debug. r=backout
Backed out changeset ad20808dd3c4 (bug 1221992)
Backed out changeset 7cdcda3e65fb (bug 1221992)
2015-12-05 21:13:41 +01:00
Andrea Marchesini ebc5b1a50f iBug 1122788 - patch 2 - nsMultiplexInputStream should not use Tell() in debug builds, r=bz 2015-12-05 09:36:51 +00:00
Andrea Marchesini ae1df2b2a2 Bug 1230509 - BlobImplFile should return false in IsDateUnknown and IsSizeUnknown, r=bz 2015-12-04 21:15:46 +00:00
Wes Kocher bdc3f1fdf0 Backed out changeset b3cfca056388 (bug 1230509) for build bustage CLOSED TREE
--HG--
extra : commitid : 6ezF1zP3n26
2015-12-04 10:50:17 -08:00
Andrea Marchesini 40373a6e18 Bug 1230509 - BlobImplFile should return false in IsDateUnknown and IsSizeUnknown, r=bz 2015-12-04 18:18:21 +00:00
Catalin Badea b675b2325d Bug 1221992 - Prevent ServiceWorkerClients.OpenWindow from opening tabs in private mode windows. r=smaug 2015-12-04 19:14:44 +02:00
Wes Kocher bfbadfd96d Backed out 2 changesets (bug 1221992) for windows debug assertions in browser_perf-categories-js-calltree.js
Backed out changeset bcd90e591038 (bug 1221992)
Backed out changeset 6affaa386b9b (bug 1221992)

--HG--
extra : commitid : 4w08gUrbqQr
2015-12-03 15:56:59 -08:00
Blake Kaplan 0bb2b116eb Bug 1116478 - Open web content handlers in the proper tab in e10s. r=billm
--HG--
extra : rebase_source : 9ce04d3a3b30ecdcef4c4781639f0e5ea22d8b22
2015-12-03 15:04:28 -08:00
Catalin Badea 889982d7af Bug 1221992 - Prevent ServiceWorkerClients.OpenWindow from opening tabs in private mode windows. r=smaug 2015-12-03 23:19:29 +02:00
Mike Conley 51d7f5de3d Bug 1193838 - Allow ProfileGatherer to gather profiles from exiting processes. r=BenWa
--HG--
extra : commitid : IhyN838vNVU
extra : rebase_source : a91c87e3f9a087cd789bdb678651ab351357092a
2015-08-18 14:57:35 -04:00
Mike Conley 9811d5b26c Bug 1193838 - Expose ProfileGatherer as an nsISupports through nsIProfiler for process parent actors. r=BenWa
We need to let ContentParent and PluginModuleParent get a reference to the ProfileGatherer
during the window of time that we're profiling so that if they start to die (the actor is
starting to go away), they have a gatherer they can send their last profile data to.

--HG--
extra : commitid : LkcpDsiXmp0
extra : rebase_source : d1c9e6e7640ff759cef25920e2bc17c0484544bd
2015-08-12 14:20:26 -04:00
Nicholas Nethercote 1fb25d8609 Bug 1229237 (part 1) - Make nsIWidget::{Create,CreateChildren}() take a LayoutDeviceIntRect. r=botond.
--HG--
extra : rebase_source : 08407e76083534ad39dd34d2535ec09c95e506db
2015-11-16 00:35:18 -08:00
Nathan Froyd c381a6b86c Bug 1218454 - part 2 - don't #include nsContentUtils.h from CallbackObject.h; r=bz
We used to need nsContentUtils.h here for nsCxPusher, but since that got
moved to ScriptSettings.h, we no longer need nsContentUtils.h for
anything.
2015-10-26 12:14:47 -04:00
Wes Kocher cf8498f97a Merge m-c to inbound, a=merge
--HG--
extra : commitid : 7uZvQAK3Zn8
2015-12-01 16:10:04 -08:00
Carsten "Tomcat" Book 31b570ce3c Merge mozilla-central to b2g-inbound 2015-12-01 15:28:29 +01:00
Carsten "Tomcat" Book 207c64c6c1 Backed out changeset f4348b2f5c5f (bug 1223678) for bustage
--HG--
extra : rebase_source : 1e7bf92b54ceff74b6eee2143a2f82434af1e8e3
2015-12-01 15:01:36 +01:00
Henry 897968f644 Bug 1223678 - Use package-identifier from argument to create principal. r=kanru.
--HG--
extra : rebase_source : d0ae9975c1613172e59a9193cece8992e68f3b4f
2015-11-25 23:17:00 +01:00
DimiL 247159320f Bug 1223672 - NSec package cannot use device storage API. r=kchen
--HG--
extra : rebase_source : ac72a20aaf2bef9d6f33e3701b533f31b880ce5d
2015-11-25 21:50:00 +01:00
Andrea Marchesini 80b6696753 Bug 1211266 - Remote blobs coming from a different thread and a different manager must be kept alive until the creation of depending RemoteBlobs is not completed, r=bent, f=gerard-majax 2015-11-28 10:48:28 +00:00
Mike Conley 9388d22d6f Bug 1228489 - ifdef out ContentParent::StartProfiler for builds without profiler support. r=BenWa
--HG--
extra : commitid : CtwAO1mZCql
extra : rebase_source : a7eea59078e2271c3ac0fb5ddbb48ded9a2fd98b
extra : amend_source : 89e0c4486a6d87ad9a490c6e385da534df77bfb1
2015-11-27 11:00:18 -05:00
Jonathan Watt 740627a24c Bug 1209924 - Implement a general filtering mechanism for Directory::GetFilesAndDirectories, and add filtering of sensitive files/directories. r=baku 2015-10-09 15:59:40 +01:00
Markus Stange 10286b74bb Bug 1221913 - Make swiping work correctly in e10s mode even if APZ is off. r=kats
--HG--
extra : commitid : 6jMrb8f9Atw
extra : amend_source : 6cffb6ab209c3f55739ddb409b1a4d04d31a159a
2015-11-27 17:33:50 +01:00
Mike Conley 26dff43ec9 Bug 1103094 - Start profiling subprocesses if the parent process is already profiling. r=BenWa
--HG--
extra : commitid : 5WuS9Ur4Lmn
extra : rebase_source : ec3fd280607c5b13090d3c4e902b47ffd5617ec3
2015-08-11 14:26:27 -04:00
Carsten "Tomcat" Book 4478aaa8da Merge mozilla-central to b2g-inbound 2015-11-25 14:00:32 +01:00
Yoshi Huang 4b500464f5 Bug 1209162 - Create OriginAttributes subtypes. IGNORE IDL r=sicking. 2015-11-03 09:50:54 +08:00
Wes Kocher fcb2a5060a Merge b2ginbound to central, a=merge
--HG--
extra : commitid : DY49ZjkFuGD
2015-11-24 16:52:38 -08:00
sgiles d59ee6148c Bug 1224609 - Ensure the primary screen is always returned in RecvScreenForBrowser if all else fails. r=wmccloskey 2015-11-16 12:54:34 +00:00
Jan Varga 736e2d562c Bug 961049 - Part 8: Move getFileReferences() from PContent under new protocol PBackgroundIndexedDBUtils; r=baku 2015-11-22 10:44:33 +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
Jan Varga c1c950896a Bug 961049 - Part 3: Move PersistenceType serializer from indexedDB to quota module; r=baku 2015-11-22 10:43:34 +01:00
sajitk 5fb2c53074 Bug 1219478: Replace PRLogModuleInfo usage with LazyLogModule in dom folders except media.r=amerchesini 2015-11-23 11:09:25 -08:00
Wes Kocher 3f9d73cccc Merge m-c to inbound, a=merge CLOSED TREE
--HG--
extra : commitid : HQ2HZ9hq60S
2015-11-24 16:59:18 -08:00
Christoph Kerschbaumer 3c326a33bc Bug 1119386 - Part 2: Use document's principal for favicons in dom (r=smaug) 2015-11-24 13:31:57 -08:00
Wes Kocher 176f927280 Backed out changeset cbc2c8a24438 (bug 1211266) for asan failures in test_fileapi_slice.html
--HG--
extra : commitid : 6n3H2TgzlUO
2015-11-24 13:25:18 -08:00
Andrea Marchesini 8c1cf23ab6 Bug 1211266 - Remote blobs coming from a different thread and a different manager must be kept alive until the creation of depending RemoteBlobs is not completed, r=bent, f=gerard-majax 2015-11-24 19:51:28 +00:00
Chris Peterson 155af957a6 Bug 1223265 - Fix -Wunreachable-code and -Wimplicit-fallthrough warnings in dom/bindings and dom/ipc. r=khuey 2015-11-08 21:41:40 -08:00
Andrew Halberstadt 1252d85394 Bug 1219442 - Re-write specialpowers as a restartless addon, r=jmaher
In order to meet the addon signing requirement for tests, specialpowers
needs to be installed at gecko runtime. This means it must be restartless.
This patch packages specialpowers as a restartless addon, but it does not
yet install it at runtime.

--HG--
rename : testing/specialpowers/components/SpecialPowersObserver.js => testing/specialpowers/content/SpecialPowersObserver.jsm
extra : commitid : Bbg8gFten8S
extra : rebase_source : 99d0b841a1f8f9eb6b6ca846363a158836482e57
2015-11-05 10:00:59 -05:00
Botond Ballo f7282ab158 Bug 1217515 - Clean up the way touch event support is configured. r=roc
- all.js now sets dom.w3c_touch_events.enabled to auto-detect on all
  platforms except windows and mac
- auto-detect always returns true for android and b2g
- graphene and tests override the all.js pref with their own value

--HG--
extra : rebase_source : 85a88985f77dfb47301cab17d939a88f3043a7a1
extra : source : 95e992d129c32f5e5f39b67f6f946e5d1dcbf530
2015-10-26 16:06:27 -04:00
Cameron McCormack fd2fba0c73 Bug 990250 - Fold nsIStyleSheet into CSSStyleSheet. r=dbaron 2015-11-17 17:04:09 +11:00
Wes Kocher 187dd319f1 Merge m-c to inbound, a=merge
--HG--
extra : commitid : DGwcWNlrDUA
2015-11-16 17:27:08 -08:00
Wes Kocher c4f40f5dfc Merge inbound to m-c a=merge
--HG--
extra : commitid : 8FO2ow49CX2
2015-11-16 17:20:42 -08:00
Alastor Wu f49b90a02f Bug 1222902 - Create log system for the AudioChannel. r=baku.
--HG--
extra : transplant_source : %BD%FF%8EH%08%97%3AC%C6%85%BC%F1%10%CB%07%AA%0E%90%85A
2015-11-10 18:32:00 +08:00
Andrea Marchesini a14ba13b57 Bug 1223734 - AudioChannelService should not be re-initialized after the XPCOM shutdown, r=smaug 2015-11-16 17:34:52 +00:00
Henry daec939f23 Bug 1178526 - Create docshell with packageId from TabContext. r=sicking. 2015-10-29 00:52:40 +08:00
Phil Ringnalda 596e8ff827 Back out 9 changesets (bug 1214305) for e10s devtools browser_bug1045902_console_csp_ignore_reflected_xss_message.js failures
Backed out changeset 82929be36e95 (bug 1214305)
Backed out changeset e926606aefbf (bug 1214305)
Backed out changeset 226c83ca9a2a (bug 1214305)
Backed out changeset 88ab26108f2d (bug 1214305)
Backed out changeset 2e3e4f256d46 (bug 1214305)
Backed out changeset 347cd0f8f1e3 (bug 1214305)
Backed out changeset be072bba15fc (bug 1214305)
Backed out changeset 3b85acbe7be7 (bug 1214305)
Backed out changeset 49b930683c02 (bug 1214305)
2015-11-14 10:09:58 -08:00
Josh Matthews ec11c24ab0 Bug 1214305 - Part 0: Ensure site security service is initialized before trying to use DataStorage via IPC. 2015-11-14 08:27:43 -05:00
George Wright 92df2e4ade Bug 1098131 - Don't invalidate layers when simply changing SizeMode r=smaug,jimm 2015-11-09 21:38:21 -05:00
Ehsan Akhgari 78ee50aca4 Bug 1215723 - Part 3: Propagate updates to DataStorage from the parent process to the content processes; r=keeler 2015-10-30 15:30:00 -04:00
Ehsan Akhgari 9aa975d49d Bug 1215723 - Part 2: Initialize DataStorage items in the content process from the data in the parent; r=keeler 2015-10-30 15:30:00 -04:00
Jim Mathies f1203966e4 Bug 1190364 - "With electrolysis (e10s) enabled and lots of tabs open, plugincheck often fails to find any plugins". r=billm
--HG--
extra : rebase_source : 2b1afcba9086e581b059c0e79c344df4e2e88de5
2015-11-11 05:35:00 +01:00
Nicholas Nethercote d56c319644 Bug 1222943 (part 2) - Remove an unnecessary call to ToUnknownSize(). r=botond.
--HG--
extra : rebase_source : 8b6067d9e5897cd61a0752d9b665f1ebd9706df2
2015-11-09 21:37:31 -08:00
Nicholas Nethercote ab7974e9a5 Bug 1222943 (part 1) - Change Touch::mRadius from nsIntPoint to LayoutDeviceIntPoint. r=kats.
This adds a three missing unit conversions for touch radii.

--HG--
extra : rebase_source : 353494783099ed0520cc69ae691a4cf5360c9b20
2015-11-09 21:37:31 -08:00
Carsten "Tomcat" Book 4d6f05d2f8 merge mozilla-inbound to mozilla-central a=merge 2015-11-09 14:55:30 +01:00
Gregor Wagner 96837db759 Bug 1222478 - Enable more mulet tests. r=gerard-majax 2015-11-06 20:01:45 +01:00
Carsten "Tomcat" Book f2961bc526 Merge mozilla-central to b2g-inbound 2015-11-06 14:00:33 +01:00
Fabrice Desré a76d9cfc62 Bug 1220344 - remote some of nsSystemInfo to make it e10s ready on Android r=nchen,froydnj 2015-11-04 11:08:14 -08:00
Carsten "Tomcat" Book 10e4bb40b4 merge b2g-inbound to m-c to fix merge conflicts a=merge 2015-11-05 13:38:39 +01:00
Carsten "Tomcat" Book bb068eacd7 merge mozilla-inbound to mozilla-central a=merge
--HG--
rename : browser/locales/en-US/chrome/browser/devtools/memory.properties => devtools/client/locales/en-US/memory.properties
2015-11-05 11:58:55 +01:00
Carsten "Tomcat" Book 8bb69a1d1d Backed out changeset 8d3ff1d1a809 (bug 1220344) for failing android tests
--HG--
extra : rebase_source : a1d9f59c12c44ccf24af88566c6531e08a11db4e
2015-11-05 11:48:06 +01:00