[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[diegohcg at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit cdf8735f0e1562084d5880b3613ab9577c93f16e
Author: diegohcg at webkit.org <diegohcg at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 19 23:35:48 2010 +0000

    2010-07-19 Diego Gonzalez <diegohcg at webkit.org>
    
        [Qt] Add MiniBrowser features: urlChanged, titleChanged and from user input load
        https://bugs.webkit.org/show_bug.cgi?id=42564
    
        Reviewed by Antonio Gomes.
    
        * MiniBrowser/qt/BrowserWindow.cpp:
        (BrowserView::load):
        (BrowserWindow::BrowserWindow):
        (BrowserWindow::titleChanged):
        (BrowserWindow::urlChanged):
        * MiniBrowser/qt/BrowserWindow.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b8e08c2..cf6803e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-19  Diego Gonzalez  <diegohcg at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Add MiniBrowser features: urlChanged, titleChanged and from user input load
+        https://bugs.webkit.org/show_bug.cgi?id=42564
+
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserView::load):
+        (BrowserWindow::BrowserWindow):
+        (BrowserWindow::titleChanged):
+        (BrowserWindow::urlChanged):
+        * MiniBrowser/qt/BrowserWindow.h:
+
 2010-07-19  Sam Weinig  <weinig at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
index 1196cc4..c3f7b35 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.cpp
@@ -65,7 +65,11 @@ void BrowserView::resizeEvent(QResizeEvent* event)
 
 void BrowserView::load(const QUrl& url)
 {
-    m_item->load(url);
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    return m_item->load(QUrl::fromUserInput(url.toString()));
+#else
+    return m_item->load(url);
+#endif
 }
 
 QGraphicsWKView* BrowserView::view() const
@@ -84,6 +88,8 @@ BrowserWindow::BrowserWindow()
     m_browser->setFocus(Qt::OtherFocusReason);
 
     connect(m_addressBar, SIGNAL(returnPressed()), SLOT(changeLocation()));
+    connect(m_browser->view(), SIGNAL(titleChanged(const QString&)), SLOT(titleChanged(const QString&)));
+    connect(m_browser->view(), SIGNAL(urlChanged(const QUrl&)), SLOT(urlChanged(const QUrl&)));
 
     QToolBar* bar = addToolBar("Navigation");
     bar->addAction(m_browser->view()->page()->action(QWKPage::Back));
@@ -110,6 +116,16 @@ void BrowserWindow::changeLocation()
     m_browser->load(string);
 }
 
+void BrowserWindow::titleChanged(const QString& title)
+{
+    setWindowTitle(title);
+}
+
+void BrowserWindow::urlChanged(const QUrl& url)
+{
+    m_addressBar->setText(url.toString());
+}
+
 BrowserWindow::~BrowserWindow()
 {
     delete m_addressBar;
diff --git a/WebKitTools/MiniBrowser/qt/BrowserWindow.h b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
index 30c5122..c11b4fc 100644
--- a/WebKitTools/MiniBrowser/qt/BrowserWindow.h
+++ b/WebKitTools/MiniBrowser/qt/BrowserWindow.h
@@ -64,6 +64,8 @@ public:
 
 protected slots:
     void changeLocation();
+    void titleChanged(const QString&);
+    void urlChanged(const QUrl&);
 
 private:
     BrowserView* m_browser;

-- 
WebKit Debian packaging