Changeset 69856 in webkit

Timestamp:

Oct 15, 2010 9:27:27 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-10-15 Qi Zhang <​qi.2.zhang@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:

Location:

trunk/WebKit/qt

Files:

• Api/qwebsettings.cpp (modified) (2 diffs)
• Api/qwebsettings.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebsettings.cpp

@@ -185 +185 @@
         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));
@@ -390 +394 @@
     \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.

trunk/WebKit/qt/Api/qwebsettings.h

@@ -77 +77 @@
         SiteSpecificQuirksEnabled,
         WebGLEnabled,
-        HyperlinkAuditingEnabled
+        HyperlinkAuditingEnabled,
+        JavascriptCanCloseWindows
     };
     enum WebGraphic {

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-10-15  Qi Zhang  <qi.2.zhang@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@webkit.org>