Associate an id with the output surface to handle lost contexts

content/renderer/gpu/compositor_output_surface.cc

 // Copyright (c) 2012 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.
 
 #include "content/renderer/gpu/compositor_output_surface.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
@@ skipping 31 matching lines @@
 #endif
   };
 
   return new IPC::ForwardingMessageFilter(
       messages_to_filter, arraysize(messages_to_filter),
       target_task_runner);
 }
 
 CompositorOutputSurface::CompositorOutputSurface(
     int32 routing_id,
+    uint32 output_surface_id,
     WebGraphicsContext3DCommandBufferImpl* context3D,
     cc::SoftwareOutputDevice* software_device,
     bool use_swap_compositor_frame_message)
     : OutputSurface(scoped_ptr<WebKit::WebGraphicsContext3D>(context3D),
                     make_scoped_ptr(software_device)),
+      output_surface_id_(output_surface_id),
       use_swap_compositor_frame_message_(use_swap_compositor_frame_message),
       output_surface_filter_(
           RenderThreadImpl::current()->compositor_output_surface_filter()),
       routing_id_(routing_id),
       prefers_smoothness_(false),
 #if defined(OS_WIN)
       // TODO(epenner): Implement PlatformThread::CurrentHandle() on windows.
       main_thread_handle_(base::PlatformThreadHandle())
 #else
       main_thread_handle_(base::PlatformThread::CurrentHandle())
@@ skipping 27 matching lines @@
   output_surface_filter_->AddRoute(
       routing_id_,
       base::Bind(&CompositorOutputSurfaceProxy::OnMessageReceived,
                  output_surface_proxy_));
 
   return true;
 }
 
 void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
   if (use_swap_compositor_frame_message_) {
-    Send(new ViewHostMsg_SwapCompositorFrame(routing_id_, *frame));
+    Send(new ViewHostMsg_SwapCompositorFrame(routing_id_,
+                                             output_surface_id_,
+                                             *frame));
     DidSwapBuffers();
     return;
   }
 
   if (frame->gl_frame_data) {
     WebGraphicsContext3DCommandBufferImpl* command_buffer =
         static_cast<WebGraphicsContext3DCommandBufferImpl*>(context3d());
     CommandBufferProxyImpl* command_buffer_proxy =
         command_buffer->GetCommandBufferProxy();
     DCHECK(command_buffer_proxy);
@@ skipping 30 matching lines @@
     Send(new ViewHostMsg_SetNeedsBeginFrame(routing_id_, enable));
   OutputSurface::SetNeedsBeginFrame(enable);
 }
 
 void CompositorOutputSurface::OnBeginFrame(const cc::BeginFrameArgs& args) {
   DCHECK(CalledOnValidThread());
   BeginFrame(args);
 }
 #endif  // defined(OS_ANDROID)
 
-void CompositorOutputSurface::OnSwapAck(const cc::CompositorFrameAck& ack) {
+void CompositorOutputSurface::OnSwapAck(uint32 output_surface_id,
+                                        const cc::CompositorFrameAck& ack) {
+  // Ignore message if it's a stale one coming from a different output surface
+  // (e.g. after a lost context).
+  if (output_surface_id != output_surface_id_)
+    return;
   OnSwapBuffersComplete(&ack);
 }
 
 bool CompositorOutputSurface::Send(IPC::Message* message) {
   return message_sender_->Send(message);
 }
 
 namespace {
 #if defined(OS_ANDROID)
   void SetThreadPriorityToIdle(base::PlatformThreadHandle handle) {
@@ skipping 29 matching lines @@
   // If this is the last surface to stop preferring smoothness,
   // Reset the main thread's priority to the default.
   if (prefers_smoothness_ == true &&
       --g_prefer_smoothness_count == 0) {
     SetThreadPriorityToDefault(main_thread_handle_);
   }
   prefers_smoothness_ = prefers_smoothness;
 }
 
 }  // namespace content