summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Liu <boliu@google.com>2014-07-28 23:43:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-28 18:28:56 +0000
commit91b5c141382559106792246adb41e68589b886f6 (patch)
tree6df81f62cda7b4320b3e980058ae30cdeb3b127d
parent1911bfeac4b086749624d187a7b12b92b7576c1d (diff)
parent1d8422b084b634820042340a31e3e36051b8d9c6 (diff)
downloadwebview-91b5c141382559106792246adb41e68589b886f6.tar.gz
Merge "Add DrawGL kModeSync"
-rw-r--r--chromium/plat_support/draw_gl_functor.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/plat_support/draw_gl_functor.cpp b/chromium/plat_support/draw_gl_functor.cpp
index 2063988..8f82ef9 100644
--- a/chromium/plat_support/draw_gl_functor.cpp
+++ b/chromium/plat_support/draw_gl_functor.cpp
@@ -76,8 +76,10 @@ class DrawGLFunctor : public Functor {
aw_info.mode = AwDrawGLInfo::kModeProcess;
break;
case DrawGlInfo::kModeProcessNoContext:
- // TODO: Fix once ProcessNoContext is in chromium.
- aw_info.mode = AwDrawGLInfo::kModeProcess;
+ aw_info.mode = AwDrawGLInfo::kModeProcessNoContext;
+ break;
+ case DrawGlInfo::kModeSync:
+ aw_info.mode = AwDrawGLInfo::kModeSync;
break;
default:
ALOGE("Unexpected DrawGLInfo type %d", what);