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

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

 /*
  * 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 14 matching lines @@
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 #include "CCHeadsUpDisplay.h"
 
 #include "CurrentTime.h"
 #include "Font.h"
 #include "FontDescription.h"
 #include "GraphicsContext3D.h"
 #include "LayerChromium.h"
+#include "LayerRendererChromium.h"
 #include "LayerTexture.h"
 #include "TextRun.h"
 #include "TextStream.h"
 #include "TextureManager.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
 using namespace std;
@@ skipping 57 matching lines @@
 
     // Upload to GL.
     {
         PlatformCanvas::AutoLocker locker(&canvas);
 
         m_hudTexture->bindTexture();
         GLC(context.get(), context->texImage2D(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, canvas.size().width(), canvas.size().height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE, locker.pixels()));
     }
 
     // Draw the HUD onto the default render surface.
-    const LayerTilerChromium::Program* program = m_layerRenderer->tilerProgram();
+    const Program* program = m_layerRenderer->headsUpDisplayProgram();
     ASSERT(program && program->initialized());
     GLC(context, context->activeTexture(GraphicsContext3D::TEXTURE0));
     m_hudTexture->bindTexture();
     m_layerRenderer->useShader(program->program());
     GLC(context, context->uniform1i(program->fragmentShader().samplerLocation(), 0));
 
     TransformationMatrix matrix;
     matrix.translate3d(hudSize.width() * 0.5, hudSize.height() * 0.5, 0);
     LayerChromium::drawTexturedQuad(context, m_layerRenderer->projectionMatrix(),
                                     matrix, hudSize.width(), hudSize.height(),
@@ skipping 94 matching lines @@
 
 void CCHeadsUpDisplay::onPresent()
 {
     m_presentTimeHistoryInSec[m_currentFrameNumber % kPresentHistorySize] = currentTime();
     m_currentFrameNumber += 1;
 }
 
 }
 
 #endif // USE(ACCELERATED_COMPOSITING)