Enable FlingSchedulerMac

Enable tests that were disabled because of this functionality missing.

Bug: 842325
Change-Id: I6f540460f4e5f81d7ff8dd36e4abf369f0bd4785
Reviewed-on: https://chromium-review.googlesource.com/1149612Reviewed-by: Jonathan Ross <jonross@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577957}

content/browser/renderer_host/browser_compositor_view_mac.h

@@ -148,7 +148,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
 
   bool ForceNewSurfaceForTesting();
 
-  ui::Compositor* GetCompositorForTesting() const;
+  ui::Compositor* GetCompositor() const;
 
  private:
   // ui::LayerObserver implementation:

content/browser/renderer_host/browser_compositor_view_mac.mm

@@ -487,7 +487,9 @@ void BrowserCompositorMac::LayerDestroyed(ui::Layer* layer) {
   SetParentUiLayer(nullptr);
 }
 
-ui::Compositor* BrowserCompositorMac::GetCompositorForTesting() const {
+ui::Compositor* BrowserCompositorMac::GetCompositor() const {
+  if (parent_ui_layer_)
+    return parent_ui_layer_->GetCompositor();
   if (recyclable_compositor_)
     return recyclable_compositor_->compositor();
   return nullptr;

content/browser/renderer_host/input/fling_scheduler_mac.mm

@@ -21,14 +21,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {
   // RWHV_child_frame doesn't have DelegatedFrameHost with ui::Compositor.
   if (host_->GetView()->IsRenderWidgetHostViewChildFrame())
     return nullptr;
-
-  // TODO(sahel): Uncomment this once Viz is ready on Mac.
-  // https://crbug.com/833985
-  /* RenderWidgetHostViewMac* view =
+  RenderWidgetHostViewMac* view =
       static_cast<RenderWidgetHostViewMac*>(host_->GetView());
   if (view->BrowserCompositor())
-    return view->BrowserCompositor()->Compositor();
-  } */
+    return view->BrowserCompositor()->GetCompositor();
 
   return nullptr;
 }

content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

@@ -1837,11 +1837,11 @@ TEST_F(InputMethodMacTest, MonitorCompositionRangeForActiveWidget) {
 
 TEST_F(RenderWidgetHostViewMacTest, ClearCompositorFrame) {
   BrowserCompositorMac* browser_compositor = rwhv_mac_->BrowserCompositor();
-  ui::Compositor* ui_compositor = browser_compositor->GetCompositorForTesting();
+  ui::Compositor* ui_compositor = browser_compositor->GetCompositor();
   EXPECT_NE(ui_compositor, nullptr);
   EXPECT_TRUE(ui_compositor->IsLocked());
   rwhv_mac_->ClearCompositorFrame();
-  EXPECT_EQ(browser_compositor->GetCompositorForTesting(), ui_compositor);
+  EXPECT_EQ(browser_compositor->GetCompositor(), ui_compositor);
   EXPECT_FALSE(ui_compositor->IsLocked());
 }
 

testing/buildbot/filters/viz.content_browsertests.filter

 ### Mac
-# BrowserSideFlingBrowserTest timing out https://crbug.com/842325
--BrowserSideFlingBrowserTest.AutoscrollFling
--BrowserSideFlingBrowserTest.TouchpadFling
--BrowserSideFlingBrowserTest.TouchscreenFling
--SitePerProcessBrowserTest.TouchpadGestureFlingStart
--SitePerProcessBrowserTest.TouchscreenGestureFlingStart