aura: Remove old GL paths from RenderWidgetHostViewAura.

Frames from the renderer are either legacy software,
software compositing, or ubercomp. Remove the old GL composited
paths that are no longer in use.

For layout tests, put them into composited mailbox mode, and
instead of sending the frame to the browser at all, just put the
frame in a post task to ack back directly to the renderer.

R=piman
BUG=332998

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=249226

Review URL: https://codereview.chromium.org/131443007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258742 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 0 deletions

diff --git a/content/renderer/gpu/compositor_output_surface.h b/content/renderer/gpu/compositor_output_surface.h
index 62e159d..a1127c3 100644
--- a/content/renderer/gpu/compositor_output_surface.h
+++ b/content/renderer/gpu/compositor_output_surface.h
@@ -9,6 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
@@ -28,6 +29,8 @@ class Message;
 namespace cc {
 class CompositorFrame;
 class CompositorFrameAck;
+class GLFrameData;
+class SoftwareFrameData;
 }
 
 namespace content {
@@ -62,6 +65,9 @@ class CompositorOutputSurface
   virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) OVERRIDE;
 
  protected:
+  void ShortcutSwapAck(uint32 output_surface_id,
+                       scoped_ptr<cc::GLFrameData> gl_frame_data,
+                       scoped_ptr<cc::SoftwareFrameData> software_frame_data);
   virtual void OnSwapAck(uint32 output_surface_id,
                          const cc::CompositorFrameAck& ack);
   virtual void OnReclaimResources(uint32 output_surface_id,
@@ -105,6 +111,11 @@ class CompositorOutputSurface
   int routing_id_;
   bool prefers_smoothness_;
   base::PlatformThreadHandle main_thread_handle_;
+
+  // TODO(danakj): Remove this when crbug.com/311404
+  bool layout_test_mode_;
+  scoped_ptr<cc::CompositorFrameAck> layout_test_previous_frame_ack_;
+  base::WeakPtrFactory<CompositorOutputSurface> weak_ptrs_;
 };
 
 }  // namespace content