Compute the popup location/size correctly when use-zoom-for-dsf is enabled.

third_party/WebKit/Source/web/WebPagePopupImpl.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 57 matching lines @@
 
 class PagePopupChromeClient final : public EmptyChromeClient {
 public:
     static PassOwnPtrWillBeRawPtr<PagePopupChromeClient> create(WebPagePopupImpl* popup)
     {
         return adoptPtrWillBeNoop(new PagePopupChromeClient(popup));
     }
 
     void setWindowRect(const IntRect& rect) override
     {
-        m_popup->m_windowRectInScreen = rect;
-        m_popup->widgetClient()->setWindowRect(m_popup->m_windowRectInScreen);
+        m_popup->setWindowRect(rect);
     }
 
 private:
     explicit PagePopupChromeClient(WebPagePopupImpl* popup)
         : m_popup(popup)
     {
         ASSERT(m_popup->widgetClient());
     }
 
     void closeWindowSoon() override
     {
         m_popup->closePopup();
     }
 
     IntRect windowRect() override
     {
-        return IntRect(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInScreen.y, m_popup->m_windowRectInScreen.width, m_popup->m_windowRectInScreen.height);
+        return m_popup->m_windowRectInScreen;
     }
 
     IntRect viewportToScreen(const IntRect& rect) const override
     {
-        IntRect rectInScreen(rect);
-        rectInScreen.move(m_popup->m_windowRectInScreen.x, m_popup->m_windowRectInScreen.y);
+        WebRect rectInScreen(rect);
+        m_popup->widgetClient()->convertViewportToWindow(&rectInScreen);
+        rectInScreen.x += m_popup->m_windowRectInScreen.x;
+        rectInScreen.y += m_popup->m_windowRectInScreen.y;
         return rectInScreen;
     }
 
     void addMessageToConsole(LocalFrame*, MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String&, const String&) override
     {
 #ifndef NDEBUG
         fprintf(stderr, "CONSOLE MESSSAGE:%u: %s\n", lineNumber, message.utf8().data());
 #endif
     }
 
@@ skipping 128 matching lines @@
 bool WebPagePopupImpl::initializePage()
 {
     Page::PageClients pageClients;
     fillWithEmptyClients(pageClients);
     m_chromeClient = PagePopupChromeClient::create(this);
     pageClients.chromeClient = m_chromeClient.get();
 
     m_page = adoptPtrWillBeNoop(new Page(pageClients));
     m_page->settings().setScriptEnabled(true);
     m_page->settings().setAllowScriptsToCloseWindows(true);
-    m_page->setDeviceScaleFactor(m_webView->deviceScaleFactor());
     m_page->settings().setDeviceSupportsTouch(m_webView->page()->settings().deviceSupportsTouch());
     // FIXME: Should we support enabling a11y while a popup is shown?
     m_page->settings().setAccessibilityEnabled(m_webView->page()->settings().accessibilityEnabled());
     m_page->settings().setScrollAnimatorEnabled(m_webView->page()->settings().scrollAnimatorEnabled());
 
     provideContextFeaturesTo(*m_page, adoptPtr(new PagePopupFeaturesClient()));
     DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<FrameLoaderClient>, emptyFrameLoaderClient, (EmptyFrameLoaderClient::create()));
     RefPtrWillBeRawPtr<LocalFrame> frame = LocalFrame::create(emptyFrameLoaderClient.get(), &m_page->frameHost(), 0);
     frame->setPagePopupOwner(m_popupClient->ownerElement());
     frame->setView(FrameView::create(frame.get()));
     frame->init();
     frame->view()->setTransparent(false);
     if (AXObjectCache* cache = m_popupClient->ownerElement().document().existingAXObjectCache())
         cache->childrenChanged(&m_popupClient->ownerElement());
 
     ASSERT(frame->localDOMWindow());
     DOMWindowPagePopup::install(*frame->localDOMWindow(), *this, m_popupClient);
     ASSERT(m_popupClient->ownerElement().document().existingAXObjectCache() == frame->document()->existingAXObjectCache());
 
     RefPtr<SharedBuffer> data = SharedBuffer::create();
     m_popupClient->writeDocument(data.get());
     frame->loader().load(FrameLoadRequest(0, blankURL(), SubstituteData(data, "text/html", "UTF-8", KURL(), ForceSynchronousLoad)));
     frame->setPageZoomFactor(m_popupClient->zoomFactor());
-
     return true;
 }
 
 void WebPagePopupImpl::postMessage(const String& message)
 {
     if (!m_page)
         return;
     ScriptForbiddenScope::AllowUserAgentScript allowScript;
     if (LocalDOMWindow* window = toLocalFrame(m_page->mainFrame())->localDOMWindow())
         window->dispatchEvent(MessageEvent::create(message));
@@ skipping 13 matching lines @@
     if (!m_page || !m_page->mainFrame())
         return 0;
     Document* document = toLocalFrame(m_page->mainFrame())->document();
     if (!document)
         return 0;
     AXObjectCache* cache = document->axObjectCache();
     ASSERT(cache);
     return toAXObjectCacheImpl(cache)->getOrCreate(document->layoutView());
 }
 
-void WebPagePopupImpl::setWindowRect(const IntRect& rect)
+void WebPagePopupImpl::setWindowRect(const IntRect& rectInScreen)
 {
-    m_chromeClient->setWindowRect(rect);
+    m_windowRectInScreen = rectInScreen;
+    widgetClient()->setWindowRect(m_windowRectInScreen);
 }
 
 void WebPagePopupImpl::setRootGraphicsLayer(GraphicsLayer* layer)
 {
     m_rootGraphicsLayer = layer;
     m_rootLayer = layer ? layer->platformLayer() : 0;
 
     setIsAcceleratedCompositingActive(layer);
     if (m_layerTreeView) {
         if (m_rootLayer) {
@@ skipping 14 matching lines @@
     } else if (m_layerTreeView) {
         m_isAcceleratedCompositingActive = true;
     } else {
         TRACE_EVENT0("blink", "WebPagePopupImpl::setIsAcceleratedCompositingActive(true)");
 
         m_widgetClient->initializeLayerTreeView();
         m_layerTreeView = m_widgetClient->layerTreeView();
         if (m_layerTreeView) {
             m_layerTreeView->setVisible(true);
             m_isAcceleratedCompositingActive = true;
-            m_layerTreeView->setDeviceScaleFactor(m_webView->deviceScaleFactor());
             m_page->layerTreeViewInitialized(*m_layerTreeView);
         } else {
             m_isAcceleratedCompositingActive = false;
         }
     }
 }
 
 void WebPagePopupImpl::beginFrame(double lastFrameTimeMonotonic)
 {
     if (!m_page)
@@ skipping 18 matching lines @@
         return;
     PageWidgetDelegate::updateAllLifecyclePhases(*m_page, *m_page->deprecatedLocalMainFrame());
 }
 
 void WebPagePopupImpl::paint(WebCanvas* canvas, const WebRect& rect)
 {
     if (!m_closing)
         PageWidgetDelegate::paint(*m_page, canvas, rect, *m_page->deprecatedLocalMainFrame());
 }
 
-void WebPagePopupImpl::resize(const WebSize& newSize)
+void WebPagePopupImpl::resize(const WebSize& newSizeInViewport)
 {
-    m_windowRectInScreen = WebRect(m_windowRectInScreen.x, m_windowRectInScreen.y, newSize.width, newSize.height);
-    m_widgetClient->setWindowRect(m_windowRectInScreen);
+    WebRect newSize(0, 0, newSizeInViewport.width, newSizeInViewport.height);
+    widgetClient()->convertViewportToWindow(&newSize);
 
+    setWindowRect(WebRect(m_windowRectInScreen.x, m_windowRectInScreen.y, newSize.width, newSize.height));
     if (m_page) {
-        toLocalFrame(m_page->mainFrame())->view()->resize(newSize);
-        m_page->frameHost().visualViewport().setSize(newSize);
+        toLocalFrame(m_page->mainFrame())->view()->resize(newSizeInViewport);
+        m_page->frameHost().visualViewport().setSize(newSizeInViewport);
     }
 
     m_widgetClient->didInvalidateRect(WebRect(0, 0, newSize.width, newSize.height));
 }
 
 WebInputEventResult WebPagePopupImpl::handleKeyEvent(const WebKeyboardEvent& event)
 {
     return handleKeyEvent(PlatformKeyboardEventBuilder(event));
 }
 
@@ skipping 133 matching lines @@
     // A WebPagePopupImpl instance usually has two references.
     //  - One owned by the instance itself. It represents the visible widget.
     //  - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
     //    WebPagePopupImpl to close.
     // We need them because the closing operation is asynchronous and the widget
     // can be closed while the WebViewImpl is unaware of it.
     return adoptRef(new WebPagePopupImpl(client)).leakRef();
 }
 
 } // namespace blink