Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.h - Issue 6901134: Merge 84546 - 2011-04-21 Nat Duca <nduca@chromium.org>

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: Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.h

Issue 6901134: Merge 84546 - 2011-04-21 Nat Duca <nduca@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/742/

Patch Set: Created 9 years, 8 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 | « Source/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp ('k') | Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.h

===================================================================

--- Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.h (revision 85349)

+++ Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.h (working copy)

@@ -28,13 +28,15 @@

#if USE(ACCELERATED_COMPOSITING)

#include "Font.h"

-#include "LayerRendererChromium.h"

+#include "ProgramBinding.h"

+#include "ShaderChromium.h"

namespace WebCore {

class GeometryBinding;

class GraphicsContext3D;

+class LayerRendererChromium;

+class LayerTexture;

// Class that handles drawing of composited render layers using GL.

class CCHeadsUpDisplay {

@@ -58,6 +60,8 @@

bool enabled() const { return m_showPlatformLayerTree || m_showFPSCounter; }

void draw();

+ typedef ProgramBinding<VertexShaderPosTex, FragmentShaderBGRATexAlpha> Program;

private:

explicit CCHeadsUpDisplay(LayerRendererChromium* owner);

void drawHudContents(GraphicsContext*, const IntSize& hudSize);