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

core/cross/gles2/render_surface_gles2.h

 /*
  * 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 56 matching lines @@
 
   GLenum cube_face() const {
     return cube_face_;
   }
 
   int mip_level() const {
     return mip_level_;
   }
 
  protected:
-  // The platform specific part of GetBitmap.
-  virtual Bitmap::Ref PlatformSpecificGetBitmap() const;
+  // The platform specific part of GetIntoBitmap.
+  virtual bool PlatformSpecificGetIntoBitmap(Bitmap::Ref bitmap) const;
 
  private:
   GLenum cube_face_;
   int mip_level_;
   DISALLOW_COPY_AND_ASSIGN(RenderSurfaceGLES2);
 };
 
 class RenderDepthStencilSurfaceGLES2 : public RenderDepthStencilSurface {
  public:
   typedef SmartPointer<RenderDepthStencilSurfaceGLES2> Ref;
@@ skipping 13 matching lines @@
  private:
   // Handles to the depth and stencil render-buffers, respectively.
   GLuint render_buffers_[2];
   DISALLOW_COPY_AND_ASSIGN(RenderDepthStencilSurfaceGLES2);
 };
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_GLES2_RENDER_SURFACE_GLES2_H_