diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 04:32:15 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-16 04:32:15 +0000 |
| commit | a15e0fe22157dcae44269d3de74d3ded101dca7d (patch) | |
| tree | a3cefe1dd19c94a9ef183e210e5bdc3706ac9b65 /components/nacl/browser/nacl_process_host.cc | |
| parent | d241de737bcffdf92c916afd4aca82ca55a036cd (diff) | |
| download | chromium_src-a15e0fe22157dcae44269d3de74d3ded101dca7d.zip chromium_src-a15e0fe22157dcae44269d3de74d3ded101dca7d.tar.gz chromium_src-a15e0fe22157dcae44269d3de74d3ded101dca7d.tar.bz2 | |
Revert 270907 "Remove knowledge of nacl from content."
> Remove knowledge of nacl from content.
>
> Content should not have knowledge of NaCl. Moving per process NaCl debug
> stub port information to NaClBrowser.
>
> More explicitly distiquish between the case where the debug port is not yet
> known versus when it is unused.
>
> Switch debug port to being a per-process value (as it is).
>
> BUG=None
> TEST=trybots
> R=jam@chromium.org
>
> Review URL: https://codereview.chromium.org/286993006
This caused the compile to fail on the TSAN v2 bot:
http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Builder%20%28TSan%20v2%29/builds/19971
TBR=bradnelson@google.com
Review URL: https://codereview.chromium.org/290633006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/nacl/browser/nacl_process_host.cc')
| -rw-r--r-- | components/nacl/browser/nacl_process_host.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc index 7451fe6..c48a71d 100644 --- a/components/nacl/browser/nacl_process_host.cc +++ b/components/nacl/browser/nacl_process_host.cc @@ -312,7 +312,6 @@ NaClProcessHost::~NaClProcessHost() { } else { LOG(ERROR) << message; } - NaClBrowser::GetInstance()->OnProcessEnd(process_->GetData().id); } if (internal_->socket_for_renderer != NACL_INVALID_HANDLE) { @@ -352,7 +351,6 @@ void NaClProcessHost::OnProcessCrashed(int exit_status) { // static void NaClProcessHost::EarlyStartup() { NaClBrowser::GetInstance()->EarlyStartup(); - // Inform NaClBrowser that we exist and will have a debug port at some point. #if defined(OS_LINUX) && !defined(OS_CHROMEOS) // Open the IRT file early to make sure that it isn't replaced out from // under us by autoupdate. @@ -493,7 +491,6 @@ void NaClProcessHost::OnChannelConnected(int32 peer_pid) { void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) { process_launched_by_broker_ = true; process_->SetHandle(handle); - SetDebugStubPort(nacl::kGdbDebugStubPortUnknown); if (!StartWithLaunchedProcess()) delete this; } @@ -769,9 +766,13 @@ void NaClProcessHost::SendMessageToRenderer( } } -void NaClProcessHost::SetDebugStubPort(int port) { +void NaClProcessHost::SetDebugStubPort(uint16_t port) { NaClBrowser* nacl_browser = NaClBrowser::GetInstance(); - nacl_browser->SetProcessGdbDebugStubPort(process_->GetData().id, port); + if (nacl_browser->HasGdbDebugStubPortListener()) { + nacl_browser->FireGdbDebugStubPortOpened(port); + } + // Set debug stub port on the process object. + process_->SetNaClDebugStubPort(port); } #if defined(OS_POSIX) |