Rename SwapBuffersWithDamage to SwapBuffersWithBounds

gpu/command_buffer/client/gles2_implementation.cc

 // Copyright (c) 2012 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.
 
 // A class to emulate GLES2 over command buffers.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 1470 matching lines @@
   helper_->SwapBuffers();
   helper_->CommandBufferHelper::Flush();
   // Wait if we added too many swap buffers. Add 1 to kMaxSwapBuffers to
   // compensate for TODO above.
   if (swap_buffers_tokens_.size() > kMaxSwapBuffers + 1) {
     helper_->WaitForToken(swap_buffers_tokens_.front());
     swap_buffers_tokens_.pop();
   }
 }
 
-void GLES2Implementation::SwapBuffersWithDamageCHROMIUM(GLint x,
-                                                        GLint y,
-                                                        GLint width,
-                                                        GLint height) {
+void GLES2Implementation::SwapBuffersWithBoundsCHROMIUM(GLsizei count,
+                                                        const GLint* rects) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
-  GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSwapBuffersWithDamageCHROMIUM("
-                     << x << ", " << y << ", " << width << ", " << height
+  GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSwapBuffersWithBoundsCHROMIUM("
+                     << count << ", " << static_cast<const void*>(rects)
                      << ")");
-  TRACE_EVENT2("gpu", "GLES2::SwapBuffersWithDamageCHROMIUM", "width", width,
-               "height", height);
+  GPU_CLIENT_LOG_CODE_BLOCK({
+    for (GLsizei i = 0; i < count; ++i) {
+      GPU_CLIENT_LOG("  " << i << ": " << rects[0 + i * 4] << ", "
+                          << rects[1 + i * 4] << ", " << rects[2 + i * 4]
+                          << ", " << rects[3 + i * 4]);
+    }
+  });
+  if (count < 0) {
+    SetGLError(GL_INVALID_VALUE, "glSwapBuffersWithBoundsCHROMIUM",
+               "count < 0");
+    return;
+  }
 
   // Same flow control as GLES2Implementation::SwapBuffers (see comments there).
   swap_buffers_tokens_.push(helper_->InsertToken());
-  helper_->SwapBuffersWithDamageCHROMIUM(x, y, width, height);
+  helper_->SwapBuffersWithBoundsCHROMIUMImmediate(count, rects);
   helper_->CommandBufferHelper::Flush();
   if (swap_buffers_tokens_.size() > kMaxSwapBuffers + 1) {
     helper_->WaitForToken(swap_buffers_tokens_.front());
     swap_buffers_tokens_.pop();
   }
 }
 
 void GLES2Implementation::SwapInterval(int interval) {
   GPU_CLIENT_SINGLE_THREAD_CHECK();
   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glSwapInterval("
@@ skipping 3354 matching lines @@
   // then it will have told the ShareGroup, so just report its status.
   if (share_group_->IsLost())
     return GL_UNKNOWN_CONTEXT_RESET_KHR;
   return GL_NO_ERROR;
 }
 
 void GLES2Implementation::Swap() {
   SwapBuffers();
 }
 
-void GLES2Implementation::SwapWithDamage(const gfx::Rect& damage) {
-  SwapBuffersWithDamageCHROMIUM(damage.x(), damage.y(), damage.width(),
-                                damage.height());
+void GLES2Implementation::SwapWithBounds(const std::vector<gfx::Rect>& rects) {
+  std::vector<int> rects_data(rects.size() * 4);
+  for (size_t i = 0; i < rects.size(); ++i) {
+    rects_data[i * 4 + 0] = rects[i].x();
+    rects_data[i * 4 + 1] = rects[i].y();
+    rects_data[i * 4 + 2] = rects[i].width();
+    rects_data[i * 4 + 3] = rects[i].height();
+  }
+  SwapBuffersWithBoundsCHROMIUM(rects.size(), rects_data.data());
 }
 
 void GLES2Implementation::PartialSwapBuffers(const gfx::Rect& sub_buffer) {
   PostSubBufferCHROMIUM(
       sub_buffer.x(), sub_buffer.y(), sub_buffer.width(), sub_buffer.height());
 }
 
 void GLES2Implementation::CommitOverlayPlanes() {
   CommitOverlayPlanesCHROMIUM();
 }
@@ skipping 2195 matching lines @@
   CheckGLError();
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "gpu/command_buffer/client/gles2_implementation_impl_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu