NavigationController prototype

content/browser/worker_host/worker_process_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/worker_host/worker_process_host.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 135 matching lines @@
   return process_->Send(message);
 }
 
 bool WorkerProcessHost::Init(int render_process_id) {
   std::string channel_id = process_->GetHost()->CreateChannel();
   if (channel_id.empty())
     return false;
 
 #if defined(OS_LINUX)
   int flags = ChildProcessHost::CHILD_ALLOW_SELF;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugChildren))
+    flags = ChildProcessHost::CHILD_NORMAL;
 #else
   int flags = ChildProcessHost::CHILD_NORMAL;
 #endif
 
   base::FilePath exe_path = ChildProcessHost::GetChildPath(flags);
   if (exe_path.empty())
     return false;
 
   CommandLine* cmd_line = new CommandLine(exe_path);
   cmd_line->AppendSwitchASCII(switches::kProcessType, switches::kWorkerProcess);
@@ skipping 31 matching lines @@
     }
   }
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDebugChildren)) {
     // Look to pass-on the kDebugOnStart flag.
     std::string value = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kDebugChildren);
     if (value.empty() || value == switches::kWorkerProcess) {
       // launches a new xterm, and runs the worker process in gdb, reading
       // optional commands from gdb_chrome file in the working directory.
-      cmd_line->PrependWrapper("xterm -e gdb -x gdb_chrome --args");
+      cmd_line->PrependWrapper("xterm -e gdb --args");
       use_zygote = false;
     }
   }
 #endif
 
   process_->Launch(
 #if defined(OS_WIN)
       new WorkerSandboxedProcessLauncherDelegate,
 #elif defined(OS_POSIX)
       use_zygote,
@@ skipping 70 matching lines @@
       process_->GetData().id, instance.url());
 
   instances_.push_back(instance);
 
   WorkerProcessMsg_CreateWorker_Params params;
   params.url = instance.url();
   params.name = instance.name();
   params.route_id = instance.worker_route_id();
   params.creator_process_id = instance.parent_process_id();
   params.shared_worker_appcache_id = instance.main_resource_appcache_id();
+  params.is_controller = false; // originating from a renderer, so
+                                // definitely not a controller
   Send(new WorkerProcessMsg_CreateWorker(params));
 
   UpdateTitle();
 
   // Walk all pending filters and let them know the worker has been created
   // (could be more than one in the case where we had to queue up worker
   // creation because the worker process limit was reached).
   for (WorkerInstance::FilterList::const_iterator i =
            instance.filters().begin();
        i != instance.filters().end(); ++i) {
@@ skipping 171 matching lines @@
 
     // SocketStreamDispatcherHost should be notified now that the worker
     // process will shutdown soon.
     socket_stream_dispatcher_host_->Shutdown();
     socket_stream_dispatcher_host_ = NULL;
   }
 }
 
 void WorkerProcessHost::FilterShutdown(WorkerMessageFilter* filter) {
   for (Instances::iterator i = instances_.begin(); i != instances_.end();) {
-    bool shutdown = false;
+    if (i->is_embedded_worker_) {
+      ++i;
+      continue;
+    }
     i->RemoveFilters(filter);
-
     i->worker_document_set()->RemoveAll(filter);
     if (i->worker_document_set()->IsEmpty()) {
-      shutdown = true;
-    }
-    if (shutdown) {
       Send(new WorkerMsg_TerminateWorkerContext(i->worker_route_id()));
       i = instances_.erase(i);
     } else {
       ++i;
     }
   }
   ShutdownSocketStreamDispatcherHostIfNecessary();
 }
 
 bool WorkerProcessHost::CanShutdown() {
@@ skipping 31 matching lines @@
     display_title += *i;
   }
 
   process_->SetName(UTF8ToUTF16(display_title));
 }
 
 void WorkerProcessHost::DocumentDetached(WorkerMessageFilter* filter,
                                          unsigned long long document_id) {
   // Walk all instances and remove the document from their document set.
   for (Instances::iterator i = instances_.begin(); i != instances_.end();) {
+    if (i->is_embedded_worker_) {
+      ++i;
+      continue;
+    }
     i->worker_document_set()->Remove(filter, document_id);
     if (i->worker_document_set()->IsEmpty()) {
       // This worker has no more associated documents - shut it down.
       Send(new WorkerMsg_TerminateWorkerContext(i->worker_route_id()));
       i = instances_.erase(i);
     } else {
       ++i;
     }
   }
   ShutdownSocketStreamDispatcherHostIfNecessary();
@@ skipping 160 matching lines @@
   return false;
 }
 
 WorkerProcessHost::WorkerInstance::FilterInfo
 WorkerProcessHost::WorkerInstance::GetFilter() const {
   DCHECK(NumFilters() == 1);
   return *filters_.begin();
 }
 
 }  // namespace content