Merge WebKit at r78450: Initial merge by git.

[android-x86/external-webkit.git] / Tools / MiniBrowser / qt / main.cpp

diff --git a/Tools/MiniBrowser/qt/main.cpp b/Tools/MiniBrowser/qt/main.cpp
index 8c987c5..8f4c1ea 100644 (file)
--- a/Tools/MiniBrowser/qt/main.cpp
+++ b/Tools/MiniBrowser/qt/main.cpp
@@ -27,38 +27,46 @@
  */
 
 #include "BrowserWindow.h"
+
+#include "MiniBrowserApplication.h"
+#include "UrlLoader.h"
 #include <QLatin1String>
 #include <QRegExp>
 #include <qgraphicswkview.h>
 #include <QtGui>
 
-int main(int argc, char** argv) {
-    QApplication app(argc, argv);
-
-    QStringList args = QApplication::arguments();
-    args.removeAt(0);
+int main(int argc, char** argv)
+{
+    MiniBrowserApplication app(argc, argv);
 
-    QGraphicsWKView::BackingStoreType backingStoreTypeToUse = QGraphicsWKView::Simple;
-    int indexOfTiledOption;
-    if ((indexOfTiledOption = args.indexOf(QRegExp(QLatin1String("-tiled")))) != -1) {
-        backingStoreTypeToUse = QGraphicsWKView::Tiled;
-        args.removeAt(indexOfTiledOption);
+    if (app.isRobotized()) {
+        QWKContext* context = new QWKContext;
+        BrowserWindow* window = new BrowserWindow(context, &app.m_windowOptions);
+        UrlLoader loader(window, app.urls().at(0), app.robotTimeout(), app.robotExtraTime());
+        loader.loadNext();
+        window->show();
+        return app.exec();
     }
 
-    if (args.isEmpty()) {
+    QStringList urls = app.urls();
+
+    if (urls.isEmpty()) {
         QString defaultUrl = QString("file://%1/%2").arg(QDir::homePath()).arg(QLatin1String("index.html"));
         if (QDir(defaultUrl).exists())
-            args.append(defaultUrl);
+            urls.append(defaultUrl);
         else
-            args.append("http://www.google.com");
+            urls.append("http://www.google.com");
     }
 
-    BrowserWindow::backingStoreTypeForNewWindow = backingStoreTypeToUse;
-    BrowserWindow* window = new BrowserWindow;
-    window->load(args[0]);
+    QWKContext* context = new QWKContext;
+    BrowserWindow* window = new BrowserWindow(context, &app.m_windowOptions);
+    if (app.m_windowOptions.useSeparateWebProcessPerWindow)
+        context->setParent(window);
+
+    window->load(urls.at(0));
 
-    for (int i = 1; i < args.size(); ++i)
-        window->newWindow(args[i]);
+    for (int i = 1; i < urls.size(); ++i)
+        window->newWindow(urls.at(i));
 
     app.exec();