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

Unified Diff: chrome/browser/resource_dispatcher_host.cc

Issue 10895: Add Terminate() to the Process object, have RenderProcessHost use this to avo... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month 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
« no previous file with comments | « chrome/browser/render_process_host.cc ('k') | chrome/browser/resource_message_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resource_dispatcher_host.cc
===================================================================
--- chrome/browser/resource_dispatcher_host.cc (revision 5371)
+++ chrome/browser/resource_dispatcher_host.cc (working copy)
@@ -121,7 +121,7 @@
read_buffer_.reset(spare_read_buffer_);
spare_read_buffer_ = NULL;
} else {
- read_buffer_.reset(new SharedMemory);
+ read_buffer_.reset(new base::SharedMemory);
if (!read_buffer_->Create(std::wstring(), false, false, kReadBufSize))
return false;
if (!read_buffer_->Map(kReadBufSize))
@@ -142,7 +142,7 @@
return true;
}
- SharedMemoryHandle handle;
+ base::SharedMemoryHandle handle;
if (!read_buffer_->GiveToProcess(render_process_, &handle)) {
// We wrongfully incremented the pending data count. Fake an ACK message
// to fix this. We can't move this call above the WillSendData because
@@ -175,17 +175,19 @@
// When reading, we don't know if we are going to get EOF (0 bytes read), so
// we typically have a buffer that we allocated but did not use. We keep
// this buffer around for the next read as a small optimization.
- static SharedMemory* spare_read_buffer_;
+ static base::SharedMemory* spare_read_buffer_;
- scoped_ptr<SharedMemory> read_buffer_;
+ scoped_ptr<base::SharedMemory> read_buffer_;
ResourceDispatcherHost::Receiver* receiver_;
int render_process_host_id_;
int routing_id_;
HANDLE render_process_;
ResourceDispatcherHost* rdh_;
};
-SharedMemory* ResourceDispatcherHost::AsyncEventHandler::spare_read_buffer_;
+base::SharedMemory*
+ ResourceDispatcherHost::AsyncEventHandler::spare_read_buffer_;
+
// ----------------------------------------------------------------------------
// ResourceDispatcherHost::SyncEventHandler
« no previous file with comments | « chrome/browser/render_process_host.cc ('k') | chrome/browser/resource_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698