Unified OutputSurface::SwapBuffers.

cc/trees/thread_proxy.cc

 // Copyright 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.
 
 #include "cc/trees/thread_proxy.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "cc/base/thread.h"
@@ skipping 1139 matching lines @@
   DCHECK(success);
   DCHECK(capabilities);
 
   layer_tree_host_->DeleteContentsTexturesOnImplThread(
       layer_tree_host_impl_->resource_provider());
 
   *success = layer_tree_host_impl_->InitializeRenderer(output_surface.Pass());
 
   if (*success) {
     *capabilities = layer_tree_host_impl_->GetRendererCapabilities();
-    scheduler_on_impl_thread_->SetSwapBuffersCompleteSupported(
-        capabilities->using_swap_complete_callback);
 
     OutputSurface* output_surface_ptr = layer_tree_host_impl_->output_surface();
     DCHECK(output_surface_ptr);
     int max_frames_pending =
         output_surface_ptr->capabilities().max_frames_pending;
     if (max_frames_pending <= 0)
       max_frames_pending = FrameRateController::DEFAULT_MAX_FRAMES_PENDING;
-    if (output_surface_ptr->capabilities().has_parent_compositor)
-      max_frames_pending = 1;
 
     scheduler_on_impl_thread_->SetMaxFramesPending(max_frames_pending);
 
     scheduler_on_impl_thread_->DidCreateAndInitializeOutputSurface();
   }
 
   DidTryInitializeRendererOnImplThread(*success, offscreen_context_provider);
 
   completion->Signal();
 }
 
 void ThreadProxy::DidTryInitializeRendererOnImplThread(
     bool success,
     scoped_refptr<ContextProvider> offscreen_context_provider) {
   DCHECK(IsImplThread());
   DCHECK(!inside_draw_);
 
   if (offscreen_context_provider.get())
     offscreen_context_provider->BindToCurrentThread();
 
   if (success) {
-    DCHECK_EQ(layer_tree_host_impl_->GetRendererCapabilities()
-                  .using_swap_complete_callback,
-              scheduler_on_impl_thread_->swap_buffers_complete_supported());
     if (layer_tree_host_impl_->resource_provider()) {
       layer_tree_host_impl_->resource_provider()->
           set_offscreen_context_provider(offscreen_context_provider);
     }
   } else if (offscreen_context_provider.get()) {
     offscreen_context_provider->VerifyContexts();
   }
 }
 
 void ThreadProxy::FinishGLOnImplThread(CompletionEvent* completion) {
@@ skipping 178 matching lines @@
       !layer_tree_host_impl_->pending_tree()) {
     TRACE_EVENT_INSTANT0("cc", "ReleaseCommitbyActivation",
                          TRACE_EVENT_SCOPE_THREAD);
     DCHECK(layer_tree_host_impl_->settings().impl_side_painting);
     completion_event_for_commit_held_on_tree_activation_->Signal();
     completion_event_for_commit_held_on_tree_activation_ = NULL;
   }
 }
 
 }  // namespace cc