summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-05 03:07:07 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-05 03:07:07 +0000
commit4049046a39cb364577a1ac8a2aac47a86afc5b7b (patch)
treee670e88f432ee925b7b89994eff756052739af60 /chrome/plugin
parent07a174f4c159a347c6d7e10a5f3da2d5966c92d1 (diff)
downloadchromium_src-4049046a39cb364577a1ac8a2aac47a86afc5b7b.zip
chromium_src-4049046a39cb364577a1ac8a2aac47a86afc5b7b.tar.gz
chromium_src-4049046a39cb364577a1ac8a2aac47a86afc5b7b.tar.bz2
linux: implement gpu plugin
Review URL: http://codereview.chromium.org/500132 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35509 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/command_buffer_stub.cc8
-rw-r--r--chrome/plugin/command_buffer_stub.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/plugin/command_buffer_stub.cc b/chrome/plugin/command_buffer_stub.cc
index d7dbf9f..4a9dd5c 100644
--- a/chrome/plugin/command_buffer_stub.cc
+++ b/chrome/plugin/command_buffer_stub.cc
@@ -11,9 +11,9 @@
using gpu::Buffer;
CommandBufferStub::CommandBufferStub(PluginChannel* channel,
- gfx::NativeView view)
+ gfx::PluginWindowHandle window)
: channel_(channel),
- view_(view) {
+ window_(window) {
route_id_ = channel->GenerateRouteID();
channel->AddRoute(route_id_, this, false);
}
@@ -54,7 +54,7 @@ void CommandBufferStub::OnInitialize(int32 size,
Buffer buffer = command_buffer_->GetRingBuffer();
if (buffer.shared_memory) {
processor_ = new gpu::GPUProcessor(command_buffer_.get());
- if (processor_->Initialize(view_)) {
+ if (processor_->Initialize(window_)) {
command_buffer_->SetPutOffsetChangeCallback(
NewCallback(processor_.get(),
&gpu::GPUProcessor::ProcessCommands));
@@ -93,7 +93,7 @@ void CommandBufferStub::OnGetTransferBuffer(
int32 id,
base::SharedMemoryHandle* transfer_buffer,
size_t* size) {
- *transfer_buffer = 0;
+ *transfer_buffer = base::SharedMemoryHandle();
*size = 0;
// Assume service is responsible for duplicating the handle to the calling
diff --git a/chrome/plugin/command_buffer_stub.h b/chrome/plugin/command_buffer_stub.h
index c7d765e..4608d0e 100644
--- a/chrome/plugin/command_buffer_stub.h
+++ b/chrome/plugin/command_buffer_stub.h
@@ -21,7 +21,7 @@ class CommandBufferService;
class CommandBufferStub : public IPC::Channel::Listener,
public IPC::Message::Sender {
public:
- CommandBufferStub(PluginChannel* channel, gfx::NativeView view);
+ CommandBufferStub(PluginChannel* channel, gfx::PluginWindowHandle window);
virtual ~CommandBufferStub();
@@ -50,7 +50,7 @@ class CommandBufferStub : public IPC::Channel::Listener,
void OnGetErrorStatus(bool* error_status);
scoped_refptr<PluginChannel> channel_;
- gfx::NativeView view_;
+ gfx::PluginWindowHandle window_;
int route_id_;
scoped_ptr<gpu::CommandBufferService> command_buffer_;
scoped_refptr<gpu::GPUProcessor> processor_;