Manually merging trunk revs 95836 and 96904 to 835 branch (third attempt, nacl should be fixed)

gpu/demos/framework/window.cc

Index: gpu/demos/framework/window.cc
===================================================================
--- gpu/demos/framework/window.cc	(revision 98673)
+++ gpu/demos/framework/window.cc	(working copy)
@@ -90,7 +90,8 @@
                                                 transfer_buffer.size,
                                                 transfer_buffer.ptr,
                                                 transfer_buffer_id,
-                                                false));
+                                                false,
+                                                true));
   return command_buffer.release() != NULL;
 }