content/browser/android/in_process/synchronous_compositor_output_surface.h - Issue 22066002: Add FBO support in Android WebView

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/android/in_process/synchronous_compositor_output_surface.h

Issue 22066002: Add FBO support in Android WebView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: remove blank line Created 7 years, 4 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 | « no previous file | content/browser/android/in_process/synchronous_compositor_output_surface.cc » ('j') | content/browser/android/in_process/synchronous_compositor_output_surface.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/in_process/synchronous_compositor_output_surface.h

diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.h b/content/browser/android/in_process/synchronous_compositor_output_surface.h

index a3a90667e3a1f489a3a7c14f226346fc33f15d96..05ab890c8dbec0827685507f6d1f3a6fd6849b62 100644

--- a/content/browser/android/in_process/synchronous_compositor_output_surface.h

+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.h

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

#include "base/memory/scoped_ptr.h"

#include "cc/output/output_surface.h"

#include "content/public/browser/android/synchronous_compositor.h"

+#include "ui/gl/gl_surface_stub.h"

namespace cc {

class ContextProvider;

@@ -88,6 +89,9 @@ class SynchronousCompositorOutputSurface

// Only valid (non-NULL) during a DemandDrawSw() call.

SkCanvas* current_sw_canvas_;

+ // Non-NULL when hardware draw has been initialized.

joth 2013/08/04 00:45:16 nit: and returns to NULL when HW draw is released

+ scoped_refptr<gfx::GLSurfaceStub> surface_;

DISALLOW_COPY_AND_ASSIGN(SynchronousCompositorOutputSurface);

};