Remove surface_id from RenderWidget/RenderWidgetHost and friends

content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

 // 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_mac.h"
 
 #include <Cocoa/Cocoa.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
 #include "content/browser/gpu/compositor_util.h"
-#include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view_mac_delegate.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_utils.h"
 #include "content/test/test_render_view_host.h"
@@ skipping 96 matching lines @@
   void Cut() override {}
   void Copy() override {}
   void Paste() override {}
   void SelectAll() override {}
 };
 
 class MockRenderWidgetHostImpl : public RenderWidgetHostImpl {
  public:
   MockRenderWidgetHostImpl(RenderWidgetHostDelegate* delegate,
                            RenderProcessHost* process,
-                           int32 routing_id,
-                           int32 surface_id)
-      : RenderWidgetHostImpl(delegate, process, routing_id, surface_id, false) {
-  }
+                           int32 routing_id)
+      : RenderWidgetHostImpl(delegate, process, routing_id, false) {}
 
   MOCK_METHOD0(Focus, void());
   MOCK_METHOD0(Blur, void());
 };
 
 // Generates the |length| of composition rectangle vector and save them to
 // |output|. It starts from |origin| and each rectangle contains |unit_size|.
 void GenerateCompositionRectArray(const gfx::Point& origin,
                                   const gfx::Size& unit_size,
                                   size_t length,
@@ skipping 124 matching lines @@
 
 // Verify that escape key down in fullscreen mode suppressed the keyup event on
 // the parent.
 TEST_F(RenderWidgetHostViewMacTest, FullscreenCloseOnEscape) {
   // Use our own RWH since we need to destroy it.
   MockRenderWidgetHostDelegate delegate;
   TestBrowserContext browser_context;
   MockRenderProcessHost* process_host =
       new MockRenderProcessHost(&browser_context);
   int32 routing_id = process_host->GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host->GetID(), routing_id);
   // Owned by its |cocoa_view()|.
-  RenderWidgetHostImpl* rwh = new RenderWidgetHostImpl(
-      &delegate, process_host, routing_id, surface_id, false);
+  RenderWidgetHostImpl* rwh =
+      new RenderWidgetHostImpl(&delegate, process_host, routing_id, false);
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(rwh, false);
 
   view->InitAsFullscreen(rwhv_mac_);
 
   WindowedNotificationObserver observer(
       NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       Source<RenderWidgetHost>(rwh));
   EXPECT_FALSE([rwhv_mac_->cocoa_view() suppressNextEscapeKeyUp]);
 
   // Escape key down. Should close window and set |suppressNextEscapeKeyUp| on
@@ skipping 11 matching lines @@
 
 // Test that command accelerators which destroy the fullscreen window
 // don't crash when forwarded via the window's responder machinery.
 TEST_F(RenderWidgetHostViewMacTest, AcceleratorDestroy) {
   // Use our own RWH since we need to destroy it.
   MockRenderWidgetHostDelegate delegate;
   TestBrowserContext browser_context;
   MockRenderProcessHost* process_host =
       new MockRenderProcessHost(&browser_context);
   int32 routing_id = process_host->GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host->GetID(), routing_id);
   // Owned by its |cocoa_view()|.
-  RenderWidgetHostImpl* rwh = new RenderWidgetHostImpl(
-      &delegate, process_host, routing_id, surface_id, false);
+  RenderWidgetHostImpl* rwh =
+      new RenderWidgetHostImpl(&delegate, process_host, routing_id, false);
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(rwh, false);
 
   view->InitAsFullscreen(rwhv_mac_);
 
   WindowedNotificationObserver observer(
       NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
       Source<RenderWidgetHost>(rwh));
 
   // Command-ESC will destroy the view, while the window is still in
   // |-performKeyEquivalent:|.  There are other cases where this can
@@ skipping 358 matching lines @@
 // Verify that |SetActive()| calls |RenderWidgetHostImpl::Blur()| and
 // |RenderWidgetHostImp::Focus()|.
 TEST_F(RenderWidgetHostViewMacTest, BlurAndFocusOnSetActive) {
   MockRenderWidgetHostDelegate delegate;
   TestBrowserContext browser_context;
   MockRenderProcessHost* process_host =
       new MockRenderProcessHost(&browser_context);
 
   // Owned by its |cocoa_view()|.
   int32 routing_id = process_host->GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host->GetID(), routing_id);
-  MockRenderWidgetHostImpl* rwh = new MockRenderWidgetHostImpl(
-      &delegate, process_host, routing_id, surface_id);
+  MockRenderWidgetHostImpl* rwh =
+      new MockRenderWidgetHostImpl(&delegate, process_host, routing_id);
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(rwh, false);
 
   base::scoped_nsobject<CocoaTestHelperWindow> window(
       [[CocoaTestHelperWindow alloc] init]);
   [[window contentView] addSubview:view->cocoa_view()];
 
   EXPECT_CALL(*rwh, Focus());
   [window makeFirstResponder:view->cocoa_view()];
   testing::Mock::VerifyAndClearExpectations(rwh);
 
@@ skipping 26 matching lines @@
 
   // Initialize the view associated with a MockRenderWidgetHostImpl, rather than
   // the MockRenderProcessHost that is set up by the test harness which mocks
   // out |OnMessageReceived()|.
   TestBrowserContext browser_context;
   MockRenderProcessHost* process_host =
       new MockRenderProcessHost(&browser_context);
   process_host->Init();
   MockRenderWidgetHostDelegate delegate;
   int32 routing_id = process_host->GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host->GetID(), routing_id);
-  MockRenderWidgetHostImpl* host = new MockRenderWidgetHostImpl(
-      &delegate, process_host, routing_id, surface_id);
+  MockRenderWidgetHostImpl* host =
+      new MockRenderWidgetHostImpl(&delegate, process_host, routing_id);
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(host, false);
 
   // Send an initial wheel event with NSEventPhaseBegan to the view.
   NSEvent* event1 = MockScrollWheelEventWithPhase(@selector(phaseBegan), 0);
   [view->cocoa_view() scrollWheel:event1];
   ASSERT_EQ(1U, process_host->sink().message_count());
 
   // Send an ACK for the first wheel event, so that the queue will be flushed.
   InputEventAck ack(blink::WebInputEvent::MouseWheel,
                     INPUT_EVENT_ACK_STATE_CONSUMED);
@@ skipping 19 matching lines @@
 
   // Initialize the view associated with a MockRenderWidgetHostImpl, rather than
   // the MockRenderProcessHost that is set up by the test harness which mocks
   // out |OnMessageReceived()|.
   TestBrowserContext browser_context;
   MockRenderProcessHost* process_host =
       new MockRenderProcessHost(&browser_context);
   process_host->Init();
   MockRenderWidgetHostDelegate delegate;
   int32 routing_id = process_host->GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host->GetID(), routing_id);
-  MockRenderWidgetHostImpl* host = new MockRenderWidgetHostImpl(
-      &delegate, process_host, routing_id, surface_id);
+  MockRenderWidgetHostImpl* host =
+      new MockRenderWidgetHostImpl(&delegate, process_host, routing_id);
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(host, false);
 
   // Add a delegate to the view.
   base::scoped_nsobject<MockRenderWidgetHostViewMacDelegate> view_delegate(
       [[MockRenderWidgetHostViewMacDelegate alloc] init]);
   view->SetDelegate(view_delegate.get());
 
   // Send an initial wheel event for scrolling by 3 lines.
   NSEvent* event1 = MockScrollWheelEventWithPhase(@selector(phaseBegan), 3);
   [view->cocoa_view() scrollWheel:event1];
@@ skipping 29 matching lines @@
 }
 
 // Tests that when view initiated shutdown happens (i.e. RWHView is deleted
 // before RWH), we clean up properly and don't leak the RWHVGuest.
 TEST_F(RenderWidgetHostViewMacTest, GuestViewDoesNotLeak) {
   MockRenderWidgetHostDelegate delegate;
   TestBrowserContext browser_context;
   MockRenderProcessHost* process_host =
       new MockRenderProcessHost(&browser_context);
   int32 routing_id = process_host->GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host->GetID(), routing_id);
 
   // Owned by its |cocoa_view()|.
-  MockRenderWidgetHostImpl* rwh = new MockRenderWidgetHostImpl(
-      &delegate, process_host, routing_id, surface_id);
+  MockRenderWidgetHostImpl* rwh =
+      new MockRenderWidgetHostImpl(&delegate, process_host, routing_id);
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(rwh, true);
 
   // Add a delegate to the view.
   base::scoped_nsobject<MockRenderWidgetHostViewMacDelegate> view_delegate(
       [[MockRenderWidgetHostViewMacDelegate alloc] init]);
   view->SetDelegate(view_delegate.get());
 
   base::WeakPtr<RenderWidgetHostViewBase> guest_rwhv_weak =
       (new RenderWidgetHostViewGuest(
            rwh, NULL, view->GetWeakPtr()))->GetWeakPtr();
@@ skipping 19 matching lines @@
 
 // Tests setting background transparency. See also (disabled on Mac)
 // RenderWidgetHostTest.Background. This test has some additional checks for
 // Mac.
 TEST_F(RenderWidgetHostViewMacTest, Background) {
   TestBrowserContext browser_context;
   MockRenderProcessHost* process_host =
       new MockRenderProcessHost(&browser_context);
   MockRenderWidgetHostDelegate delegate;
   int32 routing_id = process_host->GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host->GetID(), routing_id);
-  MockRenderWidgetHostImpl* host = new MockRenderWidgetHostImpl(
-      &delegate, process_host, routing_id, surface_id);
+  MockRenderWidgetHostImpl* host =
+      new MockRenderWidgetHostImpl(&delegate, process_host, routing_id);
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(host, false);
 
   EXPECT_TRUE(view->GetBackgroundOpaque());
   EXPECT_TRUE([view->cocoa_view() isOpaque]);
 
   view->SetBackgroundColor(SK_ColorTRANSPARENT);
   EXPECT_FALSE(view->GetBackgroundOpaque());
   EXPECT_FALSE([view->cocoa_view() isOpaque]);
 
   const IPC::Message* set_background;
@@ skipping 55 matching lines @@
     return;
 
   // Initialize the view associated with a MockRenderWidgetHostImpl, rather than
   // the MockRenderProcessHost that is set up by the test harness which mocks
   // out |OnMessageReceived()|.
   TestBrowserContext browser_context;
   process_host_ = new MockRenderProcessHost(&browser_context);
   process_host_->Init();
   MockRenderWidgetHostDelegate delegate;
   int32 routing_id = process_host_->GetNextRoutingID();
-  int32 surface_id = GpuSurfaceTracker::Get()->AddSurfaceForRenderer(
-      process_host_->GetID(), routing_id);
-  MockRenderWidgetHostImpl* host = new MockRenderWidgetHostImpl(
-      &delegate, process_host_, routing_id, surface_id);
+  MockRenderWidgetHostImpl* host =
+      new MockRenderWidgetHostImpl(&delegate, process_host_, routing_id);
   RenderWidgetHostViewMac* view = new RenderWidgetHostViewMac(host, false);
 
   // We'll use this IPC message to ack events.
   InputEventAck ack(blink::WebInputEvent::GesturePinchUpdate,
                     INPUT_EVENT_ACK_STATE_CONSUMED);
   scoped_ptr<IPC::Message> response(
       new InputHostMsg_HandleInputEvent_ACK(0, ack));
 
   // Do a gesture that crosses the threshold.
   {
@@ skipping 88 matching lines @@
     EXPECT_EQ(1U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
   }
 
   // Clean up.
   host->Shutdown();
 }
 
 
 }  // namespace content