aura: Remove old GL paths from RenderWidgetHostViewAura.

content/browser/renderer_host/render_widget_host_view_aura_unittest.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/basictypes.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 138 matching lines @@
 
 class FakeRenderWidgetHostViewAura : public RenderWidgetHostViewAura {
  public:
   FakeRenderWidgetHostViewAura(RenderWidgetHost* widget)
       : RenderWidgetHostViewAura(widget), has_resize_lock_(false) {}
 
   virtual ~FakeRenderWidgetHostViewAura() {}
 
   virtual bool ShouldCreateResizeLock() OVERRIDE {
     gfx::Size desired_size = window()->bounds().size();
-    return desired_size != current_frame_size();
+    return desired_size != current_frame_size_in_dip();
   }
 
   virtual scoped_ptr<ResizeLock> CreateResizeLock(bool defer_compositor_lock)
       OVERRIDE {
     gfx::Size desired_size = window()->bounds().size();
     return scoped_ptr<ResizeLock>(
         new FakeResizeLock(desired_size, defer_compositor_lock));
   }
 
   virtual void RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request)
@@ skipping 666 matching lines @@
   view_->UpdateCursorIfOverSelf();
   EXPECT_EQ(0, cursor_client.calls_to_set_cursor());
 
   // Cursor is below the window.
   cursor_client.reset_calls_to_set_cursor();
   aura::Env::GetInstance()->set_last_mouse_location(gfx::Point(161, 161));
   view_->UpdateCursorIfOverSelf();
   EXPECT_EQ(0, cursor_client.calls_to_set_cursor());
 }
 
-scoped_ptr<cc::CompositorFrame> MakeGLFrame(float scale_factor,
-                                            gfx::Size size,
-                                            gfx::Rect damage,
-                                            OwnedMailbox* owned_mailbox) {
-  scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
-  frame->metadata.device_scale_factor = scale_factor;
-  frame->gl_frame_data.reset(new cc::GLFrameData);
-  DCHECK(owned_mailbox->sync_point());
-  frame->gl_frame_data->sync_point = owned_mailbox->sync_point();
-  memcpy(frame->gl_frame_data->mailbox.name,
-         owned_mailbox->mailbox().name,
-         sizeof(frame->gl_frame_data->mailbox.name));
-  frame->gl_frame_data->size = size;
-  frame->gl_frame_data->sub_buffer_rect = damage;
-  return frame.Pass();
-}
-
 scoped_ptr<cc::CompositorFrame> MakeSoftwareFrame(float scale_factor,
                                                   gfx::Size size,
                                                   gfx::Rect damage) {
   scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
   frame->metadata.device_scale_factor = scale_factor;
   frame->software_frame_data.reset(new cc::SoftwareFrameData);
   frame->software_frame_data->id = 1;
   frame->software_frame_data->size = size;
   frame->software_frame_data->damage_rect = damage;
   base::SharedMemory shm;
@@ skipping 39 matching lines @@
     // 0 is CreatingNew message.
     const IPC::Message* msg = sink_->GetMessageAt(0);
     EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
     ViewMsg_Resize::Param params;
     ViewMsg_Resize::Read(msg, &params);
     EXPECT_EQ("0,0 800x600",
               gfx::Rect(params.a.screen_info.availableRect).ToString());
     EXPECT_EQ("800x600", params.a.new_size.ToString());
     // Resizes are blocked until we swapped a frame of the correct size, and
     // we've committed it.
-    view_->OnSwapCompositorFrame(0,
-                                 MakeGLFrame(1.f,
-                                             params.a.new_size,
-                                             gfx::Rect(params.a.new_size),
-                                             owned_mailbox.get()));
+    view_->OnSwapCompositorFrame(
+        0,
+        MakeDelegatedFrame(
+            1.f, params.a.new_size, gfx::Rect(params.a.new_size)));
     ui::DrawWaiterForTest::WaitForCommit(
         root_window->GetHost()->compositor());
   }
 
   widget_host_->ResetSizeAndRepaintPendingFlags();
   sink_->ClearMessages();
 
   // Make sure the corrent screen size is set along in the resize
   // request when the screen size has changed.
   aura_test_helper_->test_screen()->SetUIScale(0.5);
   EXPECT_EQ(1u, sink_->message_count());
   {
     const IPC::Message* msg = sink_->GetMessageAt(0);
     EXPECT_EQ(ViewMsg_Resize::ID, msg->type());
     ViewMsg_Resize::Param params;
     ViewMsg_Resize::Read(msg, &params);
     EXPECT_EQ("0,0 1600x1200",
               gfx::Rect(params.a.screen_info.availableRect).ToString());
     EXPECT_EQ("1600x1200", params.a.new_size.ToString());
-    view_->OnSwapCompositorFrame(0,
-                                 MakeGLFrame(1.f,
-                                             params.a.new_size,
-                                             gfx::Rect(params.a.new_size),
-                                             owned_mailbox.get()));
+    view_->OnSwapCompositorFrame(
+        0,
+        MakeDelegatedFrame(
+            1.f, params.a.new_size, gfx::Rect(params.a.new_size)));
     ui::DrawWaiterForTest::WaitForCommit(
         root_window->GetHost()->compositor());
   }
 }
 
 // Swapping a frame should notify the window.
 TEST_F(RenderWidgetHostViewAuraTest, SwapNotifiesWindow) {
   gfx::Size view_size(100, 100);
   gfx::Rect view_rect(view_size);
 
   GLHelper* gl_helper = ImageTransportFactory::GetInstance()->GetGLHelper();
   scoped_refptr<OwnedMailbox> owned_mailbox = new OwnedMailbox(gl_helper);
   gl_helper->ResizeTexture(owned_mailbox->texture_id(), gfx::Size(400, 400));
   owned_mailbox->UpdateSyncPoint(gl_helper->InsertSyncPoint());
 
   view_->InitAsChild(NULL);
   aura::client::ParentWindowWithContext(
       view_->GetNativeView(),
       parent_view_->GetNativeView()->GetRootWindow(),
       gfx::Rect());
   view_->SetSize(view_size);
   view_->WasShown();
 
   MockWindowObserver observer;
   view_->window_->AddObserver(&observer);
 
-  // Swap a frame through the GPU path.
-  GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
-  params.surface_id = widget_host_->surface_id();
-  params.route_id = widget_host_->GetRoutingID();
-  memcpy(params.mailbox.name,
-         owned_mailbox->mailbox().name,
-         sizeof(params.mailbox.name));
-  params.size = view_size;
-  params.scale_factor = 1.f;
-
-  EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));
-  view_->AcceleratedSurfaceBuffersSwapped(params, 0);
-  testing::Mock::VerifyAndClearExpectations(&observer);
-
-  // DSF = 2
-  params.size = gfx::Size(200, 200);
-  params.scale_factor = 2.f;
-  EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));
-  view_->AcceleratedSurfaceBuffersSwapped(params, 0);
-  testing::Mock::VerifyAndClearExpectations(&observer);
-
-  // Partial frames though GPU path
-  GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params post_params;
-  post_params.surface_id = widget_host_->surface_id();
-  post_params.route_id = widget_host_->GetRoutingID();
-  memcpy(post_params.mailbox.name,
-         owned_mailbox->mailbox().name,
-         sizeof(params.mailbox.name));
-  post_params.surface_size = gfx::Size(200, 200);
-  post_params.surface_scale_factor = 2.f;
-  post_params.x = 40;
-  post_params.y = 40;
-  post_params.width = 80;
-  post_params.height = 80;
-  // rect from params is upside down, and is inflated in RWHVA, just because.
-  EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_,
-                                               gfx::Rect(19, 39, 42, 42)));
-  view_->AcceleratedSurfacePostSubBuffer(post_params, 0);
-  testing::Mock::VerifyAndClearExpectations(&observer);
-
-  // Composite-to-mailbox path
-  EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));
-  view_->OnSwapCompositorFrame(
-      0, MakeGLFrame(1.f, view_size, view_rect, owned_mailbox.get()));
-  testing::Mock::VerifyAndClearExpectations(&observer);
-
-  // rect from GL frame is upside down, and is inflated in RWHVA, just because.
-  EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_,
-                                               gfx::Rect(4, 89, 7, 7)));
-  view_->OnSwapCompositorFrame(
-      0,
-      MakeGLFrame(1.f, view_size, gfx::Rect(5, 5, 5, 5), owned_mailbox.get()));
-  testing::Mock::VerifyAndClearExpectations(&observer);
-
   // Software path
   EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_, view_rect));
   view_->OnSwapCompositorFrame(0, MakeSoftwareFrame(1.f, view_size, view_rect));
   testing::Mock::VerifyAndClearExpectations(&observer);
 
   EXPECT_CALL(observer, OnWindowPaintScheduled(view_->window_,
                                                gfx::Rect(5, 5, 5, 5)));
   view_->OnSwapCompositorFrame(
       0, MakeSoftwareFrame(1.f, view_size, gfx::Rect(5, 5, 5, 5)));
   testing::Mock::VerifyAndClearExpectations(&observer);
@@ skipping 411 matching lines @@
 
   // Because the copy request callback may be holding state within it, that
   // state must handle the RWHVA and ImageTransportFactory going away before the
   // callback is called. This test passes if it does not crash as a result of
   // these things being destroyed.
   EXPECT_EQ(2, callback_count_);
   EXPECT_FALSE(result_);
 }
 
 }  // namespace content