Merge Compositor and CompositorCC

content/browser/renderer_host/render_widget_host_view_aura.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/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
@@ skipping 334 matching lines @@
 }
 
 void RenderWidgetHostViewAura::OnAcceleratedCompositingStateChange() {
   UpdateExternalTexture();
 }
 
 void RenderWidgetHostViewAura::UpdateExternalTexture() {
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   if (current_surface_ != gfx::kNullPluginWindow &&
       host_->is_accelerated_compositing_active()) {
-    window_->SetExternalTexture(
-        accelerated_surface_containers_[current_surface_]->GetTexture());
+    AcceleratedSurfaceContainerLinux* container =
+        accelerated_surface_containers_[current_surface_];
+    if (container)
+      container->Update();
+    window_->SetExternalTexture(container);
     glFlush();
   } else {
     window_->SetExternalTexture(NULL);
   }
 #endif
 }
 
 void RenderWidgetHostViewAura::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   current_surface_ = params.surface_handle;
   UpdateExternalTexture();
 
   if (!aura::RootWindow::GetInstance()->compositor()) {
     // We have no compositor, so we have no way to display the surface.
     // Must still send the ACK.
     RenderWidgetHost::AcknowledgeSwapBuffers(params.route_id, gpu_host_id);
   } else {
     gfx::Size surface_size =
-        accelerated_surface_containers_[params.surface_handle]->GetSize();
+        accelerated_surface_containers_[params.surface_handle]->size();
     window_->SchedulePaintInRect(gfx::Rect(surface_size));
 
     // Add sending an ACK to the list of things to do OnCompositingEnded
     on_compositing_ended_callbacks_.push_back(
         base::Bind(&RenderWidgetHost::AcknowledgeSwapBuffers,
                    params.route_id, gpu_host_id));
     ui::Compositor* compositor = aura::RootWindow::GetInstance()->compositor();
     if (!compositor->HasObserver(this))
       compositor->AddObserver(this);
   }
 #else
   NOTREACHED();
 #endif
 }
 
 void RenderWidgetHostViewAura::AcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
     int gpu_host_id) {
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   current_surface_ = params.surface_handle;
   UpdateExternalTexture();
 
   if (!aura::RootWindow::GetInstance()->compositor()) {
     // We have no compositor, so we have no way to display the surface
     // Must still send the ACK
     RenderWidgetHost::AcknowledgePostSubBuffer(params.route_id, gpu_host_id);
   } else {
     gfx::Size surface_size =
-        accelerated_surface_containers_[params.surface_handle]->GetSize();
+        accelerated_surface_containers_[params.surface_handle]->size();
 
     // Co-ordinates come in OpenGL co-ordinate space.
     // We need to convert to layer space.
     window_->SchedulePaintInRect(gfx::Rect(
         params.x,
         surface_size.height() - params.y - params.height,
         params.width,
         params.height));
 
     // Add sending an ACK to the list of things to do OnCompositingEnded
     on_compositing_ended_callbacks_.push_back(
         base::Bind(&RenderWidgetHost::AcknowledgePostSubBuffer,
                    params.route_id, gpu_host_id));
     ui::Compositor* compositor = aura::RootWindow::GetInstance()->compositor();
     if (!compositor->HasObserver(this))
       compositor->AddObserver(this);
   }
 #else
   NOTREACHED();
 #endif
 }
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 void RenderWidgetHostViewAura::AcceleratedSurfaceNew(
       int32 width,
       int32 height,
       uint64* surface_handle,
       TransportDIB::Handle* shm_handle) {
   scoped_refptr<AcceleratedSurfaceContainerLinux> surface(
-      AcceleratedSurfaceContainerLinux::Create(gfx::Size(width, height)));
+      new AcceleratedSurfaceContainerLinux(gfx::Size(width, height)));
   if (!surface->Initialize(surface_handle)) {
     LOG(ERROR) << "Failed to create AcceleratedSurfaceContainer";
     return;
   }
   *shm_handle = surface->Handle();
 
   accelerated_surface_containers_[*surface_handle] = surface;
 }
 
 void RenderWidgetHostViewAura::AcceleratedSurfaceRelease(
@@ skipping 611 matching lines @@
 // static
 void RenderWidgetHostView::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   const gfx::Size size = gfx::Screen::GetPrimaryMonitorSize();
   results->rect = WebKit::WebRect(0, 0, size.width(), size.height());
   results->availableRect = results->rect;
   // TODO(derat): Don't hardcode this?
   results->depth = 24;
   results->depthPerComponent = 8;
 }