Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

1 files changed, 13 insertions, 1 deletions

diff --git a/Source/WebKit/chromium/src/WebPagePopupImpl.cpp b/Source/WebKit/chromium/src/WebPagePopupImpl.cpp
index 078ae7e86..01cacda2a 100644
--- a/Source/WebKit/chromium/src/WebPagePopupImpl.cpp
+++ b/Source/WebKit/chromium/src/WebPagePopupImpl.cpp
@@ -44,6 +44,7 @@
 #include "Settings.h"
 #include "WebInputEventConversion.h"
 #include "WebPagePopup.h"
+#include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "WebWidgetClient.h"
 
@@ -54,7 +55,7 @@ namespace WebKit {
 
 #if ENABLE(PAGE_POPUP)
 
-class PagePopupChromeClient : public EmptyChromeClient {
+class PagePopupChromeClient : public EmptyChromeClient, public WebCore::PageClientChromium {
     WTF_MAKE_NONCOPYABLE(PagePopupChromeClient);
     WTF_MAKE_FAST_ALLOCATED;
 
@@ -124,6 +125,17 @@ private:
         return FloatSize(0, 0);
     }
 
+    virtual PlatformPageClient platformPageClient() const OVERRIDE
+    {
+        return PlatformPageClient(this);
+    }
+
+    // PageClientChromium methods:
+    virtual WebKit::WebScreenInfo screenInfo() OVERRIDE
+    {
+        return m_popup->m_webView->client()->screenInfo();
+    }
+
     WebPagePopupImpl* m_popup;
 };