cc/output/software_output_device.h - Issue 15001027: [Aura] Added Support for rendering software compositor frames as cc::TextureLayers.

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: cc/output/software_output_device.h

Issue 15001027: [Aura] Added Support for rendering software compositor frames as cc::TextureLayers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 7 years, 6 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

« cc/output/software_frame_data.h ('K') | « cc/output/software_frame_data.cc ('k') | cc/output/software_output_device.cc » ('j') | content/browser/renderer_host/render_widget_host_view_aura.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cc/output/software_output_device.h

diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h

index 9899629ee9662dc8fb66c0f9362a2d7ef07a08fe..9c41cdae539ef67a1aa6bc4ae7d8e0cfecccf946 100644

--- a/cc/output/software_output_device.h

+++ b/cc/output/software_output_device.h

@@ -11,7 +11,6 @@

#include "ui/gfx/rect.h"

#include "ui/gfx/size.h"

#include "ui/gfx/vector2d.h"

-#include "ui/surface/transport_dib.h"

class SkBitmap;

class SkDevice;

@@ -39,7 +38,7 @@ class CC_EXPORT SoftwareOutputDevice {

gfx::Rect clip_rect);

// TODO(skaslev) Remove this after UberCompositor lands.

- virtual void ReclaimDIB(const TransportDIB::Id& id);

+ virtual void ReclaimSoftwareFrame(int id);

piman 2013/06/05 00:30:55 unsigned int.

slavi 2013/06/06 23:02:47 Done.

protected:

gfx::Size viewport_size_;