Always make context current in ViewManager's BitmapUploader, be laxer in SurfaceResourceHolder

mojo/services/public/cpp/view_manager/lib/bitmap_uploader.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/services/public/cpp/view_manager/lib/bitmap_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif  // GL_GLEXT_PROTOTYPES
 
@@ skipping 88 matching lines @@
   }
 
   gfx::Rect bounds(size_);
   PassPtr pass = CreateDefaultPass(1, bounds);
   FramePtr frame = Frame::New();
   frame->resources.resize(0u);
 
   pass->quads.resize(0u);
   pass->shared_quad_states.push_back(CreateDefaultSQS(size_));
 
+  MojoGLES2MakeCurrent(gles2_context_);
   if (!bitmap_.isNull()) {
     gfx::Size bitmap_size(bitmap_.width(), bitmap_.height());
     GLuint texture_id = BindTextureForSize(bitmap_size);
     bitmap_.lockPixels();
     glTexSubImage2D(GL_TEXTURE_2D,
                     0,
                     0,
                     0,
                     bitmap_size.width(),
                     bitmap_size.height(),
@@ skipping 59 matching lines @@
     quad->solid_color_quad_state = color_state.Pass();
     pass->quads.push_back(quad.Pass());
   }
 
   frame->passes.push_back(pass.Pass());
 
   surface_->SubmitFrame(SurfaceId::From(id_), frame.Pass());
 }
 
 void BitmapUploader::ReturnResources(Array<ReturnedResourcePtr> resources) {
+  if (!resources.size())
+    return;
+  MojoGLES2MakeCurrent(gles2_context_);
   // TODO(jamesr): Recycle.
   for (size_t i = 0; i < resources.size(); ++i) {
     ReturnedResourcePtr resource = resources[i].Pass();
     DCHECK_EQ(1, resource->count);
     glWaitSyncPointCHROMIUM(resource->sync_point);
     uint32_t texture_id = resource_to_texture_id_map_[resource->id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource->id);
     glDeleteTextures(1, &texture_id);
   }
@@ skipping 20 matching lines @@
                size.height(),
                0,
                TextureFormat(),
                GL_UNSIGNED_BYTE,
                0);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   return texture;
 }
 
 }  // namespace mojo