[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ab132bff0005adf1bae3e9ad411ea6e31291355f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 21 19:38:38 2010 +0000

    2010-01-21  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] add setDomainRelaxationForbiddenForURLScheme in Qt DRT
            https://bugs.webkit.org/show_bug.cgi?id=33945
    
            * platform/qt/Skipped:
    2010-01-21  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] add setDomainRelaxationForbiddenForURLScheme in Qt DRT
            https://bugs.webkit.org/show_bug.cgi?id=33945
    
            * Api/qwebsecurityorigin.cpp:
            (qt_drt_setDomainRelaxationForbiddenForURLScheme):
    2010-01-21  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] add setDomainRelaxationForbiddenForURLScheme in Qt DRT
            https://bugs.webkit.org/show_bug.cgi?id=33945
    
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
            * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53635 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d7f3040..85cf0b6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-21  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] add setDomainRelaxationForbiddenForURLScheme in Qt DRT
+        https://bugs.webkit.org/show_bug.cgi?id=33945
+
+        * platform/qt/Skipped:
+
 2010-01-21  Philippe Normand  <pnormand at igalia.com>
 
         Rubber-stamped by Eric Carlson.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index ffc59de..f1a8cfc 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -220,9 +220,6 @@ inspector/elements-panel-rewrite-href.html
 
 # Missing layoutTestController.setSmartInsertDeleteEnabled()
 editing/selection/doubleclick-beside-cr-span.html
-
-# Missing layoutTestController.setDomainRelaxationForbiddenForURLScheme()
-http/tests/security/setDomainRelaxationForbiddenForURLScheme.html
 # ============================================================================= #
 
 # ------- missing eventSender.beginDragWithFiles
diff --git a/WebKit/qt/Api/qwebsecurityorigin.cpp b/WebKit/qt/Api/qwebsecurityorigin.cpp
index 2a225c5..6c26bd7 100644
--- a/WebKit/qt/Api/qwebsecurityorigin.cpp
+++ b/WebKit/qt/Api/qwebsecurityorigin.cpp
@@ -40,6 +40,11 @@ void QWEBKIT_EXPORT qt_drt_resetOriginAccessWhiteLists()
     SecurityOrigin::resetOriginAccessWhiteLists();
 }
 
+void QWEBKIT_EXPORT qt_drt_setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme)
+{
+    SecurityOrigin::setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
+}
+
 /*!
     \class QWebSecurityOrigin
     \since 4.5
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 3244aee..684b597 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-21  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] add setDomainRelaxationForbiddenForURLScheme in Qt DRT
+        https://bugs.webkit.org/show_bug.cgi?id=33945
+
+        * Api/qwebsecurityorigin.cpp:
+        (qt_drt_setDomainRelaxationForbiddenForURLScheme):
+
 2010-01-21  No'am Rosenthal  <noam.rosenthal at nokia.com>
 
         Reviewed by Antti Koivisto.
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 92d449d..b884629 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-21  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] add setDomainRelaxationForbiddenForURLScheme in Qt DRT
+        https://bugs.webkit.org/show_bug.cgi?id=33945
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::setDomainRelaxationForbiddenForURLScheme):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-01-21  Simon Hausmann  <simon.hausmann at nokia.com>
 
         No review, rolling out 53615 as it causes two
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index c2e097b..dffb636 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -43,6 +43,7 @@ extern bool qt_drt_pauseAnimation(QWebFrame*, const QString& name, double time,
 extern bool qt_drt_pauseTransitionOfProperty(QWebFrame*, const QString& name, double time, const QString& elementId);
 extern bool qt_drt_pauseSVGAnimation(QWebFrame*, const QString& animationId, double time, const QString& elementId);
 extern int qt_drt_numberOfActiveAnimations(QWebFrame*);
+extern void qt_drt_setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
 
 extern void qt_drt_whiteListAccessFromOrigin(const QString& sourceOrigin, const QString& destinationProtocol, const QString& destinationHost, bool allowDestinationSubdomains);
 extern QString qt_drt_counterValueForElementById(QWebFrame* qFrame, const QString& id);
@@ -404,3 +405,8 @@ void LayoutTestController::setUserStyleSheetEnabled(bool enabled)
     else
         m_drt->webPage()->settings()->setUserStyleSheetUrl(QUrl());
 }
+
+void LayoutTestController::setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme)
+{
+    qt_drt_setDomainRelaxationForbiddenForURLScheme(forbidden, scheme);
+}
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index cff8474..234ced5 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -135,6 +135,7 @@ public slots:
     void overridePreference(const QString& name, const QVariant& value);
     void setUserStyleSheetLocation(const QString& url);
     void setUserStyleSheetEnabled(bool enabled);
+    void setDomainRelaxationForbiddenForURLScheme(bool forbidden, const QString& scheme);
 
 private slots:
     void processWork();

-- 
WebKit Debian packaging