commit d71dc21fa8b302a85147a82ef0e05981a7614509
author Bo Liu <boliu@google.com> Mon Jul 28 21:44:23 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 28 18:28:56 2014 +0000
tree acfbd55b49ebeafbe7a9a5fe9f4b8326347683a3
parent 2a534ae0d562cacc24d3f8cf092cf69726fff88d
parent 32b527bb3d6a02baf7a4eeb9cf9e7f75d1fd3ae1

Merge "Add DrawGL kModeSync" into lmp-dev

chromium/plat_support/draw_gl_functor.cpp

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 @@
         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);