content/browser/renderer_host/compositor_impl_android.h - Issue 41903003: cc: Fix incomplete changes to add ETC1 support

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/renderer_host/compositor_impl_android.h

Issue 41903003: cc: Fix incomplete changes to add ETC1 support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased and moved pixel ref class to public cc Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/renderer_host/compositor_impl_android.h

diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h

index 955460006357a43419a941853293c87e495e38af..a29a0bd40c86b819c0fc117b7b0ad2626a89a9f9 100644

--- a/content/browser/renderer_host/compositor_impl_android.h

+++ b/content/browser/renderer_host/compositor_impl_android.h

@@ -61,6 +61,9 @@ class CONTENT_EXPORT CompositorImpl

virtual void Composite() OVERRIDE;

virtual cc::UIResourceId GenerateUIResource(

const cc::UIResourceBitmap& bitmap) OVERRIDE;

+ virtual cc::UIResourceId GenerateCompressedUIResource(gfx::Size& size,

aelias_OOO_until_Jul13 2013/11/07 19:30:27 Can we delete this method? It steals ownership of

powei 2013/11/07 19:45:31 Done.

+ int data_size,

+ void* data) OVERRIDE;

virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;

virtual blink::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE;

virtual blink::WebGLId GenerateCompressedTexture(