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

Unified Diff: content/common/gpu/gpu_command_buffer_stub.cc

Issue 15798014: Replace context parenting by sharing through mailboxes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 7 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
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.h ('k') | content/common/gpu/gpu_messages.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index de9caf7869c4a19e4c3c122b7979aca4301c59a0..468506154a7d19d03d37d77067217b6262afc5b8 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -24,6 +24,7 @@
#include "content/public/common/content_switches.h"
#include "gpu/command_buffer/common/constants.h"
#include "gpu/command_buffer/common/gles2_cmd_utils.h"
+#include "gpu/command_buffer/common/mailbox.h"
#include "gpu/command_buffer/service/gl_context_virtual.h"
#include "gpu/command_buffer/service/gl_state_restorer_impl.h"
#include "gpu/command_buffer/service/logger.h"
@@ -181,8 +182,8 @@ bool GpuCommandBufferStub::OnMessageReceived(const IPC::Message& message) {
OnInitialize);
IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_SetGetBuffer,
OnSetGetBuffer);
- IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_SetParent,
- OnSetParent);
+ IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_ProduceFrontBuffer,
+ OnProduceFrontBuffer);
IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_Echo, OnEcho);
IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_GetState, OnGetState);
IPC_MESSAGE_HANDLER_DELAY_REPLY(GpuCommandBufferMsg_GetStateFast,
@@ -578,23 +579,13 @@ void GpuCommandBufferStub::OnSetGetBuffer(int32 shm_id,
Send(reply_message);
}
-void GpuCommandBufferStub::OnSetParent(int32 parent_route_id,
- uint32 parent_texture_id,
- IPC::Message* reply_message) {
+void GpuCommandBufferStub::OnProduceFrontBuffer(const gpu::Mailbox& mailbox) {
TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnSetParent");
apatrick_chromium 2013/06/04 20:37:51 GpuCommandBufferStub::OnSetParent -> GpuCommandBuf
piman 2013/06/04 23:55:29 Done.
- GpuCommandBufferStub* parent_stub = NULL;
- if (parent_route_id != MSG_ROUTING_NONE) {
- parent_stub = channel_->LookupCommandBuffer(parent_route_id);
- }
+ if (!decoder_)
+ LOG(ERROR) << "Can't produce front buffer before initialization.";
- bool result = false;
- if (scheduler_) {
- gpu::gles2::GLES2Decoder* parent_decoder =
- parent_stub ? parent_stub->decoder_.get() : NULL;
- result = decoder_->SetParent(parent_decoder, parent_texture_id);
- }
- GpuCommandBufferMsg_SetParent::WriteReplyParams(reply_message, result);
- Send(reply_message);
+ if (!decoder_->ProduceFrontBuffer(mailbox))
+ LOG(ERROR) << "Failed to produce front buffer.";
}
void GpuCommandBufferStub::OnGetState(IPC::Message* reply_message) {
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.h ('k') | content/common/gpu/gpu_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698