cc: DCHECK if SDOS::SwapBuffersComplete is called prematurely

This is for debugging purposes only and will be reverted
soon.

BUG=495650
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1175703004

Cr-Commit-Position: refs/heads/master@{#333667}

cc/scheduler/scheduler.cc

@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "base/auto_reset.h"
+#include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
@@ -226,7 +227,8 @@ void Scheduler::DidSwapBuffers() {
 }
 
 void Scheduler::DidSwapBuffersComplete() {
-  DCHECK_GT(state_machine_.pending_swaps(), 0) << AsValue()->ToString();
+  DCHECK_GT(state_machine_.pending_swaps(), 0)
+      << AsValue()->ToString() << base::debug::StackTrace().ToString();
   state_machine_.DidSwapBuffersComplete();
   ProcessScheduledActions();
 }

cc/surfaces/surface_display_output_surface.cc

@@ -5,6 +5,7 @@
 #include "cc/surfaces/surface_display_output_surface.h"
 
 #include "base/bind.h"
+#include "base/debug/stack_trace.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/surfaces/display.h"
@@ -21,7 +22,8 @@ SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface(
     : OutputSurface(context_provider),
       display_client_(NULL),
       factory_(surface_manager, this),
-      allocator_(allocator) {
+      allocator_(allocator),
+      inside_swap_buffers_(0) {
   factory_.set_needs_sync_points(false);
   capabilities_.delegated_rendering = true;
   capabilities_.max_frames_pending = 1;
@@ -46,26 +48,36 @@ void SurfaceDisplayOutputSurface::ReceivedVSyncParameters(
 }
 
 void SurfaceDisplayOutputSurface::SwapBuffers(CompositorFrame* frame) {
+  inside_swap_buffers_ = 1;
+
   gfx::Size frame_size =
       frame->delegated_frame_data->render_pass_list.back()->output_rect.size();
   if (frame_size.IsEmpty() || frame_size != display_size_) {
+    inside_swap_buffers_ = 2;
     if (!surface_id_.is_null()) {
       factory_.Destroy(surface_id_);
     }
+    inside_swap_buffers_ = 3;
     surface_id_ = allocator_->GenerateId();
     factory_.Create(surface_id_);
     display_size_ = frame_size;
   }
+  inside_swap_buffers_ = 4;
   display_client_->display()->SetSurfaceId(surface_id_,
                                            frame->metadata.device_scale_factor);
 
+  inside_swap_buffers_ = 5;
   scoped_ptr<CompositorFrame> frame_copy(new CompositorFrame());
+  inside_swap_buffers_ = 6;
   frame->AssignTo(frame_copy.get());
+  inside_swap_buffers_ = 7;
   factory_.SubmitFrame(
       surface_id_, frame_copy.Pass(),
       base::Bind(&SurfaceDisplayOutputSurface::SwapBuffersComplete,
                  base::Unretained(this)));
 
+  inside_swap_buffers_ = 0;
+
   client_->DidSwapBuffers();
 }
 
@@ -92,6 +104,7 @@ void SurfaceDisplayOutputSurface::ReturnResources(
 }
 
 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) {
+  DCHECK_EQ(0, inside_swap_buffers_) << base::debug::StackTrace().ToString();
   if (client_ && !display_client_->output_surface_lost())
     client_->DidSwapBuffersComplete();
 }

cc/surfaces/surface_display_output_surface.h

@@ -54,6 +54,9 @@ class CC_SURFACES_EXPORT SurfaceDisplayOutputSurface
   SurfaceId surface_id_;
   SurfaceIdAllocator* allocator_;
 
+  // TODO(brianderson): Remove this after solving crbug.com/495650
+  int inside_swap_buffers_;
+
   DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface);
 };