Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 10 insertions, 4 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp
index 92af27179..4d835fa2c 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp
@@ -18,19 +18,19 @@
 */
 
 #include "config.h"
-
 #include "qwebnavigationrequest_p.h"
 
 #include "qquickwebview_p.h"
 
 class QWebNavigationRequestPrivate {
 public:
-    QWebNavigationRequestPrivate(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType)
+    QWebNavigationRequestPrivate(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, bool isMainFrame)
         : url(url)
         , mouseButton(mouseButton)
         , keyboardModifiers(keyboardModifiers)
         , action(QQuickWebView::AcceptRequest)
         , navigationType(navigationType)
+        , isMainFrame(isMainFrame)
     {
     }
 
@@ -43,11 +43,12 @@ public:
     Qt::KeyboardModifiers keyboardModifiers;
     QQuickWebView::NavigationRequestAction action;
     QQuickWebView::NavigationType navigationType;
+    bool isMainFrame;
 };
 
-QWebNavigationRequest::QWebNavigationRequest(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, QObject* parent)
+QWebNavigationRequest::QWebNavigationRequest(const QUrl& url, Qt::MouseButton mouseButton, Qt::KeyboardModifiers keyboardModifiers, QQuickWebView::NavigationType navigationType, bool isMainFrame, QObject* parent)
     : QObject(parent)
-    , d(new QWebNavigationRequestPrivate(url, mouseButton, keyboardModifiers, navigationType))
+    , d(new QWebNavigationRequestPrivate(url, mouseButton, keyboardModifiers, navigationType, isMainFrame))
 {
 }
 
@@ -89,3 +90,8 @@ QQuickWebView::NavigationType QWebNavigationRequest::navigationType() const
 {
     return d->navigationType;
 }
+
+bool QWebNavigationRequest::isMainFrame() const
+{
+    return d->isMainFrame;
+}