Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/web/PopupMenuImpl.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/ExecutionContextTask.h"
@@ skipping 258 matching lines @@
         else if (isHTMLOptGroupElement(child))
             addOptGroup(context, toHTMLOptGroupElement(child));
         else if (isHTMLHRElement(child))
             addSeparator(context, toHTMLHRElement(child));
     }
     context.finishGroupIfNecessary();
     PagePopupClient::addString("],\n", data);
 
     addProperty("anchorRectInScreen", anchorRectInScreen, data);
     float zoom = zoomFactor();
-    float scaleFactor = m_chromeClient->windowToViewportScalar(1.f);
+    float scaleFactor = m_chromeClient->windowToViewportScalar(*ownerElement.document().frame()->view(), 1.f);
     addProperty("zoomFactor", zoom / scaleFactor, data);
     bool isRTL = !ownerStyle->isLeftToRightDirection();
     addProperty("isRTL", isRTL, data);
     addProperty("paddingStart", isRTL ? ownerElement.clientPaddingRight().toDouble() / zoom : ownerElement.clientPaddingLeft().toDouble() / zoom, data);
     PagePopupClient::addString("};\n", data);
     data->append(Platform::current()->loadResource("pickerCommon.js"));
     data->append(Platform::current()->loadResource("listPicker.js"));
     PagePopupClient::addString("</script></body>\n", data);
 }
 
@@ skipping 235 matching lines @@
 
 void PopupMenuImpl::disconnectClient()
 {
     m_ownerElement = nullptr;
     // Cannot be done during finalization, so instead done when the
     // layout object is destroyed and disconnected.
     dispose();
 }
 
 } // namespace blink