Move IntrinsicSizingInfoChanged into base.

We can move this implementation into base and DCHECK that it is only called for subframes. BUG=1097816 Change-Id: I0b89c52f1574507d5aea0b04ba4bcb4fb95bc8fc Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536509 Commit-Queue: Dave Tapuska <[email protected]> Reviewed-by: danakj <[email protected]> Cr-Commit-Position: refs/heads/master@{#827844} GitOrigin-RevId: 85348a7ee5b962a7178c57e2cc0eaacef3c48fbe
mjfroman · Nov 16, 2020 · 16c5c4c · 16c5c4c
1 parent 5456f96
commit 16c5c4c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/blink/renderer/core/frame/web_frame_widget_base.cc b/blink/renderer/core/frame/web_frame_widget_base.cc
@@ -1911,6 +1911,13 @@ float WebFrameWidgetBase::GetEmulatorScale() {
   return 1.0f;
 }
 
+void WebFrameWidgetBase::IntrinsicSizingInfoChanged(
+    mojom::blink::IntrinsicSizingInfoPtr sizing_info) {
+  DCHECK(ForSubframe());
+  GetAssociatedFrameWidgetHost()->IntrinsicSizingInfoChanged(
+      std::move(sizing_info));
+}
+
 void WebFrameWidgetBase::AutoscrollStart(const gfx::PointF& position) {
   GetAssociatedFrameWidgetHost()->AutoscrollStart(std::move(position));
 }

diff --git a/blink/renderer/core/frame/web_frame_widget_base.h b/blink/renderer/core/frame/web_frame_widget_base.h
@@ -109,8 +109,9 @@ class CORE_EXPORT WebFrameWidgetBase
   // Opposite of |ForSubframe|. If this widget is for the local main frame.
   bool ForMainFrame() const { return !ForSubframe(); }
 
-  virtual void IntrinsicSizingInfoChanged(
-      mojom::blink::IntrinsicSizingInfoPtr) {}
+  // Called when the intrinsic size of the owning container is changing its
+  // size. This should only be called when `ForSubframe` is true.
+  void IntrinsicSizingInfoChanged(mojom::blink::IntrinsicSizingInfoPtr);
 
   void AutoscrollStart(const gfx::PointF& position);
   void AutoscrollFling(const gfx::Vector2dF& position);

diff --git a/blink/renderer/core/frame/web_frame_widget_impl.cc b/blink/renderer/core/frame/web_frame_widget_impl.cc
@@ -344,12 +344,6 @@ bool WebFrameWidgetImpl::ScrollFocusedEditableElementIntoView() {
   return true;
 }
 
-void WebFrameWidgetImpl::IntrinsicSizingInfoChanged(
-    mojom::blink::IntrinsicSizingInfoPtr sizing_info) {
-  GetAssociatedFrameWidgetHost()->IntrinsicSizingInfoChanged(
-      std::move(sizing_info));
-}
-
 void WebFrameWidgetImpl::MouseCaptureLost() {
   TRACE_EVENT_NESTABLE_ASYNC_END0("input", "capturing mouse",
                                   TRACE_ID_LOCAL(this));

diff --git a/blink/renderer/core/frame/web_frame_widget_impl.h b/blink/renderer/core/frame/web_frame_widget_impl.h
@@ -108,8 +108,6 @@ class WebFrameWidgetImpl final : public WebFrameWidgetBase {
   // WebFrameWidgetBase overrides:
   bool ForSubframe() const override { return true; }
   bool ForTopLevelFrame() const override { return false; }
-  void IntrinsicSizingInfoChanged(
-      mojom::blink::IntrinsicSizingInfoPtr) override;
   void DidCreateLocalRootView() override;
   void ZoomToFindInPageRect(const WebRect& rect_in_root_frame) override;
   void SetAutoResizeMode(bool auto_resize,