Fix SetParent for Pepper

content/common/gpu/gpu_command_buffer_stub.h

Index: content/common/gpu/gpu_command_buffer_stub.h
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index 1b8e3c485cf7278474da8318035d98c7b479b334..263dc434be570ca57aa1db4c794b5240a5168c2a 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -140,6 +140,11 @@ class GpuCommandBufferStub
   scoped_ptr<gpu::GpuScheduler> scheduler_;
   std::queue<IPC::Message*> deferred_messages_;
 
+  // SetParent may be called before Initialize, in which case we need to keep
+  // around the parent stub, so that Initialize can set the parent correctly.
+  base::WeakPtr<GpuCommandBufferStub> parent_stub_for_initialization_;
+  uint32 parent_texture_for_initialization_;
+
   GpuWatchdog* watchdog_;
   ScopedRunnableMethodFactory<GpuCommandBufferStub> task_factory_;