summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 22:39:31 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-07 22:39:31 +0000
commit00614a87478e404184cab3a521ec6fd1cdbd5b8e (patch)
tree942a0e06f02abbbc2403fe5b6e34241631e1164d /content
parent8585f5c478e5d716a31f444330f3590a0702be6f (diff)
downloadchromium_src-00614a87478e404184cab3a521ec6fd1cdbd5b8e.zip
chromium_src-00614a87478e404184cab3a521ec6fd1cdbd5b8e.tar.gz
chromium_src-00614a87478e404184cab3a521ec6fd1cdbd5b8e.tar.bz2
Move HostAllocateSharedMemoryBuffer to content::RenderThread now that we have an interface.
BUG=98716 Review URL: http://codereview.chromium.org/8199018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104585 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/public/renderer/render_thread.h6
-rw-r--r--content/renderer/render_thread_impl.cc7
-rw-r--r--content/renderer/render_thread_impl.h3
-rw-r--r--content/renderer/render_view.cc7
-rw-r--r--content/renderer/render_view.h5
5 files changed, 15 insertions, 13 deletions
diff --git a/content/public/renderer/render_thread.h b/content/public/renderer/render_thread.h
index 3f1e964..a7659e4 100644
--- a/content/public/renderer/render_thread.h
+++ b/content/public/renderer/render_thread.h
@@ -6,6 +6,7 @@
#define CONTENT_PUBLIC_RENDERER_RENDER_THREAD_H_
#include "base/basictypes.h"
+#include "base/shared_memory.h"
#include "content/common/content_export.h"
#include "ipc/ipc_channel_proxy.h"
@@ -68,6 +69,11 @@ class CONTENT_EXPORT RenderThread : public IPC::Message::Sender {
// Helper function to send over a string to be recorded by user metrics
virtual void RecordUserMetrics(const std::string& action) = 0;
+ // Asks the host to create a block of shared memory for the renderer.
+ // The shared memory handle allocated by the host is returned back.
+ virtual base::SharedMemoryHandle HostAllocateSharedMemoryBuffer(
+ uint32 buffer_size) = 0;
+
// Registers the given V8 extension with WebKit.
virtual void RegisterExtension(v8::Extension* extension) = 0;
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 556ffaa..7ffa01f 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -517,6 +517,13 @@ void RenderThreadImpl::RecordUserMetrics(const std::string& action) {
Send(new ViewHostMsg_UserMetricsRecordAction(action));
}
+base::SharedMemoryHandle RenderThreadImpl::HostAllocateSharedMemoryBuffer(
+ uint32 buffer_size) {
+ base::SharedMemoryHandle mem_handle;
+ Send(new ViewHostMsg_AllocateSharedMemoryBuffer(buffer_size, &mem_handle));
+ return mem_handle;
+}
+
void RenderThreadImpl::RegisterExtension(v8::Extension* extension) {
WebScriptController::registerExtension(extension);
v8_extensions_.insert(extension->name());
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 7da8d30..092dcb4 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -11,7 +11,6 @@
#include <vector>
#include "base/observer_list.h"
-#include "base/shared_memory.h"
#include "base/time.h"
#include "base/timer.h"
#include "build/build_config.h"
@@ -110,6 +109,8 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread,
virtual void WidgetRestored() OVERRIDE;
virtual void EnsureWebKitInitialized() OVERRIDE;
virtual void RecordUserMetrics(const std::string& action) OVERRIDE;
+ virtual base::SharedMemoryHandle HostAllocateSharedMemoryBuffer(
+ uint32 buffer_size) OVERRIDE;
virtual void RegisterExtension(v8::Extension* extension) OVERRIDE;
virtual bool IsRegisteredExtension(
const std::string& v8_extension_name) const OVERRIDE;
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index e482ac4..a9bcb65 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -567,13 +567,6 @@ bool RenderView::GetPluginInfo(const GURL& url,
return found;
}
-base::SharedMemoryHandle RenderView::HostAllocateSharedMemoryBuffer(
- uint32 buffer_size) {
- base::SharedMemoryHandle mem_handle;
- Send(new ViewHostMsg_AllocateSharedMemoryBuffer(buffer_size, &mem_handle));
- return mem_handle;
-}
-
bool RenderView::OnMessageReceived(const IPC::Message& message) {
WebFrame* main_frame = webview() ? webview()->mainFrame() : NULL;
if (main_frame)
diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h
index 682707b..4f229d34 100644
--- a/content/renderer/render_view.h
+++ b/content/renderer/render_view.h
@@ -350,11 +350,6 @@ class RenderView : public RenderWidget,
webkit::WebPluginInfo* plugin_info,
std::string* actual_mime_type);
- // Asks the host to create a block of shared memory for the renderer.
- // The shared memory handle allocated by the host is returned back.
- CONTENT_EXPORT base::SharedMemoryHandle HostAllocateSharedMemoryBuffer(
- uint32 buffer_size);
-
// IPC::Channel::Listener implementation -------------------------------------
virtual bool OnMessageReceived(const IPC::Message& msg);