Plumb LocalFrame through ChromeClient::WindowToViewportScalar (part 1).

This CL introduces a new version of WindowToViewportScalar that takes a
LocalFrame parameter, marks the existing version as deprecated, and adds
one caller to the new version. The new caller is DataTimeChooserImpl,
and that change is what fixes bug 1006919.

What was happening before is that in the context of an out-of-process
subframe, WindowToViewportScalar was not finding a LocalFrame for the
top frame. It would then bail out early, not calling the appropriate
WebWidgetClient method. Hence, the error reported in the bug.

A follow-up CL will migrate the rest of the callers over to the version
of this method that takes a LocalFrame parameter and remove the other.

Bug: 1006919
Change-Id: I04bd2fa80abed139b90a42b81668bcc3aba8f967
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1831447Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Darin Fisher <darin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#701558}

third_party/blink/renderer/core/html/forms/date_time_chooser_impl.cc

@@ -35,6 +35,7 @@
 #include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/dom/element.h"
 #include "third_party/blink/renderer/core/dom/node_computed_style.h"
+#include "third_party/blink/renderer/core/frame/local_frame.h"
 #include "third_party/blink/renderer/core/frame/local_frame_view.h"
 #include "third_party/blink/renderer/core/html/forms/chooser_resource_loader.h"
 #include "third_party/blink/renderer/core/html/forms/date_time_chooser_client.h"
@@ -49,25 +50,25 @@
 namespace blink {
 
 DateTimeChooserImpl::DateTimeChooserImpl(
-    ChromeClient* chrome_client,
+    LocalFrame* frame,
     DateTimeChooserClient* client,
     const DateTimeChooserParameters& parameters)
-    : chrome_client_(chrome_client),
+    : frame_(frame),
       client_(client),
       popup_(nullptr),
       parameters_(&parameters),
       locale_(Locale::Create(parameters.locale)) {
   DCHECK(RuntimeEnabledFeatures::InputMultipleFieldsUIEnabled());
-  DCHECK(chrome_client_);
+  DCHECK(frame_);
   DCHECK(client_);
-  popup_ = chrome_client_->OpenPagePopup(this);
+  popup_ = frame_->View()->GetChromeClient()->OpenPagePopup(this);
   parameters_ = nullptr;
 }
 
 DateTimeChooserImpl::~DateTimeChooserImpl() = default;
 
 void DateTimeChooserImpl::Trace(Visitor* visitor) {
-  visitor->Trace(chrome_client_);
+  visitor->Trace(frame_);
   visitor->Trace(client_);
   DateTimeChooser::Trace(visitor);
 }
@@ -75,7 +76,7 @@ void DateTimeChooserImpl::Trace(Visitor* visitor) {
 void DateTimeChooserImpl::EndChooser() {
   if (!popup_)
     return;
-  chrome_client_->ClosePagePopup(popup_);
+  frame_->View()->GetChromeClient()->ClosePagePopup(popup_);
 }
 
 AXObject* DateTimeChooserImpl::RootAXObject() {
@@ -138,7 +139,8 @@ void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
       "window.dialogArguments = {\n",
       data);
   AddProperty("anchorRectInScreen", parameters_->anchor_rect_in_screen, data);
-  float scale_factor = chrome_client_->WindowToViewportScalar(1.0f);
+  float scale_factor =
+      frame_->View()->GetChromeClient()->WindowToViewportScalar(frame_, 1.0f);
   AddProperty("zoomFactor", ZoomFactor() / scale_factor, data);
   AddProperty("min",
               ValueToDateTimeString(parameters_->minimum, parameters_->type),

third_party/blink/renderer/core/html/forms/date_time_chooser_impl.h

@@ -38,14 +38,14 @@
 
 namespace blink {
 
-class ChromeClient;
 class DateTimeChooserClient;
+class LocalFrame;
 class PagePopup;
 
 class CORE_EXPORT DateTimeChooserImpl final : public DateTimeChooser,
                                               public PagePopupClient {
  public:
-  DateTimeChooserImpl(ChromeClient*,
+  DateTimeChooserImpl(LocalFrame*,
                       DateTimeChooserClient*,
                       const DateTimeChooserParameters&);
   ~DateTimeChooserImpl() override;
@@ -67,7 +67,7 @@ class CORE_EXPORT DateTimeChooserImpl final : public DateTimeChooser,
   Element& OwnerElement() override;
   void DidClosePopup() override;
 
-  Member<ChromeClient> chrome_client_;
+  Member<LocalFrame> frame_;
   Member<DateTimeChooserClient> client_;
   PagePopup* popup_;
   // This pointer is valid only in the constructor.

third_party/blink/renderer/core/loader/empty_clients.h

@@ -177,6 +177,9 @@ class CORE_EXPORT EmptyChromeClient : public ChromeClient {
     return r;
   }
   float WindowToViewportScalar(const float s) const override { return s; }
+  float WindowToViewportScalar(LocalFrame*, const float s) const override {
+    return s;
+  }
   WebScreenInfo GetScreenInfo() const override { return WebScreenInfo(); }
   void ContentsSizeChanged(LocalFrame*, const IntSize&) const override {}
 

third_party/blink/renderer/core/page/chrome_client.h

@@ -111,8 +111,10 @@ class CORE_EXPORT ChromeClient : public GarbageCollected<ChromeClient> {
   virtual ~ChromeClient() = default;
 
   // Converts the scalar value from the window coordinates to the viewport
-  // scale.
+  // scale. TODO(darin): Convert all callers over to the LocalFrame version.
   virtual float WindowToViewportScalar(const float) const = 0;
+  virtual float WindowToViewportScalar(LocalFrame*,
+                                       const float value) const = 0;
 
   virtual bool IsPopup() { return false; }
 

third_party/blink/renderer/core/page/chrome_client_impl.cc

@@ -473,9 +473,17 @@ IntRect ChromeClientImpl::ViewportToScreen(
 }
 
 float ChromeClientImpl::WindowToViewportScalar(const float scalar_value) const {
-  // TODO(darin): Change caller to pass LocalFrame. Note, FrameWidgetImpl() can
-  // be null during Scrollbar() construction.
-  WebLocalFrameImpl* local_frame = web_view_->MainFrameImpl();
+  // TODO(darin): Change callers to pass a LocalFrame.
+  return WindowToViewportScalar(web_view_->MainFrameImpl()
+                                    ? web_view_->MainFrameImpl()->GetFrame()
+                                    : nullptr,
+                                scalar_value);
+}
+
+float ChromeClientImpl::WindowToViewportScalar(LocalFrame* frame,
+                                               const float scalar_value) const {
+  // Note, FrameWidgetImpl() can be null during Scrollbar() construction.
+  WebLocalFrameImpl* local_frame = WebLocalFrameImpl::FromFrame(frame);
   if (!local_frame || !local_frame->FrameWidgetImpl())
     return scalar_value;
 
@@ -633,7 +641,7 @@ DateTimeChooser* ChromeClientImpl::OpenDateTimeChooser(
 
   NotifyPopupOpeningObservers();
   if (RuntimeEnabledFeatures::InputMultipleFieldsUIEnabled()) {
-    return MakeGarbageCollected<DateTimeChooserImpl>(this, picker_client,
+    return MakeGarbageCollected<DateTimeChooserImpl>(frame, picker_client,
                                                      parameters);
   }
 

third_party/blink/renderer/core/page/chrome_client_impl.h

@@ -125,6 +125,7 @@ class CORE_EXPORT ChromeClientImpl final : public ChromeClient {
   IntRect ViewportToScreen(const IntRect&,
                            const LocalFrameView*) const override;
   float WindowToViewportScalar(const float) const override;
+  float WindowToViewportScalar(LocalFrame*, const float) const override;
   WebScreenInfo GetScreenInfo() const override;
   void OverrideVisibleRectForMainFrame(LocalFrame& frame,
                                        IntRect* paint_rect) const override;