[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 80bd2259173f0cddf5b7edfce0c4990a879f4301
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 6 13:46:05 2009 +0000

    QtLauncher: print the number of loaded urls
    
    When using the -r mode print the number of URLs loaded so far. This
    is extremly useful when opening the same URL over and over again and
    one wants to see the progress.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49178 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index dbaa5a2..395fa62 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-05  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Reviewed by Simon Hausmann.
+
+        QtLauncher: print the number of loaded urls
+        
+        When using the -r mode print the number of URLs loaded so far. This
+        is extremly useful when opening the same URL over and over again and
+        one wants to see the progress.
+
+        * QtLauncher/main.cpp:
+        (URLLoader::URLLoader):
+        (URLLoader::loadNext):
+
 2009-10-05  Girish Ramakrishnan  <girish at forwardbias.in>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/QtLauncher/main.cpp b/WebKit/qt/QtLauncher/main.cpp
index 83fa97c..8cc8a09 100644
--- a/WebKit/qt/QtLauncher/main.cpp
+++ b/WebKit/qt/QtLauncher/main.cpp
@@ -405,6 +405,7 @@ public:
     URLLoader(QWebView* view, const QString& inputFileName)
         : m_view(view)
         , m_stdOut(stdout)
+        , m_loaded(0)
     {
         init(inputFileName);
     }
@@ -416,7 +417,7 @@ public slots:
         if (getUrl(qstr)) {
             QUrl url(qstr, QUrl::StrictMode);
             if (url.isValid()) {
-                m_stdOut << "Loading " << qstr << " ......" << endl;
+                m_stdOut << "Loading " << qstr << " ......" << ++m_loaded << endl;
                 m_view->load(url);
             } else
                 loadNext();
@@ -459,6 +460,7 @@ private:
     int m_index;
     QWebView* m_view;
     QTextStream m_stdOut;
+    int m_loaded;
 };
 
 #include "main.moc"

-- 
WebKit Debian packaging