Make page popups work under OOPIF

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 527 matching lines @@
     if (WebLocalFrameImpl::fromFrame(frame) && WebLocalFrameImpl::fromFrame(frame)->frameWidget()) {
         WebLocalFrameImpl::fromFrame(frame)->frameWidget()->scheduleAnimation();
     } else {
         // TODO(lfg): We need to keep this for now because we still have some
         // WebViews who don't have a WebViewFrameWidget. This should be
         // removed once the WebViewFrameWidget refactor is complete.
         m_webView->scheduleAnimation();
     }
 }
 
-IntRect ChromeClientImpl::viewportToScreen(const IntRect& rectInViewport) const
+IntRect ChromeClientImpl::viewportToScreen(const IntRect& rectInViewport, const Widget* widget) const
 {
     WebRect screenRect(rectInViewport);
 
-    if (m_webView->client()) {
-        m_webView->client()->convertViewportToWindow(&screenRect);
-        WebRect windowRect = m_webView->client()->windowRect();
+    ASSERT(widget->isFrameView());
+    const FrameView* view = toFrameView(widget);
+    LocalFrame* frame = view->frame().localFrameRoot();
+    WebWidgetClient* client = nullptr;
+
+    if (WebLocalFrameImpl::fromFrame(frame) && WebLocalFrameImpl::fromFrame(frame)->frameWidget()) {
+        client = toWebFrameWidgetImpl(WebLocalFrameImpl::fromFrame(frame)->frameWidget())->client();
+    } else {

[bokan, 2016/03/18 19:25:42]

Nit: no braces on single line if/else

[kenrb, 2016/03/18 20:03:19]

Done.

+        client = m_webView->client();
+    }
+
+    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
 {
     if (!m_webView->client())
         return scalarValue;
@@ skipping 513 matching lines @@
     if (m_webView->pageImportanceSignals())
         m_webView->pageImportanceSignals()->setIssuedNonGetFetchFromScript();
 }
 
 PassOwnPtr<WebFrameScheduler> ChromeClientImpl::createFrameScheduler()
 {
     return m_webView->scheduler()->createFrameScheduler().release();
 }
 
 } // namespace blink