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

Unified Diff: Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp

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/cc/CCHeadsUpDisplay.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp (revision 85349)
+++ Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.cpp (working copy)
@@ -32,6 +32,7 @@
#include "FontDescription.h"
#include "GraphicsContext3D.h"
#include "LayerChromium.h"
+#include "LayerRendererChromium.h"
#include "LayerTexture.h"
#include "TextRun.h"
#include "TextStream.h"
@@ -109,7 +110,7 @@
}
// 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();
« no previous file with comments | « Source/WebCore/platform/graphics/chromium/cc/CCHeadsUpDisplay.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698