Fix SetParent for Pepper

content/common/gpu/gpu_command_buffer_stub.cc

 // Copyright (c) 2011 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.
 
 #if defined(ENABLE_GPU)
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/process_util.h"
 #include "base/shared_memory.h"
@@ skipping 28 matching lines @@
     : channel_(channel),
       handle_(handle),
       initial_size_(size),
       disallowed_extensions_(disallowed_extensions),
       allowed_extensions_(allowed_extensions),
       requested_attribs_(attribs),
       route_id_(route_id),
       last_flush_count_(0),
       renderer_id_(renderer_id),
       render_view_id_(render_view_id),
+      parent_stub_for_initialization_(),
+      parent_texture_for_initialization_(0),
       watchdog_(watchdog),
       task_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 GpuCommandBufferStub::~GpuCommandBufferStub() {
   if (scheduler_.get()) {
     scheduler_->Destroy();
   }
 
   GpuChannelManager* gpu_channel_manager = channel_->gpu_channel_manager();
@@ skipping 105 matching lines @@
             NewCallback(this,
                         &GpuCommandBufferStub::SwapBuffersCallback));
       }
 #endif  // defined(OS_MACOSX)
 
       // Set up a pathway for resizing the output window or framebuffer at the
       // right time relative to other GL commands.
       scheduler_->SetResizeCallback(
           NewCallback(this, &GpuCommandBufferStub::ResizeCallback));
 
+      if (parent_stub_for_initialization_) {
+        scheduler_->SetParent(parent_stub_for_initialization_->scheduler_.get(),
+                              parent_texture_for_initialization_);
+        parent_stub_for_initialization_.reset();
+        parent_texture_for_initialization_ = 0;
+      }
+
       result = true;
     } else {
       scheduler_.reset();
       command_buffer_.reset();
     }
   }
 
   GpuCommandBufferMsg_Initialize::WriteReplyParams(reply_message, result);
   Send(reply_message);
 }
 
 void GpuCommandBufferStub::OnSetParent(int32 parent_route_id,
                                        uint32 parent_texture_id,
                                        IPC::Message* reply_message) {
-  bool result = false;
 
-  if (parent_route_id == MSG_ROUTING_NONE) {
-    result = scheduler_->SetParent(NULL, 0);
-  } else {
-    GpuCommandBufferStub* parent_stub = channel_->LookupCommandBuffer(
-        parent_route_id);
-    if (parent_stub) {
-      result = scheduler_->SetParent(parent_stub->scheduler_.get(),
-                                     parent_texture_id);
-    }
+  GpuCommandBufferStub* parent_stub = NULL;
+  if (parent_route_id != MSG_ROUTING_NONE) {
+    parent_stub = channel_->LookupCommandBuffer(parent_route_id);
   }
 
+  bool result = true;
+  if (scheduler_.get()) {
+    gpu::GpuScheduler* parent_scheduler =
+        parent_stub ? parent_stub->scheduler_.get() : NULL;
+    result = scheduler_->SetParent(parent_scheduler, parent_texture_id);
+  } else {
+    // If we don't have a scheduler, it means that Initialize hasn't been called
+    // yet. Keep around the requested parent stub and texture so that we can set
+    // it in Initialize().
+    parent_stub_for_initialization_ = parent_stub ?
+        parent_stub->AsWeakPtr() : base::WeakPtr<GpuCommandBufferStub>();
+    parent_texture_for_initialization_ = parent_texture_id;
+  }
   GpuCommandBufferMsg_SetParent::WriteReplyParams(reply_message, result);
   Send(reply_message);
 }
 
 void GpuCommandBufferStub::OnGetState(IPC::Message* reply_message) {
   gpu::CommandBuffer::State state = command_buffer_->GetState();
   if (state.error == gpu::error::kLostContext &&
       gfx::GLContext::LosesAllContextsOnContextLost())
     channel_->LoseAllContexts();
 
@@ skipping 269 matching lines @@
       gfx::GLContext::LosesAllContextsOnContextLost()) {
     channel_->LoseAllContexts();
   } else {
     IPC::Message* msg = new GpuCommandBufferMsg_UpdateState(route_id_, state);
     msg->set_unblock(true);
     Send(msg);
   }
 }
 
 #endif  // defined(ENABLE_GPU)