Commit Graph

2371 Commits

Author SHA1 Message Date
Jed Davis
35861fc466 Bug 1101170 - Move GMP's LinuxSandboxStarter into plugin-container. r=cpearce r=glandium 2014-11-24 15:22:14 -08:00
Jed Davis
eb5a7b8072 Bug 1101170 - Move Linux sandbox code into plugin-container on desktop. r=kang r=glandium
Specifically:
* SandboxCrash() uses internal Gecko interfaces, so stays in libxul.
* SandboxInfo moves to libxul from libmozsandbox, which no longer exists.
* Where libxul calls Set*Sandbox(), it uses weak symbols.
* Everything remains as it was on mobile.
2014-11-24 15:22:13 -08:00
Ben Turner
61d89416b9 Bug 1102052 - Crash for PBackground protocol errors, r=mrbkap. 2014-11-20 11:48:18 -08:00
Tatiana Meshkova
ee4083a44f Bug 1023156 - Cannot build Qt with errors in gfxQtPlatforms (with Qt 5.3) 2014-11-19 22:02:51 -08:00
Shelly Lin
0b69a07e40 Bug 1098681 - Call GetCurTraceInfo at where this message is enqueued. r=sinker. 2014-11-18 11:20:36 +08:00
Jan Beich
655a6d59e5 Bug 1098607 - Unbreak build BSDs and Solaris after bug 1072093. r=kats 2014-11-16 18:38:31 +01:00
Carsten "Tomcat" Book
0627ebf5ec Backed out changeset 80f873bf8adc (bug 1036682) for test bustage 2014-11-14 12:32:47 +01:00
Nicolas Silva
6322eded61 Bug 1036682 - Check that the ipdl connection is not lost before sending messages. r=bjacob 2014-11-14 11:25:16 +01:00
Chris Pearce
59d25ba946 Bug 1088488 - On Windows only, use librlz and SHA256 code to generate a device-bound node id inside plugin-container, pass to GMP. r=henri,r=jesup 2014-11-14 21:39:18 +13:00
Chris Pearce
dc2929ea83 Bug 1088488 - Copy freebl's SHA256 code into plugin container, stripping out non-256 SHA code. r=hsivonen
--HG--
rename : security/nss/lib/freebl/sha512.c => ipc/app/sha256.c
rename : security/nss/lib/freebl/blapi.h => ipc/app/sha256.h
2014-11-14 21:26:24 +13:00
Chris Pearce
fc3525402d Bug 1088488 - make librlz a library, link into plugin-container. r=glandium 2014-11-14 21:26:24 +13:00
Chris Pearce
a9c8867440 Bug 1088488 - Add GMPLoader interface to encapsulate loading GMPs, pass that to XRE_InitChildProcess. r=jesup,r=bsmedberg,r=glandium 2014-11-14 21:26:24 +13:00
Nathan Froyd
dc32d9df06 Bug 1097762 - part 1 - correctly re-initialize flag histograms after clearing them; r=gfritzsche 2014-11-12 12:03:47 -05:00
Nathan Froyd
39a94381ae Bug 1096487 - part 2 - make ipdl message constructors take their routing id; r=bent
Similarly to part, there's no need to say we don't know the routing id
when constructing a message, and then turn around and set the routing id
immediately afterwards.  Just let the constructor do its work.
2014-11-10 13:05:59 -05:00
Nathan Froyd
3c0af496c1 Bug 1096487 - part 1 - make ipdl message constructors set their priority directly; r=bent
The default constructor for ipdl-generated messages looks like:

    MOZ_IMPLICIT Msg_AsyncMessage() :
        IPC::Message(MSG_ROUTING_NONE, ID, IPC::Message::PRIORITY_NORMAL, COMPRESSION_NONE, "PContent::Msg_AsyncMessage")
    {
    }

IPC::Message::PRIORITY_NORMAL is 1, so any set_priority(1) calls are
just redudant.

Additionally, the priorities for messages are known at code generation
time, so we are always able to provide the right constants to the
message constructor, rather than using set_priority calls later.
2014-11-10 12:32:15 -05:00
Nathan Froyd
1bef3f75f4 Bug 1096501 - include nsRefPtr.h instead of nsAutoPtr.h in ipdl generated files; r=bent 2014-11-10 14:18:09 -05:00
David Parks
d7068958cc Bug 1076820 - Redraw on resize performance for content is pretty bad with e10s r=billm
Modern OSs adjust process scheduling based on CPU-boundedness and Interface-boundedness.  A process performing a lot of UI tasks requires lower-latency than a CPU-bound process.  For this reason, at least on Windows (but probably also Linux and Mac), in e10s, resize events are sent at a much higher rate than non-e10s, where the main process has to do the work to respond to them.  This was supposed to be handled by the 'compress' option in IPDL but its duplicate-event test was very imprecise - it only tested the *oldest* message in the queue.  This patch searches the messagequeue/deque to remove *any* duplicate.  deque::erase is linear but this is a very uncommon case - currently only two compressed IPDL messages exist in the entire code base.  Also, these queues are small.
2014-11-07 14:21:08 -08:00
Kartikaya Gupta
7e2edc21ea Bug 1072093 - Build the CrossProcessMutex_posix on OS X, but disable it prior to Lion. r=smichaud 2014-11-07 14:17:14 -05:00
Ryan VanderMeulen
3e51467ff5 Merge b2g-inbound to m-c. a=merge 2014-11-05 14:49:12 -05:00
Thomas Zimmermann
b1cb7387de Bug 1091577: Added |BluetoothDaemonPDU::GetHeader|, r=shawnjohnjr
The |GetHeader| method of |BluetoothDaemonPDU| returns the PDU's
header. This is helpful for debugging logs.
2014-11-05 15:43:06 +01:00
Nathan Froyd
60b5c32781 Bug 1093809 - make Pickle reading functions MOZ_WARN_UNUSED_RESULT; r=bent 2014-11-04 11:33:06 -05:00
Nathan Froyd
0b64cfb0e6 Bug 1088043 - read and write nsTArrays more intelligently in IPC serialization; r=bent 2014-11-04 08:57:25 -05:00
Ryan VanderMeulen
4c411f36a2 Merge m-c to inbound. a=merge
CLOSED TREE
2014-11-03 17:11:06 -05:00
Ryan VanderMeulen
78c4ee7636 Merge b2g-inbound to m-c. a=merge 2014-11-03 16:34:56 -05:00
Carsten "Tomcat" Book
bd9cd9ac32 Merge mozilla-central to b2g-inbound 2014-11-03 14:22:46 +01:00
Thomas Zimmermann
eb92836ea3 Bug 1073548: Add |mozilla::ipc::BluetoothDaemonConnection|, r=shawnjohnjr
This patch adds |BluetoothDaemonConnection|, which transfers PDUs from and
to the Bluetooth daemon. The class is build around the existing socket I/O
infrastructure.
2014-11-03 13:03:49 +01:00
Nathan Froyd
fe119fa9c8 Bug 1092010 - part 2 - use move semantics in MessageChannel.cpp; r=dvander 2014-10-31 11:21:01 -04:00
Nathan Froyd
c3370f571e Bug 1092010 - part 1 - add move semantics to Pickle and IPC::Message; r=dvander 2014-10-31 11:20:43 -04:00
Ryan VanderMeulen
3201796d1d Backed out changesets a7d4914ea11a and f3d36cf13ac1 (bug 1092010) for non-unified bustage. 2014-11-01 00:10:08 -04:00
Nathan Froyd
69f8627cb7 Bug 1092010 - part 2 - use move semantics in MessageChannel.cpp; r=dvander 2014-10-31 11:21:01 -04:00
Nathan Froyd
81df3d14a0 Bug 1092010 - part 1 - add move semantics to Pickle and IPC::Message; r=dvander 2014-10-31 11:20:43 -04:00
Nathan Froyd
c0cb59a456 Bug 1092010 - part 3 - don't use IPC::Message::operator=(IPC::Message const&) in MessageChannel.cpp; r=dvander 2014-11-01 07:00:54 -04:00
Ting-Yu Chou
1a481b0b30 Bug 1050122 - Part 2 - Disable preallocate when proc loader is not initialized. r=khuey 2014-11-01 13:28:33 +08:00
Ting-Yu Chou
54eb7fe31b Bug 1050122 - Part 1 - Enable Nuwa on debug builds, and kill it if the preference is false. r=khuey 2014-10-31 15:07:43 +08:00
Ryan VanderMeulen
72f79bfdf7 Backed out changesets bc3b048b416d and 773b27cd166b (bug 1050122) for regression B2G debug test runtimes dramatically. 2014-11-03 12:46:43 -05:00
Jacek Caban
4129770618 Bug 1092130 - Fixed build errors found by mingw after bug 1076698 landed (-Werror=missing-braces errors). r=cpearce 2014-11-03 10:28:52 +01:00
Akshendra Pratap Singh
94693d403f Bug 1074211: Output a warning message when a IPDL constructor returns a null value; r=bent 2014-10-15 15:30:00 -07:00
Bill McCloskey
1f3a435ec4 Bug 1062713 - Handle normal priority messages while sending sync messages more efficiently (r=dvander) 2014-10-30 13:06:24 -07:00
Mike Hommey
d667f4bb59 Bug 1077148 part 4 - Add and use new moz.build templates for Gecko programs and libraries. r=gps
There are, sadly, many combinations of linkage in use throughout the tree.
The main differentiator, though, is between program/libraries related to
Gecko or not. Kind of. Some need mozglue, some don't. Some need dependent
linkage, some standalone.

Anyways, these new templates remove the need to manually define the
right dependencies against xpcomglue, nspr, mozalloc and mozglue
in most cases.

Places that build programs and were resetting MOZ_GLUE_PROGRAM_LDFLAGS
or that build libraries and were resetting MOZ_GLUE_LDFLAGS can now
just not use those Gecko-specific templates.
2014-10-30 13:06:12 +09:00
Boris Zbarsky
d3ead51082 Bug 1088002 part 3. Stop requiring JSPROP_PROPOP_ACCESSORS just to use stub accessors. r=waldo 2014-10-29 15:06:32 -04:00
Boris Zbarsky
e783498ddd Bug 1088002 part 2. Change JS_DefineElement, JS_DefineProperty, JS_DefineUCProperty, JS_DefinePropertyById, and JS_DefineProperties to default to using JSNative accessors, not JSPropertyOp accessors. r=waldo 2014-10-29 15:06:31 -04:00
Bill McCloskey
2b781b187b Bug 641685 - Make sure generated code for IPDL bridged includes all necessary forward decls (r=bsmedberg) 2014-10-29 08:04:51 -07:00
Andrew McCreight
e3b5b15eb6 Bug 1089833 - Delete reply in MessageChannel::DispatchSyncMessage and DispatchInterruptMessage if channel isn't connected. r=billm 2014-10-28 13:53:15 -07:00
Ben Turner
c60c6a993a Bug 1087464, Use the correct ContentParent when Nuwa forks PBackground actors. r=khuey. 2014-10-23 20:13:25 -04:00
Nicholas Nethercote
a4cfc0ee0e Bug 1087834 - Reduce heap churn involving |input_overflow_buf_|. r=billm.
--HG--
extra : rebase_source : f842309c5d75479fefc266d405c0b8aceb7c247f
2014-10-23 01:34:07 -07:00
Carsten "Tomcat" Book
89b0898352 Merge mozilla-central to b2g-inbound 2014-10-21 16:02:54 +02:00
Thomas Zimmermann
395962fa36 Bug 1083092: Add |mozilla::ipc::UnixSocketIOBuffer|, r=shawnjohnjr
The class |UnixSocketIOBuffer| maintains memory buffers for socket I/O
operations. The actual I/O is still implemented by subclasses, such as
|UnixSocketRawData|.
2014-10-21 10:52:12 +02:00
Thomas Zimmermann
7bf2af4097 Bug 1083092: Data parameter for |mozilla::ipc::SocketIOSendTask| template, r=shawnjohnjr
The data class in |SocketIOSendTask| is now a template parameter, instead
of being hard-coded to |UnixSocketRawData|. The patch also adds soem minor
cleanups to the file.
2014-10-21 10:52:12 +02:00
Thomas Zimmermann
e86ec92e48 Bug 1083092: Introduce |mozilla::ipc::SocketBase|, r=shawnjohnjr
The new class |SocketBase| contains the notification mechanism of
|SocketConsumerBase|. The latter still contains I/O methods.
2014-10-21 10:52:11 +02:00
Chris Peterson
3a143998bc Bug 1081010 - Part 1: Fix -Wswitch warning in ipc/chromium. r=tabraldes 2014-10-09 23:46:16 -07:00
Ben Turner
7dc4d7431c Bug 1076975 - Avoid serializing blobs when passed between threads in the same process, r=khuey. 2014-10-20 17:49:00 -07:00
Bob Owen
069df707e0 Bug 1037445: When pre-Vista, for testing purposes allow std handles to be inherited by child process when an env var is set. r=jmaher,dvander 2014-10-15 08:26:39 +01:00
Tom Schuster
0db58380c0 Bug 1069694 - Remove OldDebugAPI from the browser. r=shu 2014-10-12 19:37:41 +02:00
Stephen Pohl
6b7b767456 Bug 1077282: Cleanup uses of GreD vs GreBinD, introcuded by v2 signature changes on OSX. Based on initial patch by rstrong. r=bsmedberg 2014-10-10 15:06:57 -04:00
Stephen Pohl
acea94548c Bug 1077099: Set mGREBinDir in nsXREDirProvider::Initialize to avoid returning NULL in nsXREDirProvider::GetGREBinDir. r=bsmedberg 2014-10-10 15:06:50 -04:00
Steve Fink
b41205df20 Bug 1061288 - Make it harder for ArrayBuffer data pointers to be held across invalidations. r=smaug,terrence,jdm,roc,khuey 2014-10-07 10:44:07 -07:00
Andrea Marchesini
2f672ff2db Bug 1047483 - patch 3 - Renaming DOMFile to File, r=ehsan
--HG--
rename : content/base/public/nsDOMFile.h => content/base/public/File.h
rename : content/base/src/nsDOMFile.cpp => content/base/src/File.cpp
2014-10-08 17:15:23 +01:00
Andrea Marchesini
2ca496756f Bug 1047483 - patch 1 - Porting DOMFile/DOMBlob to WebIDL, r=bz, r=bkelly, r=bholley 2014-10-08 17:15:22 +01:00
Bill McCloskey
b030bd8399 Bug 1049879 - Remove urgent and rpc message types and replace with message priorities (r=dvander,bent,ehsan) 2014-10-07 21:32:45 -07:00
Carsten "Tomcat" Book
f107ebbec3 Backed out changeset e56bf4ea89fb (bug 1049879) for bustage in emulator debug builds on a CLOSED TREE 2014-10-08 08:03:57 +02:00
Bill McCloskey
f70f11163a Bug 1049879 - Remove urgent and rpc message types and replace with message priorities (r=dvander,bent,ehsan) 2014-10-07 21:32:45 -07:00
Andrew Halberstadt
2da4ee197d Bug 1066735 - Remove root b2g and android specific xpcshell manifests, r=chmanchester 2014-10-07 18:18:28 -04:00
Ben Turner
ac232e9d3a Bug 1075302 - Allow Necko to do main thread I/O on remote blobs, r=khuey. 2014-10-07 12:26:59 -07:00
Ryan VanderMeulen
671d1a817e Backed out 7 changesets (bug 1047483, bug 1079301, bug 1079335) for webplatform test failures.
Backed out changeset 7d06b68c44d0 (bug 1079335)
Backed out changeset 92030169528e (bug 1079301)
Backed out changeset c09d7f95554a (bug 1047483)
Backed out changeset c199f1057d7e (bug 1047483)
Backed out changeset 18830d07884c (bug 1047483)
Backed out changeset e087289ccfbb (bug 1047483)
Backed out changeset 6238ff5d3ed0 (bug 1047483)

CLOSED TREE

--HG--
rename : content/base/public/File.h => content/base/public/nsDOMFile.h
rename : content/base/src/MultipartFileImpl.cpp => content/base/src/nsDOMBlobBuilder.cpp
rename : content/base/src/MultipartFileImpl.h => content/base/src/nsDOMBlobBuilder.h
rename : content/base/src/File.cpp => content/base/src/nsDOMFile.cpp
2014-10-07 13:16:11 -04:00
Andrea Marchesini
e4f682ba94 Bug 1047483 - patch 3 - Renaming DOMFile to File, r=ehsan
--HG--
rename : content/base/public/nsDOMFile.h => content/base/public/File.h
rename : content/base/src/nsDOMFile.cpp => content/base/src/File.cpp
2014-10-07 15:20:55 +01:00
Andrea Marchesini
0e29ce2ea6 Bug 1047483 - patch 1 - Porting DOMFile/DOMBlob to WebIDL, r=bz, r=bkelly, r=bholley 2014-10-07 15:20:52 +01:00
zhoubcfan@163.com
3f8deea4e9 Bug 1076926 - Add windows 10 support to exe manifest. r=jimm 2014-10-04 14:43:01 +09:00
Stephen Pohl
257fe5f2b2 Bug 1075691: The GreD for XPCOM-using subprocesses on OSX needs to change due to the v2 signature changes. r=bsmedberg 2014-10-02 13:19:34 -04:00
Cervantes Yu
35f601d0b8 Bug 1048011: fix a race condition that leaks PProcLoaderParent. r=khuey
--HG--
extra : rebase_source : 18146b718be5d884915216ec453a153e30923f6c
2014-08-11 15:50:20 +08:00
Bill McCloskey
67019bd0ca Bug 1071409 - Eliminate potential CPOW hang (r=dvander) 2014-10-01 09:58:54 -07:00
Patrick Wang (Chih-Kai Wang)
5fe990a57e Bug 1032125: Part 1: Prevent from sending message to Nuwa after Nuwa frozen. r=khuey 2014-09-30 22:12:11 +08:00
Carsten "Tomcat" Book
1f82b2fb58 merge fx-team to mozilla-central a=merge 2014-09-30 15:10:47 +02:00
Ryan VanderMeulen
7420c8422d Merge m-c to fx-team. a=merge 2014-09-29 16:09:22 -04:00
Georg Fritzsche
f5cb898e86 Bug 1069873 - Add counter histogram type. r=froydnj 2014-09-26 17:45:33 +02:00
Stephen Pohl
0abcadeb62 Mac v2 signing - Bug 1059504 - Avoid plugin-container from crashing due to the new v2 bundle structure on OSX. r=bsmedberg 2014-09-29 11:51:17 -07:00
Stephen Pohl
b8761ffa6f Mac v2 signing - Bug 1050944 - Get Firefox to launch and run on OSX with the new .app bundle structure, made necessary by Apple's v2 signatures. r=smichaud, r=ted, sr=bsmedberg 2014-09-29 11:51:04 -07:00
Ben Turner
141df104d6 Bug 994190 - 'Modify main-thread IndexedDB to use PBackground', r=khuey. 2014-09-26 16:21:57 -07:00
Cervantes Yu
e8f6bd690e Bug 1051633: Make sure magic file descriptors in the content process will not be taken for other uses. r=khuey
--HG--
extra : rebase_source : 5e2dedb855dd5e0e6637d6f42c80c69df8081971
2014-09-30 00:00:00 +08:00
Aaron Klotz
f7fb1297c2 Bug 1072752: Make Chromium UI message loops for Windows call into WinUtils::WaitForMessage; r=jimm 2014-09-25 12:39:15 -06:00
Carsten "Tomcat" Book
08a692af54 Backed out changeset 1e25cd3e8219 (bug 1051633) for B2G ICS Emulator Opt m4 test failures 2014-09-24 11:28:37 +02:00
Cervantes Yu
a1663f5599 Bug 1051633: Make sure magic file descriptors in the content process will not be taken for other uses. r=khuey
--HG--
extra : rebase_source : 2c9baf6ac87744d7049c90284990c0aa48e0f058
2014-08-15 17:19:05 +08:00
Josh Aas
85b1d4a830 Bug 1071808: Remove Chromium lazy_instance from IPC code. r=nfroyd 2014-09-23 22:31:35 -05:00
Edwin Flores
bf6211a677 Bug 1039886 - Make ProcessKill signal SIGKILL only if the child still exists r=bsmedberg 2014-09-24 10:04:48 +12:00
Carsten "Tomcat" Book
477171c3f3 merge mozilla-inbound to mozilla-central a=merge 2014-09-22 12:58:26 +02:00
Carsten "Tomcat" Book
aa9eb4673e Backed out changeset 0b73bd6d5d9c (bug 1032125) for causing regressions 2014-09-22 12:45:48 +02:00
Josh Aas
1b3d3f7c47 Bug 1063318: Switch Chromium IPC code to Mozilla's ref/auto ptr types. Also fix thread safety bug. r=nfroyd 2014-09-19 13:17:17 -05:00
Patrick Wang (Chih-Kai Wang)
092a7ba0d7 Bug 1032125: Part 1: Prevent from sending message to Nuwa after Nuwa frozen. r=khuey 2014-09-19 17:11:15 +08:00
Shian-Yow Wu
b1c9c39a68 Bug 1054598 - Don't assert when invalid file descriptor received. r=jduell 2014-09-19 15:29:36 +08:00
Wes Kocher
93c2bf5d43 Backed out changeset d77733726cae (bug 1063318) for b2g mochitest leaks 2014-09-18 16:30:33 -07:00
Josh Aas
22a272981e Bug 1063318: Switch Chromium IPC code to Mozilla's ref/auto ptr types. Also fix thread safety bug. r=nfroyd 2014-09-18 15:52:59 -05:00
Carsten "Tomcat" Book
0b016814ef Backed out changeset 78b119af926a (bug 1032125) for bustage on B2g non-unified builds on a CLOSED TREE 2014-09-18 15:14:19 +02:00
Patrick Wang (Chih-Kai Wang)
7971ada57a Bug 1032125: Part 1: Prevent from sending message to Nuwa after Nuwa frozen. r=khuey 2014-09-18 10:29:13 +08:00
Ben Turner
26edfb8667 Backout bug 994190 and merge over some stuff that landed afterwards on a CLOSED TREE. 2014-09-17 19:36:01 -04:00
Bobby Holley
8dae0fc8ce Bug 1070696 - Rename xpc::GetNativeForGlobal to xpc::NativeGlobal and make it accept non-global JSObjects. r=smaug
The method is infallible, and making the callers invoke
js::GetGlobalForObjectCrossCompartment manually is dumb.
2014-09-21 21:31:53 +02:00
Jim Chen
b05309c234 Bug 1067513 - Import updated base::LazyInstance from upstream; r=bsmedberg
This patch imports the following files from upstream, and adapts them to the
in-tree fork at ipc/chromium,

* src/base/lazy_instance.cc
* src/base/lazy_instance.h

The updated code fixes several issues with LazyInstance [1-4]. LazyInstance
usages are also updated to reflect changes in the class interface.

[1] https://code.google.com/p/chromium/issues/detail?id=28749
[2] https://code.google.com/p/chromium/issues/detail?id=64930
[3] https://code.google.com/p/chromium/issues/detail?id=65298
[4] https://code.google.com/p/chromium/issues/detail?id=82122
2014-09-17 12:59:21 -04:00
Ben Turner
b3c31c0c49 Bug 994190 - 'Modify main-thread IndexedDB to use PBackground', r=khuey.
--HG--
rename : dom/indexedDB/ipc/SerializationHelpers.h => dom/indexedDB/SerializationHelpers.h
rename : dom/indexedDB/ipc/unit/head.js => dom/indexedDB/test/unit/xpcshell-head-child-process.js
rename : dom/indexedDB/test/unit/head.js => dom/indexedDB/test/unit/xpcshell-head-parent-process.js
rename : dom/ipc/Blob.h => dom/ipc/BlobParent.h
rename : dom/ipc/FileDescriptorSetChild.cpp => ipc/glue/FileDescriptorSetChild.cpp
rename : dom/ipc/FileDescriptorSetChild.h => ipc/glue/FileDescriptorSetChild.h
rename : dom/ipc/FileDescriptorSetParent.cpp => ipc/glue/FileDescriptorSetParent.cpp
rename : dom/ipc/FileDescriptorSetParent.h => ipc/glue/FileDescriptorSetParent.h
rename : dom/ipc/PFileDescriptorSet.ipdl => ipc/glue/PFileDescriptorSet.ipdl
2014-09-13 12:12:19 -04:00
Jim Mathies
38864d5036 Bug 1060738 - Implement MessagePumpForNonMainUIThreads for Windows, a xpcom compatible subclass of chromium's MessagePumpForUI. r=tabraldes 2014-09-12 09:49:38 -05:00
Carsten "Tomcat" Book
aaf10edcad merge mozilla-inbound to mozilla-central a=merge 2014-09-10 14:59:20 +02:00
Carsten "Tomcat" Book
9682821269 Backed out changeset 0a76964b8d8d (bug 1048011) for causing regression 2014-09-10 14:52:47 +02:00
Ryan VanderMeulen
f6c057a8b4 Merge inbound to m-c. a=merge 2014-09-08 19:10:31 -04:00