diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 00:07:25 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 00:07:25 +0000 |
commit | d52d8bff0029726f8f6e21a425b770093b57fa6b (patch) | |
tree | 005774df70f223fd59c0ffafdb23eecadedc2739 /base/mac | |
parent | c553dcdf53ca9d4c14dceab5102b6cada415e494 (diff) | |
download | chromium_src-d52d8bff0029726f8f6e21a425b770093b57fa6b.zip chromium_src-d52d8bff0029726f8f6e21a425b770093b57fa6b.tar.gz chromium_src-d52d8bff0029726f8f6e21a425b770093b57fa6b.tar.bz2 |
Revert 193486 "[Mac] Remove base::LaunchSynchronize and rewrite ..."
> [Mac] Remove base::LaunchSynchronize and rewrite content::MachBroker.
>
> This restructures the way MachBroker parent-child communication happens. Now,
> the MachBroker lock will be held for the duration of LaunchProcess until the
> PID is returned and inserted into the MachMap. Since the lock must also be
> acquired on the broker thread to insert the received task port into the
> MachMap, this ensures that the placeholder is always inserted before the task
> port.
>
> MachBroker has also been rewritten to use Mach IPC directly, rather than the C++
> wrappers in base/mach_ipc_mac.h. The wrappers are not flexible enough to allow
> the use of an audit trailer. This trailer is used to verify the PID of the
> sender of the check in message in the parent. Previously, this was done by
> another kernel trap, pid_for_task.
>
> BUG=179923
>
>
> Review URL: https://chromiumcodereview.appspot.com/13845008
TBR=rsesek@chromium.org
Review URL: https://codereview.chromium.org/14120002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
-rw-r--r-- | base/mac/scoped_mach_port.cc | 5 | ||||
-rw-r--r-- | base/mac/scoped_mach_port.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/base/mac/scoped_mach_port.cc b/base/mac/scoped_mach_port.cc index 9e45a85..652e3f4 100644 --- a/base/mac/scoped_mach_port.cc +++ b/base/mac/scoped_mach_port.cc @@ -11,14 +11,9 @@ ScopedMachPort::ScopedMachPort(mach_port_t port) : port_(port) { } ScopedMachPort::~ScopedMachPort() { - reset(); -} - -void ScopedMachPort::reset(mach_port_t port) { if (port_ != MACH_PORT_NULL) { mach_port_deallocate(mach_task_self(), port_); } - port_ = port; } } // namespace mac diff --git a/base/mac/scoped_mach_port.h b/base/mac/scoped_mach_port.h index cc2ef20..d2aa2f7 100644 --- a/base/mac/scoped_mach_port.h +++ b/base/mac/scoped_mach_port.h @@ -22,8 +22,6 @@ class BASE_EXPORT ScopedMachPort { ~ScopedMachPort(); - void reset(mach_port_t port = MACH_PORT_NULL); - operator mach_port_t() const { return port_; } |