Introduction of parameter to readBackFramebuffer set of APIs to allow reading from the currently ...

webkit/gpu/webgraphicscontext3d_in_process_impl.cc

 // Copyright (c) 2011 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 "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 628 matching lines @@
   glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, bound_fbo_);
 
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
   if (pixels)
     FlipVertically(pixels, width, height);
 #endif
 
   return true;
 }
 
+#if 1
 bool WebGraphicsContext3DInProcessImpl::readBackFramebuffer(
-    unsigned char* pixels, size_t bufferSize) {
-  return readBackFramebuffer(pixels, bufferSize, fbo_, width(), height());
+    unsigned char* pixels, size_t bufferSize, bool bindDefaultFramebuffer) {
+  if (bindDefaultFramebuffer)
+    return readBackFramebuffer(pixels, bufferSize, fbo_, width(), height());
+
+  return readBackFramebuffer(pixels, bufferSize, bound_fbo_, width(), height());
 }
+#endif
 
 void WebGraphicsContext3DInProcessImpl::synthesizeGLError(WGC3Denum error) {
   if (synthetic_errors_set_.find(error) == synthetic_errors_set_.end()) {
     synthetic_errors_set_.insert(error);
     synthetic_errors_list_.push_back(error);
   }
 }
 
 void* WebGraphicsContext3DInProcessImpl::mapBufferSubDataCHROMIUM(
     WGC3Denum target, WGC3Dintptr offset,
@@ skipping 965 matching lines @@
   if (length > 1) {
     entry->translated_source.reset(new char[length]);
     ShGetObjectCode(compiler, entry->translated_source.get());
   }
   entry->is_valid = true;
   return true;
 }
 
 }  // namespace gpu
 }  // namespace webkit