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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 8376004299873bcfc77abf2a2238040126119ef3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 1 10:35:53 2009 +0000

    2009-10-01  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Implement setPopupBlockingEnabled() in the LayoutTestController and remove
            fast/events/open-window-from-another-frame.html from the Skipped list.
    
            https://bugs.webkit.org/show_bug.cgi?id=29930
    
            * platform/qt/Skipped:
    2009-10-01  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Implement setPopupBlockingEnabled() in the LayoutTestController and remove
            fast/events/open-window-from-another-frame.html from the Skipped list.
    
            https://bugs.webkit.org/show_bug.cgi?id=29930
    
            * DumpRenderTree/qt/jsobjects.cpp:
            (LayoutTestController::setPopupBlockingEnabled):
            * DumpRenderTree/qt/jsobjects.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48965 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b696ee1..6ef7c2a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-01  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Implement setPopupBlockingEnabled() in the LayoutTestController and remove
+        fast/events/open-window-from-another-frame.html from the Skipped list.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29930
+
+        * platform/qt/Skipped:
+
 2009-10-01  Martin Robinson  <martin.james.robinson at gmail.com>
 
         Reviewed by Xan Lopez.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 7c1639b..11614bb 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -1025,7 +1025,6 @@ fast/events/onchange-passwordfield.html
 fast/events/onchange-searchfield.html
 fast/events/onchange-textfield.html
 fast/events/onsearch-enter.html
-fast/events/open-window-from-another-frame.html
 fast/forms/enter-clicks-buttons.html
 fast/forms/input-align-image.html
 fast/forms/input-align.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2afdbf5..d9a9972 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-01  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Implement setPopupBlockingEnabled() in the LayoutTestController and remove
+        fast/events/open-window-from-another-frame.html from the Skipped list.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29930
+
+        * DumpRenderTree/qt/jsobjects.cpp:
+        (LayoutTestController::setPopupBlockingEnabled):
+        * DumpRenderTree/qt/jsobjects.h:
+
 2009-09-30  Cameron McCormack  <cam at mcc.id.au>
 
         Unreviewed.
diff --git a/WebKitTools/DumpRenderTree/qt/jsobjects.cpp b/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
index 55d931f..e0eff3a 100644
--- a/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
+++ b/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
@@ -291,6 +291,11 @@ void LayoutTestController::setPrivateBrowsingEnabled(bool enable)
     QWebSettings::globalSettings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, enable);
 }
 
+void LayoutTestController::setPopupBlockingEnabled(bool enable)
+{
+    QWebSettings::globalSettings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, !enable);
+}
+
 bool LayoutTestController::pauseAnimationAtTimeOnElementWithId(const QString &animationName,
                                                                double time,
                                                                const QString &elementId)
diff --git a/WebKitTools/DumpRenderTree/qt/jsobjects.h b/WebKitTools/DumpRenderTree/qt/jsobjects.h
index 0a0dbdc..bc2f437 100644
--- a/WebKitTools/DumpRenderTree/qt/jsobjects.h
+++ b/WebKitTools/DumpRenderTree/qt/jsobjects.h
@@ -94,6 +94,7 @@ public slots:
     void setJavaScriptProfilingEnabled(bool enable);
     void setFixedContentsSize(int width, int height);
     void setPrivateBrowsingEnabled(bool enable);
+    void setPopupBlockingEnabled(bool enable);
 
     bool pauseAnimationAtTimeOnElementWithId(const QString &animationName, double time, const QString &elementId);
     bool pauseTransitionAtTimeOnElementWithId(const QString &propertyName, double time, const QString &elementId);

-- 
WebKit Debian packaging