Revert of Add DisplayScheduler for Surfaces

cc/surfaces/display.cc

 // Copyright 2014 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/surfaces/display.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/software_renderer.h"
 #include "cc/resources/texture_mailbox_deleter.h"
 #include "cc/surfaces/display_client.h"
-#include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_aggregator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/trees/blocking_task_runner.h"
 
 namespace cc {
 
 Display::Display(DisplayClient* client,
                  SurfaceManager* manager,
                  SharedBitmapManager* bitmap_manager,
                  gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
                  const RendererSettings& settings)
     : client_(client),
       manager_(manager),
       bitmap_manager_(bitmap_manager),
       gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
       settings_(settings),
       device_scale_factor_(1.f),
-      scheduler_(nullptr),
       blocking_main_thread_task_runner_(
           BlockingTaskRunner::Create(base::ThreadTaskRunnerHandle::Get())),
       texture_mailbox_deleter_(
           new TextureMailboxDeleter(base::ThreadTaskRunnerHandle::Get())) {
   manager_->AddObserver(this);
 }
 
 Display::~Display() {
   manager_->RemoveObserver(this);
   if (aggregator_) {
     for (const auto& id_entry : aggregator_->previous_contained_surfaces()) {
       Surface* surface = manager_->GetSurfaceForId(id_entry.first);
       if (surface)
         surface->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED);
     }
   }
 }
 
-bool Display::Initialize(scoped_ptr<OutputSurface> output_surface,
-                         DisplayScheduler* scheduler) {
+bool Display::Initialize(scoped_ptr<OutputSurface> output_surface) {
   output_surface_ = output_surface.Pass();
-  scheduler_ = scheduler;
   return output_surface_->BindToClient(this);
 }
 
 void Display::SetSurfaceId(SurfaceId id, float device_scale_factor) {
-  if (current_surface_id_ == id && device_scale_factor_ == device_scale_factor)
-    return;
-
   current_surface_id_ = id;
   device_scale_factor_ = device_scale_factor;
-
-  UpdateResourcesLockedByBrowser();
-  if (scheduler_)
-    scheduler_->EntireDisplayDamaged();
+  client_->DisplayDamaged();
 }
 
 void Display::Resize(const gfx::Size& size) {
   if (size == current_surface_size_)
     return;
   // Need to ensure all pending swaps have executed before the window is
   // resized, or D3D11 will scale the swap output.
   if (renderer_ && settings_.finish_rendering_on_resize)
     renderer_->Finish();
   current_surface_size_ = size;
-  if (scheduler_)
-    scheduler_->EntireDisplayDamaged();
+  client_->DisplayDamaged();
 }
 
 void Display::InitializeRenderer() {
   if (resource_provider_)
     return;
 
   scoped_ptr<ResourceProvider> resource_provider = ResourceProvider::Create(
       output_surface_.get(), bitmap_manager_, gpu_memory_buffer_manager_,
       blocking_main_thread_task_runner_.get(), settings_.highp_threshold_min,
       settings_.use_rgba_4444_textures,
@@ skipping 15 matching lines @@
       return;
     renderer_ = renderer.Pass();
   }
 
   resource_provider_ = resource_provider.Pass();
   aggregator_.reset(new SurfaceAggregator(manager_, resource_provider_.get()));
 }
 
 void Display::DidLoseOutputSurface() {
   client_->OutputSurfaceLost();
-  if (scheduler_)
-    scheduler_->OutputSurfaceLost();
 }
 
-void Display::UpdateResourcesLockedByBrowser() {
-  Surface* surface = manager_->GetSurfaceForId(current_surface_id_);
-  bool resources_locked_by_browser = !surface || !surface->GetEligibleFrame();
-  if (scheduler_)
-    scheduler_->SetResourcesLockedByBrowser(resources_locked_by_browser);
-}
-
-bool Display::DrawAndSwap() {
+bool Display::Draw() {
   if (current_surface_id_.is_null())
     return false;
 
   InitializeRenderer();
   if (!output_surface_)
     return false;
 
   // TODO(skyostil): We should hold a BlockingTaskRunner::CapturePostTasks
   // while Aggregate is called to immediately run release callbacks afterward.
   scoped_ptr<CompositorFrame> frame =
       aggregator_->Aggregate(current_surface_id_);
   if (!frame)
     return false;
 
-  TRACE_EVENT0("cc", "Display::DrawAndSwap");
+  TRACE_EVENT0("cc", "Display::Draw");
   benchmark_instrumentation::IssueDisplayRenderingStatsEvent();
 
   // Run callbacks early to allow pipelining.
   for (const auto& id_entry : aggregator_->previous_contained_surfaces()) {
     Surface* surface = manager_->GetSurfaceForId(id_entry.first);
     if (surface)
       surface->RunDrawCallbacks(SurfaceDrawStatus::DRAWN);
   }
   DelegatedFrameData* frame_data = frame->delegated_frame_data.get();
 
@@ skipping 36 matching lines @@
                                 frame->metadata.latency_info.begin(),
                                 frame->metadata.latency_info.end());
     DidSwapBuffers();
     DidSwapBuffersComplete();
   }
 
   return true;
 }
 
 void Display::DidSwapBuffers() {
-  if (scheduler_)
-    scheduler_->DidSwapBuffers();
+  client_->DidSwapBuffers();
 }
 
 void Display::DidSwapBuffersComplete() {
-  if (scheduler_)
-    scheduler_->DidSwapBuffersComplete();
+  client_->DidSwapBuffersComplete();
 }
 
 void Display::CommitVSyncParameters(base::TimeTicks timebase,
                                     base::TimeDelta interval) {
   client_->CommitVSyncParameters(timebase, interval);
 }
 
 void Display::SetMemoryPolicy(const ManagedMemoryPolicy& policy) {
   client_->SetMemoryPolicy(policy);
 }
@@ skipping 28 matching lines @@
   NOTREACHED();
 }
 
 void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) {
   if (aggregator_ &&
       aggregator_->previous_contained_surfaces().count(surface_id)) {
     Surface* surface = manager_->GetSurfaceForId(surface_id);
     if (surface) {
       const CompositorFrame* current_frame = surface->GetEligibleFrame();
       if (!current_frame || !current_frame->delegated_frame_data ||
-          !current_frame->delegated_frame_data->resource_list.size()) {
+          !current_frame->delegated_frame_data->resource_list.size())
         aggregator_->ReleaseResources(surface_id);
-      }
     }
-    if (scheduler_)
-      scheduler_->SurfaceDamaged(surface_id);
+    client_->DisplayDamaged();
     *changed = true;
   } else if (surface_id == current_surface_id_) {
-    if (scheduler_)
-      scheduler_->SurfaceDamaged(surface_id);
+    client_->DisplayDamaged();
     *changed = true;
   }
-
-  if (surface_id == current_surface_id_)
-    UpdateResourcesLockedByBrowser();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
+int Display::GetMaxFramesPending() {
+  int max_frames_pending =
+      output_surface_ ? output_surface_->capabilities().max_frames_pending : 0;
+  if (max_frames_pending <= 0)
+    max_frames_pending = OutputSurface::DEFAULT_MAX_FRAMES_PENDING;
+  return max_frames_pending;
+}
+
 }  // namespace cc