Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Unified Diff: content/browser/compositor/onscreen_display_client.cc

Issue 888783002: Composite to cc::Display from ui::InProcessContextFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/compositor/onscreen_display_client.cc
diff --git a/content/browser/compositor/onscreen_display_client.cc b/content/browser/compositor/onscreen_display_client.cc
deleted file mode 100644
index c0772932321198838e52dccc80cde64643b58ad6..0000000000000000000000000000000000000000
--- a/content/browser/compositor/onscreen_display_client.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-// 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 "content/browser/compositor/onscreen_display_client.h"
-
-#include "base/trace_event/trace_event.h"
-#include "cc/output/output_surface.h"
-#include "cc/surfaces/surface_factory.h"
-#include "cc/surfaces/surface_manager.h"
-#include "content/browser/compositor/surface_display_output_surface.h"
-#include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
-#include "content/common/host_shared_bitmap_manager.h"
-
-namespace content {
-
-OnscreenDisplayClient::OnscreenDisplayClient(
- scoped_ptr<cc::OutputSurface> output_surface,
- cc::SurfaceManager* manager,
- const cc::RendererSettings& settings,
- scoped_refptr<base::SingleThreadTaskRunner> task_runner)
- : output_surface_(output_surface.Pass()),
- display_(new cc::Display(this,
- manager,
- HostSharedBitmapManager::current(),
- BrowserGpuMemoryBufferManager::current(),
- settings)),
- task_runner_(task_runner),
- scheduled_draw_(false),
- output_surface_lost_(false),
- deferred_draw_(false),
- pending_frames_(0),
- weak_ptr_factory_(this) {
-}
-
-OnscreenDisplayClient::~OnscreenDisplayClient() {
-}
-
-bool OnscreenDisplayClient::Initialize() {
- return display_->Initialize(output_surface_.Pass());
-}
-
-void OnscreenDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
- base::TimeDelta interval) {
- surface_display_output_surface_->ReceivedVSyncParameters(timebase, interval);
-}
-
-void OnscreenDisplayClient::DisplayDamaged() {
- if (scheduled_draw_ || deferred_draw_)
- return;
- TRACE_EVENT0("content", "OnscreenDisplayClient::DisplayDamaged");
- if (pending_frames_ >= display_->GetMaxFramesPending()) {
- deferred_draw_ = true;
- } else {
- ScheduleDraw();
- }
-}
-
-void OnscreenDisplayClient::ScheduleDraw() {
- DCHECK(!deferred_draw_);
- DCHECK(!scheduled_draw_);
- scheduled_draw_ = true;
- task_runner_->PostTask(
- FROM_HERE,
- base::Bind(&OnscreenDisplayClient::Draw, weak_ptr_factory_.GetWeakPtr()));
-}
-
-void OnscreenDisplayClient::OutputSurfaceLost() {
- output_surface_lost_ = true;
- surface_display_output_surface_->DidLoseOutputSurface();
-}
-
-void OnscreenDisplayClient::Draw() {
- TRACE_EVENT0("content", "OnscreenDisplayClient::Draw");
- if (output_surface_lost_)
- return;
- scheduled_draw_ = false;
- display_->Draw();
-}
-
-void OnscreenDisplayClient::DidSwapBuffers() {
- pending_frames_++;
-}
-
-void OnscreenDisplayClient::DidSwapBuffersComplete() {
- pending_frames_--;
- if ((pending_frames_ < display_->GetMaxFramesPending()) && deferred_draw_) {
- deferred_draw_ = false;
- ScheduleDraw();
- }
-}
-
-void OnscreenDisplayClient::SetMemoryPolicy(
- const cc::ManagedMemoryPolicy& policy) {
- surface_display_output_surface_->SetMemoryPolicy(policy);
-}
-
-} // namespace content
« no previous file with comments | « content/browser/compositor/onscreen_display_client.h ('k') | content/browser/compositor/surface_display_output_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698