Resolve TODOs on WebFrameWidgetImpl.

Make sure LayerTreeHost accessor is not on the public scope.
Remove stale TODO.

BUG=1097816

Change-Id: Icaa829177ff29683747a50ec2f82137e9f7a5080
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2570994
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835710}

third_party/blink/renderer/core/frame/local_frame_client_impl.cc

@@ -578,17 +578,16 @@ void LocalFrameClientImpl::DispatchDidCommitLoad(
       // a navigation on the main frame we setup the appropriate structures.
       if (web_frame_->GetFrame()->IsMainFrame() &&
           web_frame_->ViewImpl()->does_composite()) {
-        cc::LayerTreeHost* layer_tree_host =
-            web_frame_->FrameWidgetImpl()->LayerTreeHost();
+        WebFrameWidgetImpl* frame_widget = web_frame_->FrameWidgetImpl();
 
         // Update the URL and the document source id used to key UKM metrics in
         // the compositor. Note that the metrics for all frames are keyed to the
         // main frame's URL.
-        layer_tree_host->SetSourceURL(
+        frame_widget->SetSourceURLForCompositor(
             web_frame_->GetDocument().GetUkmSourceId(),
             KURL(web_frame_->Client()->LastCommittedUrlForUKM()));
 
-        auto shmem = layer_tree_host->CreateSharedMemoryForSmoothnessUkm();
+        auto shmem = frame_widget->CreateSharedMemoryForSmoothnessUkm();
         if (shmem.IsValid()) {
           web_frame_->Client()->SetUpSharedMemoryForSmoothness(
               std::move(shmem));

third_party/blink/renderer/core/frame/web_frame_widget_impl.cc

@@ -3926,6 +3926,20 @@ WebPlugin* WebFrameWidgetImpl::GetFocusedPluginContainer() {
   return nullptr;
 }
 
+bool WebFrameWidgetImpl::HasPendingPageScaleAnimation() {
+  return LayerTreeHost()->HasPendingPageScaleAnimation();
+}
+
+void WebFrameWidgetImpl::SetSourceURLForCompositor(ukm::SourceId source_id,
+                                                   const KURL& url) {
+  LayerTreeHost()->SetSourceURL(source_id, url);
+}
+
+base::ReadOnlySharedMemoryRegion
+WebFrameWidgetImpl::CreateSharedMemoryForSmoothnessUkm() {
+  return LayerTreeHost()->CreateSharedMemoryForSmoothnessUkm();
+}
+
 bool WebFrameWidgetImpl::CanComposeInline() {
   if (auto* plugin = GetFocusedPluginContainer())
     return plugin->CanComposeInline();

third_party/blink/renderer/core/frame/web_frame_widget_impl.h

@@ -311,9 +311,6 @@ class CORE_EXPORT WebFrameWidgetImpl
   void SetDeviceScaleFactorForTesting(float factor) override;
   void ZoomToFindInPageRect(const WebRect& rect_in_root_frame) override;
   FrameWidgetTestHelper* GetFrameWidgetTestHelperForTesting() override;
-  // TODO(dtapuska): Move this into private scope to match the interface
-  // definition.
-  cc::LayerTreeHost* LayerTreeHost() override;
 
   // Called when a drag-n-drop operation should begin.
   virtual void StartDragging(const WebDragData&,
@@ -570,6 +567,15 @@ class CORE_EXPORT WebFrameWidgetImpl
   // Return the focused WebPlugin if there is one.
   WebPlugin* GetFocusedPluginContainer();
 
+  // Return if there is a pending scale animation.
+  bool HasPendingPageScaleAnimation();
+
+  // Set the source URL for the compositor.
+  void SetSourceURLForCompositor(ukm::SourceId source_id, const KURL& url);
+
+  // Ask compositor to create the shared memory for smoothness ukm region.
+  base::ReadOnlySharedMemoryRegion CreateSharedMemoryForSmoothnessUkm();
+
  protected:
   // WidgetBaseClient overrides:
   void ScheduleAnimation() override;
@@ -582,6 +588,9 @@ class CORE_EXPORT WebFrameWidgetImpl
   // overridden by tests to disable this.
   virtual bool ShouldAutoDetermineCompositingToLCDTextSetting();
 
+  // WebFrameWidget overrides.
+  cc::LayerTreeHost* LayerTreeHost() override;
+
   bool doing_drag_and_drop_ = false;
 
  private:
@@ -865,8 +874,6 @@ class CORE_EXPORT WebFrameWidgetImpl
   bool is_pinch_gesture_active_in_mainframe_ = false;
 
   // If set, the (plugin) element which has mouse capture.
-  // TODO(dtapuska): Move to private once all input handling is moved to
-  // base class.
   Member<HTMLPlugInElement> mouse_capture_element_;
 
   // The size of the widget in viewport coordinates. This is slightly different

third_party/blink/renderer/core/frame/web_frame_widget_test.cc

@@ -128,7 +128,7 @@ TEST_F(WebFrameWidgetSimTest, FrameSinkIdHitTestAPI) {
 #if defined(OS_ANDROID)
 TEST_F(WebFrameWidgetSimTest, ForceSendMetadataOnInput) {
   cc::LayerTreeHost* layer_tree_host =
-      WebView().MainFrameViewWidget()->LayerTreeHost();
+      WebView().MainFrameViewWidget()->LayerTreeHostForTesting();
   // We should not have any force send metadata requests at start.
   EXPECT_FALSE(layer_tree_host->TakeForceSendMetadataRequest());
   // ShowVirtualKeyboard will trigger a text input state update.

third_party/blink/renderer/core/frame/web_local_frame_impl.cc

@@ -2787,8 +2787,7 @@ void WebLocalFrameImpl::ScrollFocusedEditableElementIntoRect(
 
   rect_for_scrolled_focused_editable_node_ = rect;
   has_scrolled_focused_editable_node_into_rect_ = true;
-  if (!local_root_frame_widget->LayerTreeHost()
-           ->HasPendingPageScaleAnimation() &&
+  if (!local_root_frame_widget->HasPendingPageScaleAnimation() &&
       autofill_client_) {
     autofill_client_->DidCompleteFocusChangeInFrame();
   }