Remove ScrollableArea::GetFrameViewBase and move ScheduleAnimation into subclasses.

third_party/WebKit/Source/web/InspectorOverlay.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 146 matching lines @@
 
   void SetToolTip(LocalFrame& frame,
                   const String& tooltip,
                   TextDirection direction) override {
     DCHECK_EQ(&frame, overlay_->OverlayMainFrame());
     client_->SetToolTip(*overlay_->frame_impl_->GetFrame(), tooltip, direction);
   }
 
   void InvalidateRect(const IntRect&) override { overlay_->Invalidate(); }
 
-  void ScheduleAnimation(FrameViewBase* frame_view_base) override {
+  void ScheduleAnimation(LocalFrame* frame) override {
     if (overlay_->in_layout_)
       return;
 
-    client_->ScheduleAnimation(frame_view_base);
+    client_->ScheduleAnimation(frame);
   }
 
  private:
   InspectorOverlayChromeClient(ChromeClient& client, InspectorOverlay& overlay)
       : client_(&client), overlay_(&overlay) {}
 
   Member<ChromeClient> client_;
   Member<InspectorOverlay> overlay_;
 };
 
@@ skipping 212 matching lines @@
          inspect_mode_ == InspectorDOMAgent::kNotSearching;
 }
 
 void InspectorOverlay::ScheduleUpdate() {
   if (IsEmpty()) {
     if (page_overlay_)
       page_overlay_.reset();
     return;
   }
   needs_update_ = true;
-  FrameView* view = frame_impl_->GetFrameView();
   LocalFrame* frame = frame_impl_->GetFrame();
-  if (view && frame)
-    frame->GetPage()->GetChromeClient().ScheduleAnimation(view);
+  if (frame) {
+    // TODO(joelhockey): Remove this check once all tests pass.

[dcheng, 2017/04/19 11:26:25]

I don't think I understand this comment. Presumably all the tests pass if this
CL landed?

[joelhockey, 2017/04/19 11:33:18]

Thanks for picking this up.  I'll send a fix now.

+    CHECK(frame_impl_->GetFrameView());
+    frame->GetPage()->GetChromeClient().ScheduleAnimation(frame);
+  }
 }
 
 void InspectorOverlay::RebuildOverlayPage() {
   FrameView* view = frame_impl_->GetFrameView();
   LocalFrame* frame = frame_impl_->GetFrame();
   if (!view || !frame)
     return;
 
   IntRect visible_rect_in_document =
       view->GetScrollableArea()->VisibleContentRect();
@@ skipping 400 matching lines @@
 bool InspectorOverlay::ShouldSearchForNode() {
   return inspect_mode_ != InspectorDOMAgent::kNotSearching;
 }
 
 void InspectorOverlay::Inspect(Node* node) {
   if (dom_agent_)
     dom_agent_->Inspect(node);
 }
 
 }  // namespace blink