Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/web/ChromeClientImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 574 matching lines @@
     if (client) {
         client->convertViewportToWindow(&screenRect);
         WebRect windowRect = client->windowRect();
         screenRect.x += windowRect.x;
         screenRect.y += windowRect.y;
     }
 
     return screenRect;
 }
 
-float ChromeClientImpl::windowToViewportScalar(const float scalarValue) const
+float ChromeClientImpl::windowToViewportScalar(const float scalarValue, const Widget* widget) const
 {
-    if (!m_webView->client())
+    DCHECK(widget->isFrameView());
+    const FrameView* view = toFrameView(widget);
+    LocalFrame* frame = view->frame().localFrameRoot();
+
+    WebWidgetClient* client = WebLocalFrameImpl::fromFrame(frame)->frameWidget()->client();
+    if (!client)
         return scalarValue;
+
     WebFloatRect viewportRect(0, 0, scalarValue, 0);
-    m_webView->client()->convertWindowToViewport(&viewportRect);
+    client->convertWindowToViewport(&viewportRect);
     return viewportRect.width;
 }
 
 WebScreenInfo ChromeClientImpl::screenInfo() const
 {
     return m_webView->client() ? m_webView->client()->screenInfo() : WebScreenInfo();
 }
 
 void ChromeClientImpl::contentsSizeChanged(LocalFrame* frame, const IntSize& size) const
 {
@@ skipping 525 matching lines @@
     ScreenOrientationController::provideTo(frame, client ? client->webScreenOrientationClient() : nullptr);
     if (RuntimeEnabledFeatures::presentationEnabled())
         PresentationController::provideTo(frame, client ? client->presentationClient() : nullptr);
     if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
         provideAudioOutputDeviceClientTo(frame, AudioOutputDeviceClientImpl::create());
     if (RuntimeEnabledFeatures::installedAppEnabled())
         InstalledAppController::provideTo(frame, client ? client->installedAppClient() : nullptr);
 }
 
 } // namespace blink