Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)

9 files changed, 37 insertions, 10 deletions

diff --git a/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops b/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops
index f03f9acc3..dd32f7d50 100644
--- a/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops
+++ b/Tools/MiniBrowser/Configurations/MiniBrowserLauncherDebugCairoCFLite.vsprops
@@ -3,6 +3,6 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="MiniBrowserDebugCairoCFLite"
-	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops"
+	InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\MiniBrowserLauncherCommon.vsprops"
 	>
 </VisualStudioPropertySheet>
diff --git a/Tools/MiniBrowser/mac/BrowserWindowController.m b/Tools/MiniBrowser/mac/BrowserWindowController.m
index 8ba4eee57..b6a30f17b 100644
--- a/Tools/MiniBrowser/mac/BrowserWindowController.m
+++ b/Tools/MiniBrowser/mac/BrowserWindowController.m
@@ -608,6 +608,7 @@ static void runOpenPanel(WKPageRef page, WKFrameRef frame, WKOpenPanelParameters
         0, // shouldGoToBackForwardItem
         0,  // didFailToInitializePlugin
         didDetectXSSForFrame,
+        0, // didNewFirstVisuallyNonEmptyLayout
     };
     WKPageSetPageLoaderClient(_webView.pageRef, &loadClient);
     
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.cpp b/Tools/MiniBrowser/qt/BrowserWindow.cpp
index 9ccb8a263..a768581dc 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/Tools/MiniBrowser/qt/BrowserWindow.cpp
@@ -37,6 +37,7 @@
 #include <QPointF>
 
 BrowserWindow::BrowserWindow(WindowOptions* options)
+    : m_windowOptions(options)
 {
     setWindowTitle("MiniBrowser");
     setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
@@ -52,6 +53,7 @@ BrowserWindow::BrowserWindow(WindowOptions* options)
     engine()->rootContext()->setContextProperty("options", options);
     setSource(QUrl("qrc:/qml/BrowserWindow.qml"));
     connect(rootObject(), SIGNAL(pageTitleChanged(QString)), this, SLOT(setWindowTitle(QString)));
+    connect(rootObject(), SIGNAL(newWindow(QString)), this, SLOT(newWindow(QString)));
     if (options->useTraditionalDesktopBehavior())
         webView()->experimental()->setUseTraditionalDesktopBehaviour(true);
     if (options->startFullScreen())
@@ -88,7 +90,7 @@ void BrowserWindow::focusAddressBar()
 
 BrowserWindow* BrowserWindow::newWindow(const QString& url)
 {
-    BrowserWindow* window = new BrowserWindow();
+    BrowserWindow* window = new BrowserWindow(m_windowOptions);
     window->load(url);
     return window;
 }
diff --git a/Tools/MiniBrowser/qt/BrowserWindow.h b/Tools/MiniBrowser/qt/BrowserWindow.h
index 9593e1014..d6ca0a6a6 100644
--- a/Tools/MiniBrowser/qt/BrowserWindow.h
+++ b/Tools/MiniBrowser/qt/BrowserWindow.h
@@ -39,7 +39,7 @@ class BrowserWindow : public QQuickView {
     Q_OBJECT
 
 public:
-    BrowserWindow(WindowOptions* = 0);
+    BrowserWindow(WindowOptions*);
     ~BrowserWindow();
     void load(const QString& url);
     void reload();
@@ -56,6 +56,7 @@ protected slots:
 
 private:
     void updateUserAgentList();
+    WindowOptions* m_windowOptions;
     QStringList m_userAgentList;
 };
 
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
index 5aaaa685d..32389f2e8 100644
--- a/Tools/MiniBrowser/qt/MiniBrowser.pro
+++ b/Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -24,7 +24,7 @@ DESTDIR = $${ROOT_BUILD_DIR}/bin
 
 CONFIG += qtwebkit qtwebkit-private
 
-QT += network declarative widgets
+QT += network declarative widgets quick
 macx: QT += xml
 
 RESOURCES += MiniBrowser.qrc
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.qrc b/Tools/MiniBrowser/qt/MiniBrowser.qrc
index 20a9400c6..d71d41fc5 100644
--- a/Tools/MiniBrowser/qt/MiniBrowser.qrc
+++ b/Tools/MiniBrowser/qt/MiniBrowser.qrc
@@ -2,6 +2,7 @@
     <qresource prefix="/">
         <file>icons/info.png</file>
         <file>icons/next.png</file>
+        <file>icons/plus.png</file>
         <file>icons/previous.png</file>
         <file>icons/refresh.png</file>
         <file>icons/stop.png</file>
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
index 265436505..88260b8cc 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
@@ -155,8 +155,6 @@ bool MiniBrowserApplication::notify(QObject* target, QEvent* event)
         }
 
         // Update current touch-point
-        if (m_touchPoints.isEmpty())
-            touchPoint.flags |= QTouchEvent::TouchPoint::Primary;
         m_touchPoints.insert(touchPoint.id, touchPoint);
 
         // Update states for all other touch-points
@@ -181,10 +179,11 @@ void MiniBrowserApplication::sendTouchEvent(BrowserWindow* browserWindow)
     }
 
     m_pendingFakeTouchEventCount++;
-    QWindowSystemInterface::handleTouchEvent(browserWindow, QEvent::None, device, m_touchPoints.values());
+    QWindowSystemInterface::handleTouchEvent(browserWindow, device, m_touchPoints.values());
 
+    bool holdingControl = QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
     if (!m_windowOptions.useTraditionalDesktopBehavior())
-        browserWindow->updateVisualMockTouchPoints(m_touchPoints.values());
+        browserWindow->updateVisualMockTouchPoints(holdingControl ? m_touchPoints.values() : QList<QWindowSystemInterface::TouchPoint>());
 
     // Get rid of touch-points that are no longer valid
     foreach (const QWindowSystemInterface::TouchPoint& touchPoint, m_touchPoints) {
@@ -249,8 +248,9 @@ void MiniBrowserApplication::handleUserOptions()
         m_robotTimeoutSeconds = takeOptionValue(&args, "--robot-timeout").toInt();
         m_robotExtraTimeSeconds = takeOptionValue(&args, "--robot-extra-time").toInt();
     } else {
-        int urlArg = args.indexOf(QRegExp("^[^-].*"));
-        if (urlArg != -1)
+        int urlArg;
+
+        while ((urlArg = args.indexOf(QRegExp("^[^-].*"))) != -1)
             m_urls += args.takeAt(urlArg);
     }
 
diff --git a/Tools/MiniBrowser/qt/icons/plus.png b/Tools/MiniBrowser/qt/icons/plus.png
new file mode 100644
index 000000000..f6dfbd02d
--- /dev/null
+++ b/Tools/MiniBrowser/qt/icons/plus.png
diff --git a/Tools/MiniBrowser/qt/qml/BrowserWindow.qml b/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
index c2c673aa1..c080ed3ea 100644
--- a/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
+++ b/Tools/MiniBrowser/qt/qml/BrowserWindow.qml
@@ -36,6 +36,7 @@ Rectangle {
     property alias webview: webView
 
     signal pageTitleChanged(string title)
+    signal newWindow(string url)
 
     function load(address) {
         webView.load(address)
@@ -209,6 +210,26 @@ Rectangle {
                     }
                 }
             }
+
+            Rectangle {
+                id: newBrowserWindowButton
+                height: parent.height
+                width: height
+                color: "#efefef"
+                radius: 6
+
+                Image {
+                    anchors.centerIn: parent
+                    source: "../icons/plus.png"
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        newWindow("about:blank")
+                    }
+                }
+            }
         }
         Rectangle {
             color: "white"
@@ -247,6 +268,7 @@ Rectangle {
             }
             TextInput {
                 id: addressLine
+                clip: true
                 selectByMouse: true
                 font {
                     pointSize: 11