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

Unified Diff: src/core/SkXfermode.cpp

Issue 23018003: Rename GrGLUniformManager to GrGLUniform and ref GrGLUniforms directly Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 4 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 | « gyp/gpu.gypi ('k') | src/effects/SkArithmeticMode.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkXfermode.cpp
diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp
index 020ea48b370796fe61397b0530e91407d60009e9..083c2efffa8296b14aef77b0bd53802f5e37eeb2 100644
--- a/src/core/SkXfermode.cpp
+++ b/src/core/SkXfermode.cpp
@@ -1104,11 +1104,11 @@ public:
return modeKey | bgKey;
}
- virtual void setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) SK_OVERRIDE {
+ virtual void setData(const GrGLContext& context, const GrDrawEffect& drawEffect) SK_OVERRIDE {
const XferEffect& xfer = drawEffect.castEffect<XferEffect>();
GrTexture* bgTex = xfer.backgroundAccess().getTexture();
if (bgTex) {
- fBackgroundEffectMatrix.setData(uman,
+ fBackgroundEffectMatrix.setData(context,
GrEffect::MakeDivByTextureWHMatrix(bgTex),
drawEffect,
bgTex);
« no previous file with comments | « gyp/gpu.gypi ('k') | src/effects/SkArithmeticMode.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698