Aura: PostSubBuffer implementation for --ui-use-gpu-process

content/common/gpu/image_transport_surface_linux.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.
 
 #include "content/common/gpu/image_transport_surface.h"
 
 // This conflicts with the defines in Xlib.h and must come first.
 #include "content/common/gpu/gpu_messages.h"
 
 #include <map>
@@ skipping 91 matching lines @@
   virtual void OnBuffersSwappedACK() OVERRIDE;
   virtual void OnPostSubBufferACK() OVERRIDE;
   virtual void OnResizeViewACK() OVERRIDE;
   virtual void OnResize(gfx::Size size) OVERRIDE;
 
  private:
   virtual ~EGLImageTransportSurface() OVERRIDE;
   void ReleaseSurface(scoped_refptr<EGLAcceleratedSurface>* surface);
   void SendBuffersSwapped();
   void SendPostSubBuffer(int x, int y, int width, int height);
-  void GetRegionsToCopy(const gfx::Rect& new_damage_rect,
-                        std::vector<gfx::Rect>* regions);
 
   // Tracks the current surface visibility state.
   VisibilityState visibility_state_;
 
   uint32 fbo_id_;
 
   scoped_refptr<EGLAcceleratedSurface> back_surface_;
   scoped_refptr<EGLAcceleratedSurface> front_surface_;
   gfx::Rect previous_damage_rect_;
 
@@ skipping 302 matching lines @@
 }
 
 bool EGLImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
 
   DCHECK_NE(back_surface_.get(), static_cast<EGLAcceleratedSurface*>(NULL));
   gfx::Size expected_size = back_surface_->size();
   bool surfaces_same_size = front_surface_.get() &&
       front_surface_->size() == expected_size;
 
-  const gfx::Rect new_damage_rect = gfx::Rect(x, y, width, height);
+  const gfx::Rect new_damage_rect(x, y, width, height);
   if (surfaces_same_size) {
     std::vector<gfx::Rect> regions_to_copy;
-    GetRegionsToCopy(new_damage_rect, &regions_to_copy);
+    GetRegionsToCopy(previous_damage_rect_, new_damage_rect, &regions_to_copy);
 
     GLint previous_texture_id = 0;
     glGetIntegerv(GL_ACTIVE_TEXTURE, &previous_texture_id);
     glFramebufferTexture2DEXT(GL_FRAMEBUFFER,
                               GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D,
                               front_surface_->texture(),
                               0);
     glBindTexture(GL_TEXTURE_2D, back_surface_->texture());
 
@@ skipping 30 matching lines @@
   params.surface_handle = front_surface_->pixmap();
   params.x = x;
   params.y = y;
   params.width = width;
   params.height = height;
 
   helper_->SendAcceleratedSurfacePostSubBuffer(params);
   helper_->SetScheduled(false);
 }
 
-void EGLImageTransportSurface::GetRegionsToCopy(
-    const gfx::Rect& new_damage_rect,
-    std::vector<gfx::Rect>* regions) {
-  DCHECK(front_surface_->size() == back_surface_->size());
-  gfx::Rect intersection = previous_damage_rect_.Intersect(new_damage_rect);
-
-  if (intersection.IsEmpty()) {
-    regions->push_back(previous_damage_rect_);
-    return;
-  }
-
-  // Top (above the intersection).
-  regions->push_back(gfx::Rect(previous_damage_rect_.x(),
-      previous_damage_rect_.y(),
-      previous_damage_rect_.width(),
-      intersection.y() - previous_damage_rect_.y()));
-
-  // Left (of the intersection).
-  regions->push_back(gfx::Rect(previous_damage_rect_.x(),
-      intersection.y(),
-      intersection.x() - previous_damage_rect_.x(),
-      intersection.height()));
-
-  // Right (of the intersection).
-  regions->push_back(gfx::Rect(intersection.right(),
-      intersection.y(),
-      previous_damage_rect_.right() - intersection.right(),
-      intersection.height()));
-
-  // Bottom (below the intersection).
-  regions->push_back(gfx::Rect(previous_damage_rect_.x(),
-      intersection.bottom(),
-      previous_damage_rect_.width(),
-      previous_damage_rect_.bottom() - intersection.bottom()));
-}
-
 std::string EGLImageTransportSurface::GetExtensions() {
   std::string extensions = gfx::GLSurface::GetExtensions();
   extensions += extensions.empty() ? "" : " ";
   extensions += "GL_CHROMIUM_front_buffer_cached ";
   extensions += "GL_CHROMIUM_post_sub_buffer";
   return extensions;
 }
 
 gfx::Size EGLImageTransportSurface::GetSize() {
   return back_surface_->size();
@@ skipping 435 matching lines @@
                                                    stub,
                                                    surface.get(),
                                                    handle.transport);
   }
 
   if (surface->Initialize())
     return surface;
   else
     return NULL;
 }