summaryrefslogtreecommitdiffstats
path: root/libs/hwui/OpenGLRenderer.cpp
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2011-02-24 17:45:21 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-02-24 17:45:21 -0800
commit7f4a537af5ec1c935b9d139b722da05e9fe8130f (patch)
treefac8a0550aea4d9343cb6af7061f9d3d25b8e3a8 /libs/hwui/OpenGLRenderer.cpp
parentf36ec34f40b0dc8ff37eaa97d5c5f70fc95b4779 (diff)
parentb37cbec6d06578a72bdd9c2caa3fd964ade71c53 (diff)
downloadframeworks_base-7f4a537af5ec1c935b9d139b722da05e9fe8130f.zip
frameworks_base-7f4a537af5ec1c935b9d139b722da05e9fe8130f.tar.gz
frameworks_base-7f4a537af5ec1c935b9d139b722da05e9fe8130f.tar.bz2
Merge "Correctly blend translucent GIF bitmaps."
Diffstat (limited to 'libs/hwui/OpenGLRenderer.cpp')
-rw-r--r--libs/hwui/OpenGLRenderer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index a0aea00..cc88236 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -1982,9 +1982,8 @@ void OpenGLRenderer::getAlphaAndMode(SkPaint* paint, int* alpha, SkXfermode::Mod
}
SkXfermode::Mode OpenGLRenderer::getXfermode(SkXfermode* mode) {
- /* In the future we should look at unifying the Porter-Duff modes and
- * SkXferModes so that we can use SkXfermode::IsMode(xfer, &mode).
- */
+ // In the future we should look at unifying the Porter-Duff modes and
+ // SkXferModes so that we can use SkXfermode::IsMode(xfer, &mode).
if (mode == NULL) {
return SkXfermode::kSrcOver_Mode;
}