content/browser/compositor/onscreen_display_client.cc - Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cc-pre-chromium-image-refactor

Patch Set: rebase Created 6 years, 2 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

« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.cc ('k') | content/browser/gpu/browser_gpu_channel_host_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

index 2adb989a3f39911c4bded6cf3acb31911c3fc608..dbec4508926d4e9435a85f6d797d4c8e2ad2e5d2 100644

--- a/content/browser/compositor/onscreen_display_client.cc

+++ b/content/browser/compositor/onscreen_display_client.cc

@@ -9,6 +9,7 @@

#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 {

@@ -18,8 +19,10 @@ OnscreenDisplayClient::OnscreenDisplayClient(

cc::SurfaceManager* manager,

scoped_refptr<base::SingleThreadTaskRunner> task_runner)

: output_surface_(output_surface.Pass()),

- display_(

- new cc::Display(this, manager, HostSharedBitmapManager::current())),

+ display_(new cc::Display(this,

+ manager,

+ HostSharedBitmapManager::current(),

+ BrowserGpuMemoryBufferManager::current())),

task_runner_(task_runner),

scheduled_draw_(false),

deferred_draw_(false),