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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 46298de6a8fa1cfa9ca3915ec53afbce18759833
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 15 16:27:27 2010 +0000

    2010-10-15  Qi Zhang  <qi.2.zhang at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] window.close() doesn't work in qt
            https://bugs.webkit.org/show_bug.cgi?id=46186
    
            Introduce new attribute in QWebSettings to trigger "setAllowScriptsToCloseWindow"
    
            * Api/qwebsettings.cpp:
            (QWebSettingsPrivate::apply):
            * Api/qwebsettings.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index 818a426..3cd36f2 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -184,6 +184,10 @@ void QWebSettingsPrivate::apply()
                                       global->attributes.value(QWebSettings::JavascriptCanOpenWindows));
         settings->setJavaScriptCanOpenWindowsAutomatically(value);
 
+        value = attributes.value(QWebSettings::JavascriptCanCloseWindows,
+                                      global->attributes.value(QWebSettings::JavascriptCanCloseWindows));
+        settings->setAllowScriptsToCloseWindows(value);
+
         value = attributes.value(QWebSettings::JavaEnabled,
                                       global->attributes.value(QWebSettings::JavaEnabled));
         settings->setJavaEnabled(value);
@@ -389,6 +393,8 @@ QWebSettings* QWebSettings::globalSettings()
         recording visited pages in the history and storing web page icons. This is disabled by default.
     \value JavascriptCanOpenWindows Specifies whether JavaScript programs
         can open new windows. This is disabled by default.
+    \value JavascriptCanCloseWindows Specifies whether JavaScript programs
+        can close windows. This is disabled by default.
     \value JavascriptCanAccessClipboard Specifies whether JavaScript programs
         can read or write to the clipboard. This is disabled by default.
     \value DeveloperExtrasEnabled Enables extra tools for Web developers.
diff --git a/WebKit/qt/Api/qwebsettings.h b/WebKit/qt/Api/qwebsettings.h
index d5e0ef6..7dad72f 100644
--- a/WebKit/qt/Api/qwebsettings.h
+++ b/WebKit/qt/Api/qwebsettings.h
@@ -76,7 +76,8 @@ public:
         FrameFlatteningEnabled,
         SiteSpecificQuirksEnabled,
         WebGLEnabled,
-        HyperlinkAuditingEnabled
+        HyperlinkAuditingEnabled,
+        JavascriptCanCloseWindows
     };
     enum WebGraphic {
         MissingImageGraphic,
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 616d558..c47e22a 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-15  Qi Zhang  <qi.2.zhang at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] window.close() doesn't work in qt
+        https://bugs.webkit.org/show_bug.cgi?id=46186
+
+        Introduce new attribute in QWebSettings to trigger "setAllowScriptsToCloseWindow"
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        * Api/qwebsettings.h:
+
 2010-10-15  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.

-- 
WebKit Debian packaging