Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Unified Diff: trunk/src/components/nacl/browser/nacl_process_host.cc

Issue 290633006: Revert 270907 "Remove knowledge of nacl from content." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/components/nacl/browser/nacl_process_host.cc
===================================================================
--- trunk/src/components/nacl/browser/nacl_process_host.cc (revision 270923)
+++ trunk/src/components/nacl/browser/nacl_process_host.cc (working copy)
@@ -312,7 +312,6 @@
} else {
LOG(ERROR) << message;
}
- NaClBrowser::GetInstance()->OnProcessEnd(process_->GetData().id);
}
if (internal_->socket_for_renderer != NACL_INVALID_HANDLE) {
@@ -352,7 +351,6 @@
// 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::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::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)
« no previous file with comments | « trunk/src/components/nacl/browser/nacl_process_host.h ('k') | trunk/src/content/browser/browser_child_process_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698