Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/core/content_browser_client_qt.cpp
	src/core/content_browser_client_qt.h
	src/core/gl_surface_qt.cpp
	src/core/print_view_manager_qt.cpp
	src/core/web_contents_delegate_qt.cpp
	src/core/web_engine_context.cpp
	src/webengine/doc/src/qtwebengine-overview.qdoc
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
	src/webenginewidgets/webenginewidgets.pro
	sync.profile

Change-Id: I44495f4d899580c882d6b86d68d7f6b77c8e91f6

10 files changed, 91 insertions, 58 deletions

diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index a57c3b00f..c3800e9ff 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -52,6 +52,7 @@
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/geolocation_delegate.h"
+#include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/media_observer.h"
 #include "content/public/browser/quota_permission_context.h"
 #include "content/public/browser/render_frame_host.h"
@@ -283,7 +284,8 @@ public:
             m_handle = pni->nativeResourceForContext(QByteArrayLiteral("cglcontextobj"), qtContext);
         else if (platform == QLatin1String("qnx"))
             m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
-        else if (platform == QLatin1String("eglfs") || platform == QLatin1String("wayland"))
+        else if (platform == QLatin1String("eglfs") || platform == QLatin1String("wayland")
+                 || platform == QLatin1String("wayland-egl"))
             m_handle = pni->nativeResourceForContext(QByteArrayLiteral("eglcontext"), qtContext);
         else if (platform == QLatin1String("windows")) {
             if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2)
@@ -479,6 +481,13 @@ void ContentBrowserClientQt::AllowCertificateError(content::WebContents *webCont
         *result = content::CERTIFICATE_REQUEST_RESULT_TYPE_DENY;
 }
 
+void ContentBrowserClientQt::SelectClientCertificate(content::WebContents * /*webContents*/,
+                                                     net::SSLCertRequestInfo * /*certRequestInfo*/,
+                                                     std::unique_ptr<content::ClientCertificateDelegate> delegate)
+{
+    delegate->ContinueWithCertificate(nullptr);
+}
+
 std::string ContentBrowserClientQt::GetApplicationLocale()
 {
     return WebEngineLibraryInfo::getApplicationLocale();
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h
index acbf1a059..47b880643 100644
--- a/src/core/content_browser_client_qt.h
+++ b/src/core/content_browser_client_qt.h
@@ -100,6 +100,9 @@ public:
                                        bool expired_previous_decision,
                                        const base::Callback<void(bool)>& callback,
                                        content::CertificateRequestResultType* result) Q_DECL_OVERRIDE;
+    virtual void SelectClientCertificate(content::WebContents* web_contents,
+                                         net::SSLCertRequestInfo* cert_request_info,
+                                         std::unique_ptr<content::ClientCertificateDelegate> delegate) Q_DECL_OVERRIDE;
     content::DevToolsManagerDelegate *GetDevToolsManagerDelegate() Q_DECL_OVERRIDE;
 
     virtual std::string GetApplicationLocale() Q_DECL_OVERRIDE;
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp
index 0dac5e48b..5d51f65aa 100644
--- a/src/core/content_client_qt.cpp
+++ b/src/core/content_client_qt.cpp
@@ -166,7 +166,8 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins)
 #endif
 #if defined(Q_OS_LINUX)
     pluginPaths << "/opt/google/chrome/PepperFlash/libpepflashplayer.so" // Google Chrome
-                << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu
+                << "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" // Ubuntu, package pepperflashplugin-nonfree
+                << "/usr/lib/adobe-flashplugin/libpepflashplayer.so" // Ubuntu, package adobe-flashplugin
                 << "/usr/lib/PepperFlash/libpepflashplayer.so" // Arch
                 << "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"; // OpenSuSE
     pluginPaths << ppapiPluginsPath() + QStringLiteral("/libpepflashplayer.so");
diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp
index b1177a998..a1855b060 100644
--- a/src/core/gl_context_qt.cpp
+++ b/src/core/gl_context_qt.cpp
@@ -122,7 +122,7 @@ void* GLContextHelper::getXConfig()
 
 void* GLContextHelper::getEGLDisplay()
 {
-    return resourceForContext(QByteArrayLiteral("egldisplay"));
+    return resourceForIntegration(QByteArrayLiteral("egldisplay"));
 }
 
 void* GLContextHelper::getXDisplay()
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index e88a26715..74bb32d1f 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -90,6 +90,9 @@ void* g_display;
 const char* g_extensions = NULL;
 
 bool g_egl_surfaceless_context_supported = false;
+
+bool g_initializedEGL = false;
+
 }  // namespace
 
 
@@ -573,11 +576,17 @@ bool InitializeGLOneOffPlatform()
         return GLSurfaceQtEGL::InitializeOneOff();
 
     if (GetGLImplementation() == kGLImplementationDesktopGL) {
-#if defined(USE_X11)
-        return GLSurfaceQtGLX::InitializeOneOff();
-#elif defined(OS_WIN)
+#if defined(OS_WIN)
         return GLSurfaceQtWGL::InitializeOneOff();
+#elif defined(USE_X11)
+        if (GLSurfaceQtGLX::InitializeOneOff())
+            return true;
 #endif
+        // Fallback to trying EGL with desktop GL.
+        if (GLSurfaceQtEGL::InitializeOneOff()) {
+            g_initializedEGL = true;
+            return true;
+        }
     }
 
     return false;
@@ -586,40 +595,40 @@ bool InitializeGLOneOffPlatform()
 scoped_refptr<GLSurface>
 CreateOffscreenGLSurface(const gfx::Size& size)
 {
+    scoped_refptr<GLSurface> surface;
     switch (GetGLImplementation()) {
     case kGLImplementationDesktopGLCoreProfile:
     case kGLImplementationDesktopGL: {
-#if defined(USE_X11)
-        scoped_refptr<GLSurface> surface = new GLSurfaceQtGLX(size);
-        if (!surface->Initialize())
-            return NULL;
-        return surface;
-#elif defined(OS_WIN)
-        scoped_refptr<GLSurface> surface = new GLSurfaceQtWGL(size);
-        if (!surface->Initialize())
-            return NULL;
-        return surface;
-#else
-        LOG(ERROR) << "Desktop GL is not supported on this platform.";
-        Q_UNREACHABLE();
-        return NULL;
+#if defined(OS_WIN)
+        surface = new GLSurfaceQtWGL(size);
+        if (surface->Initialize())
+            return surface;
+        break;
+#elif defined(USE_X11)
+        if (!g_initializedEGL) {
+            surface = new GLSurfaceQtGLX(size);
+            if (surface->Initialize())
+                return surface;
+        }
+        // no break
 #endif
     }
     case kGLImplementationEGLGLES2: {
-        scoped_refptr<GLSurface> surface;
         if (g_egl_surfaceless_context_supported)
             surface = new GLSurfacelessQtEGL(size);
         else
             surface = new GLSurfaceQtEGL(size);
 
-        if (!surface->Initialize())
-            return NULL;
-        return surface;
+        if (surface->Initialize())
+            return surface;
+        break;
     }
     default:
-        Q_UNREACHABLE();
-        return NULL;
+        break;
     }
+    LOG(ERROR) << "Requested OpenGL platform is not supported.";
+    Q_UNREACHABLE();
+    return NULL;
 }
 
 scoped_refptr<GLSurface>
diff --git a/src/core/media_capture_devices_dispatcher.cpp b/src/core/media_capture_devices_dispatcher.cpp
index 3e260587c..f06f0150f 100644
--- a/src/core/media_capture_devices_dispatcher.cpp
+++ b/src/core/media_capture_devices_dispatcher.cpp
@@ -173,7 +173,6 @@ void MediaCaptureDevicesDispatcher::handleMediaAccessPermissionResponse(content:
     if (securityOriginsMatch && (microphoneRequested || webcamRequested)) {
         switch (request.request_type) {
         case content::MEDIA_OPEN_DEVICE_PEPPER_ONLY:
-            Q_UNREACHABLE(); // only speculative as this is for Pepper
             getDefaultDevices("", "", microphoneRequested, webcamRequested, &devices);
             break;
         case content::MEDIA_DEVICE_ACCESS:
diff --git a/src/core/print_view_manager_qt.cpp b/src/core/print_view_manager_qt.cpp
index 8f52cc24a..0231df8bd 100644
--- a/src/core/print_view_manager_qt.cpp
+++ b/src/core/print_view_manager_qt.cpp
@@ -136,14 +136,16 @@ static base::DictionaryValue *createPrintSettings()
     return printSettings;
 }
 
-static void applyQPageLayoutSettingsToDictionary(const QPageLayout &pageLayout, base::DictionaryValue &printSettings)
+static base::DictionaryValue *createPrintSettingsFromQPageLayout(const QPageLayout &pageLayout)
 {
+    base::DictionaryValue *printSettings = createPrintSettings();
+
     //Set page size attributes, chromium expects these in micrometers
     QSizeF pageSizeInMilimeter = pageLayout.pageSize().size(QPageSize::Millimeter);
     std::unique_ptr<base::DictionaryValue> sizeDict(new base::DictionaryValue);
     sizeDict->SetInteger(printing::kSettingMediaSizeWidthMicrons, pageSizeInMilimeter.width() * kMicronsToMillimeter);
     sizeDict->SetInteger(printing::kSettingMediaSizeHeightMicrons, pageSizeInMilimeter.height() * kMicronsToMillimeter);
-    printSettings.Set(printing::kSettingMediaSize, std::move(sizeDict));
+    printSettings->Set(printing::kSettingMediaSize, std::move(sizeDict));
 
     // Apply page margins
     QMargins pageMarginsInPoints = pageLayout.marginsPoints();
@@ -152,10 +154,13 @@ static void applyQPageLayoutSettingsToDictionary(const QPageLayout &pageLayout,
     marginsDict->SetInteger(printing::kSettingMarginBottom, pageMarginsInPoints.bottom());
     marginsDict->SetInteger(printing::kSettingMarginLeft, pageMarginsInPoints.left());
     marginsDict->SetInteger(printing::kSettingMarginRight, pageMarginsInPoints.right());
-    printSettings.Set(printing::kSettingMarginsCustom, std::move(marginsDict));
-    printSettings.SetInteger(printing::kSettingMarginsType, printing::CUSTOM_MARGINS);
 
-    printSettings.SetBoolean(printing::kSettingLandscape, pageLayout.orientation() == QPageLayout::Landscape);
+    printSettings->Set(printing::kSettingMarginsCustom, std::move(marginsDict));
+    printSettings->SetInteger(printing::kSettingMarginsType, printing::CUSTOM_MARGINS);
+
+    printSettings->SetBoolean(printing::kSettingLandscape, pageLayout.orientation() == QPageLayout::Landscape);
+
+    return printSettings;
 }
 
 } // namespace
@@ -209,12 +214,11 @@ bool PrintViewManagerQt::PrintToPDFInternal(const QPageLayout &pageLayout, bool
 {
     if (!pageLayout.isValid())
         return false;
-    m_printSettings.reset(createPrintSettings());
 
-    m_printSettings->SetInteger(printing::kSettingColor, printInColor ? printing::COLOR : printing::GRAYSCALE);
-    applyQPageLayoutSettingsToDictionary(pageLayout, *m_printSettings);
+    m_printSettings.reset(createPrintSettingsFromQPageLayout(pageLayout));
     m_printSettings->SetBoolean(printing::kSettingShouldPrintBackgrounds
         , web_contents()->GetRenderViewHost()->GetWebkitPreferences().should_print_backgrounds);
+    m_printSettings->SetInteger(printing::kSettingColor, printInColor ? printing::COLOR : printing::GRAYSCALE);
     return Send(new PrintMsg_InitiatePrintPreview(routing_id(), false));
 }
 
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index c8d93b3f0..03b62d190 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -1114,18 +1114,12 @@ void WebContentsAdapter::setWebChannel(QWebChannel *channel, uint worldId)
 static QMimeData *mimeDataFromDropData(const content::DropData &dropData)
 {
     QMimeData *mimeData = new QMimeData();
-    if (!dropData.text.is_null()) {
+    if (!dropData.text.is_null())
         mimeData->setText(toQt(dropData.text.string()));
-        return mimeData;
-    }
-    if (!dropData.html.is_null()) {
+    if (!dropData.html.is_null())
         mimeData->setHtml(toQt(dropData.html.string()));
-        return mimeData;
-    }
-    if (dropData.url.is_valid()) {
+    if (dropData.url.is_valid())
         mimeData->setUrls(QList<QUrl>() << toQt(dropData.url));
-        return mimeData;
-    }
     return mimeData;
 }
 
@@ -1220,6 +1214,16 @@ Qt::DropAction WebContentsAdapter::updateDragPosition(QDragMoveEvent *e, const Q
     rvh->DragTargetDragOver(toGfx(e->pos()), toGfx(screenPos), toWeb(e->possibleActions()),
                             blink::WebInputEvent::LeftButtonDown);
 
+    base::MessageLoop *currentMessageLoop = base::MessageLoop::current();
+    DCHECK(currentMessageLoop);
+    if (!currentMessageLoop->NestableTasksAllowed()) {
+        // We're already inside a MessageLoop::RunTask call, and scheduled tasks will not be
+        // executed. That means, updateDragAction will never be called, and the RunLoop below will
+        // remain blocked forever.
+        qWarning("WebContentsAdapter::updateDragPosition called from MessageLoop::RunTask.");
+        return Qt::IgnoreAction;
+    }
+
     // Wait until we get notified via RenderViewHostDelegateView::UpdateDragCursor. This calls
     // WebContentsAdapter::updateDragAction that will eventually quit the nested loop.
     base::RunLoop loop;
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
index 9d0965818..36acfe62e 100644
--- a/src/core/web_contents_delegate_qt.cpp
+++ b/src/core/web_contents_delegate_qt.cpp
@@ -74,6 +74,7 @@
 #include "ui/events/latency_info.h"
 
 #include <QDesktopServices>
+#include <QTimer>
 
 namespace QtWebEngineCore {
 
@@ -107,13 +108,19 @@ content::WebContents *WebContentsDelegateQt::OpenURLFromTab(content::WebContents
     Q_ASSERT(target);
 
     content::NavigationController::LoadURLParams load_url_params(params.url);
+    load_url_params.source_site_instance = params.source_site_instance;
     load_url_params.referrer = params.referrer;
     load_url_params.frame_tree_node_id = params.frame_tree_node_id;
+    load_url_params.redirect_chain = params.redirect_chain;
     load_url_params.transition_type = params.transition;
     load_url_params.extra_headers = params.extra_headers;
     load_url_params.should_replace_current_entry = params.should_replace_current_entry;
     load_url_params.is_renderer_initiated = params.is_renderer_initiated;
     load_url_params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
+    if (params.uses_post) {
+        load_url_params.load_type = content::NavigationController::LOAD_TYPE_HTTP_POST;
+        load_url_params.post_data = params.post_data;
+    }
 
     target->GetController().LoadURLWithParams(load_url_params);
     return target;
@@ -320,7 +327,11 @@ void WebContentsDelegateQt::RunFileChooser(content::RenderFrameHost *frameHost,
 
     m_filePickerController.reset(new FilePickerController(static_cast<FilePickerController::FileChooserMode>(params.mode),
                                                           web_contents(), toQt(params.default_file_name.value()), acceptedMimeTypes));
-    m_viewClient->runFileChooser(m_filePickerController);
+
+    // Defer the call to not block base::MessageLoop::RunTask with modal dialogs.
+    QTimer::singleShot(0, [this] () {
+        m_viewClient->runFileChooser(m_filePickerController);
+    });
 }
 
 bool WebContentsDelegateQt::AddMessageToConsole(content::WebContents *source, int32_t level, const base::string16 &message, int32_t line_no, const base::string16 &source_id)
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 7fe8fb612..491835e45 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -309,8 +309,10 @@ WebEngineContext::WebEngineContext()
 
     if (useEmbeddedSwitches) {
         // Inspired by the Android port's default switches
-        parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbar);
-        parsedCommandLine->AppendSwitch(switches::kEnablePinch);
+        if (!parsedCommandLine->HasSwitch(switches::kDisableOverlayScrollbar))
+            parsedCommandLine->AppendSwitch(switches::kEnableOverlayScrollbar);
+        if (!parsedCommandLine->HasSwitch(switches::kDisablePinch))
+            parsedCommandLine->AppendSwitch(switches::kEnablePinch);
         parsedCommandLine->AppendSwitch(switches::kEnableViewport);
         parsedCommandLine->AppendSwitch(switches::kMainFrameResizesAreOrientationChanges);
         parsedCommandLine->AppendSwitch(switches::kDisableAcceleratedVideoDecode);
@@ -325,7 +327,7 @@ WebEngineContext::WebEngineContext()
     const char *glType = 0;
 #ifndef QT_NO_OPENGL
     if (!usingANGLE() && !usingSoftwareDynamicGL() && !usingQtQuick2DRenderer()) {
-        if (qt_gl_global_share_context()) {
+        if (qt_gl_global_share_context() && qt_gl_global_share_context()->isValid()) {
             if (!strcmp(qt_gl_global_share_context()->nativeHandle().typeName(), "QEGLNativeContext")) {
                 if (qt_gl_global_share_context()->isOpenGLES()) {
                     glType = gl::kGLImplementationEGLName;
@@ -359,16 +361,7 @@ WebEngineContext::WebEngineContext()
                     glType = gl::kGLImplementationDesktopName;
             }
         } else {
-            qWarning("WebEngineContext used before QtWebEngine::initialize()");
-            // We have to assume the default OpenGL module type will be used.
-            switch (QOpenGLContext::openGLModuleType()) {
-            case QOpenGLContext::LibGL:
-                glType = gl::kGLImplementationDesktopName;
-                break;
-            case QOpenGLContext::LibGLES:
-                glType = gl::kGLImplementationEGLName;
-                break;
-            }
+            qWarning("WebEngineContext used before QtWebEngine::initialize() or OpenGL context creation failed.");
         }
     }
 #endif