Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

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
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);

Powered by Google App Engine
This is Rietveld 408576698