Pulled changes from issue 669220 to fix building with renderer=gles2.

core/cross/gles2/render_surface_gles2.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 36 matching lines @@
                                        Texture *texture)
     : RenderSurface(service_locator, width, height, texture),
       cube_face_(cube_face),
       mip_level_(mip_level) {
   DCHECK(texture);
 }
 
 RenderSurfaceGLES2::~RenderSurfaceGLES2() {
 }
 
-Bitmap::Ref RenderSurfaceGLES2::PlatformSpecificGetBitmap() const {
+bool RenderSurfaceGLES2::PlatformSpecificGetIntoBitmap(
+    Bitmap::Ref bitmap) const {
   Renderer* renderer = service_locator()->GetService<Renderer>();
   DCHECK(renderer);
-
-  Bitmap::Ref bitmap = Bitmap::Ref(new Bitmap(service_locator()));
-  bitmap->Allocate(
-      Texture::ARGB8, clip_width(), clip_height(), 1, Bitmap::IMAGE);
+  DCHECK(bitmap->width() == static_cast<unsigned int>(clip_width()) &&
+         bitmap->height() == static_cast<unsigned int>(clip_height()) &&
+         bitmap->num_mipmaps() == 1 &&
+         bitmap->format() == Texture::ARGB8);
 
   const RenderSurface* old_render_surface;
   const RenderDepthStencilSurface* old_depth_surface;
   bool old_is_back_buffer;
 
   renderer->GetRenderSurfaces(&old_render_surface, &old_depth_surface,
                               &old_is_back_buffer);
   renderer->SetRenderSurfaces(this, NULL, false);
 
   ::glReadPixels(0, 0, clip_width(), clip_height(), GL_BGRA, GL_UNSIGNED_BYTE,
                  bitmap->image_data());
 
   renderer->SetRenderSurfaces(old_render_surface, old_depth_surface,
                               old_is_back_buffer);
 
-  return bitmap;
+  return true;
 }
 
 RenderDepthStencilSurfaceGLES2::RenderDepthStencilSurfaceGLES2(
     ServiceLocator *service_locator,
     int width,
     int height)
     : RenderDepthStencilSurface(service_locator, width, height) {
 
 #ifndef DISABLE_FBO
 #if defined(GLES2_BACKEND_DESKTOP_GL)
@@ skipping 43 matching lines @@
   if (GLEW_EXT_packed_depth_stencil) {
     glDeleteRenderbuffersEXT(1, render_buffers_);
     return;
   }
 #endif
   glDeleteRenderbuffersEXT(2, render_buffers_);
 #endif
 }
 
 }  // end namespace o3d