Merge 84546 - 2011-04-21 Nat Duca <nduca@chromium.org>

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

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CCHeadsUpDisplay_h
 #define CCHeadsUpDisplay_h
 
 #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 {
     WTF_MAKE_NONCOPYABLE(CCHeadsUpDisplay);
 public:
     static PassOwnPtr<CCHeadsUpDisplay> create(LayerRendererChromium* owner)
     {
         return adoptPtr(new CCHeadsUpDisplay(owner));
     }
 
     ~CCHeadsUpDisplay();
 
     void onPresent();
 
     void setShowFPSCounter(bool enable) { m_showFPSCounter = enable; }
     bool showFPSCounter() const { return m_showFPSCounter; }
 
     void setShowPlatformLayerTree(bool enable) { m_showPlatformLayerTree = enable; }
     bool showPlatformLayerTree() const { return m_showPlatformLayerTree; }
 
     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);
     void drawFPSCounter(GraphicsContext*, int top, int height);
     void drawPlatformLayerTree(GraphicsContext*, int top);
 
 
     int m_currentFrameNumber;
 
     double m_filteredFrameTime;
@@ skipping 10 matching lines @@
 
     OwnPtr<Font> m_smallFont;
     OwnPtr<Font> m_mediumFont;
 };
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)
 
 #endif