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

[tonikitoo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 4069c51b4e4e3304f3ea607041b1f582f86c2848
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 27 13:45:03 2010 +0000

    2010-08-26  Antonio Gomes  <tonikitoo at webkit.org>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Add support for automatically creating new windows in QWebView
            https://bugs.webkit.org/show_bug.cgi?id=29847
    
            Improved the documentation of createWindow methods of both QWebView and
            QWebPage by mentioning that for any of them be called, QWebSettings'
            JavaScriptCanOpenWindows must be set to true.
    
            * Api/qwebpage.cpp:
            * Api/qwebview.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66217 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 5eee21c..e8629f1 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -2131,7 +2131,11 @@ void QWebPage::setUserPermission(QWebFrame* frame, PermissionDomain domain, Perm
 
     If \a type is WebModalDialog, the application must call setWindowModality(Qt::ApplicationModal) on the new window.
 
-    \sa acceptNavigationRequest()
+    \note In the cases when the window creation is being triggered by JavaScript, apart from
+    reimplementing this method application must also set the JavaScriptCanOpenWindows attribute
+    of QWebSettings to true in order to get it called.
+
+    \sa acceptNavigationRequest(), QWebView::createWindow()
 */
 QWebPage *QWebPage::createWindow(WebWindowType type)
 {
diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index 10cf60c..06dc200 100644
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -953,7 +953,11 @@ void QWebView::paintEvent(QPaintEvent *ev)
     \note If the createWindow() method of the associated page is reimplemented, this
     method is not called, unless explicitly done so in the reimplementation.
 
-    \sa QWebPage::createWindow()
+    \note In the cases when the window creation is being triggered by JavaScript, apart from
+    reimplementing this method application must also set the JavaScriptCanOpenWindows attribute
+    of QWebSettings to true in order to get it called..
+
+    \sa QWebPage::createWindow(), QWebPage::acceptNavigationRequest()
 */
 QWebView *QWebView::createWindow(QWebPage::WebWindowType type)
 {
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 73c1cfc..a402763 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-26  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add support for automatically creating new windows in QWebView
+        https://bugs.webkit.org/show_bug.cgi?id=29847
+
+        Improved the documentation of createWindow methods of both QWebView and
+        QWebPage by mentioning that for any of them be called, QWebSettings'
+        JavaScriptCanOpenWindows attribute must be set to true.
+
+        * Api/qwebpage.cpp:
+        * Api/qwebview.cpp:
+
 2010-08-27  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.

-- 
WebKit Debian packaging