[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 2367b81f6db29860db41c55066374971e3e25149
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 09:47:23 2010 +0000

    2010-01-14  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] DRT missing setUserStyleSheetLocation and setUserStyleSheetEnabled in LayoutTestController
            https://bugs.webkit.org/show_bug.cgi?id=33617
    
            * platform/qt/Skipped:
    2010-01-14  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] DRT missing setUserStyleSheetLocation and setUserStyleSheetEnabled in LayoutTestController
            https://bugs.webkit.org/show_bug.cgi?id=33617
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::WebPage::resetSettings):
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::setUserStyleSheetLocation):
            (LayoutTestController::setUserStyleSheetEnabled):
            * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53249 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 447bf7d..7a38e4a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-14  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] DRT missing setUserStyleSheetLocation and setUserStyleSheetEnabled in LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=33617
+
+        * platform/qt/Skipped:
+
 2010-01-14  James Robinson  <jamesr at chromium.org>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 5cd0453..4b1a7c2 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -204,9 +204,6 @@ http/tests/security/isolatedWorld
 http/tests/security/mixedContent
 http/tests/cache/subresource-failover-to-network.html
 
-# Missing layoutTestController.setUserStyleSheetLocation() and layoutTestController.setUserStyleSheetEnabled()
-http/tests/security/local-user-CSS-from-remote.html
-
 # Missing layoutTestController.evaluateInWebInspector()
 # https://bugs.webkit.org/show_bug.cgi?id=33096
 inspector/cookie-resource-match.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3a59bf1..0d942dd 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-14  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] DRT missing setUserStyleSheetLocation and setUserStyleSheetEnabled in LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=33617
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::resetSettings):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::setUserStyleSheetLocation):
+        (LayoutTestController::setUserStyleSheetEnabled):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-01-13  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 6367fe3..52939e4 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -171,6 +171,7 @@ void WebPage::resetSettings()
     m_drt->layoutTestController()->setXSSAuditorEnabled(false);
 
     QWebSettings::setMaximumPagesInCache(0); // reset to default
+    settings()->setUserStyleSheetUrl(QUrl()); // reset to default
 }
 
 QWebPage *WebPage::createWindow(QWebPage::WebWindowType)
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index e017ee7..c2e097b 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -391,3 +391,16 @@ void LayoutTestController::overridePreference(const QString& name, const QVarian
     else if (name == "WebKitUsesPageCachePreferenceKey")
         QWebSettings::setMaximumPagesInCache(value.toInt());
 }
+
+void LayoutTestController::setUserStyleSheetLocation(const QString& url)
+{
+    m_userStyleSheetLocation = QUrl(url);
+}
+
+void LayoutTestController::setUserStyleSheetEnabled(bool enabled)
+{
+    if (enabled)
+        m_drt->webPage()->settings()->setUserStyleSheetUrl(m_userStyleSheetLocation);
+    else
+        m_drt->webPage()->settings()->setUserStyleSheetUrl(QUrl());
+}
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 4451b7a..cff8474 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -133,6 +133,8 @@ public slots:
 
     void waitForPolicyDelegate();
     void overridePreference(const QString& name, const QVariant& value);
+    void setUserStyleSheetLocation(const QString& url);
+    void setUserStyleSheetEnabled(bool enabled);
 
 private slots:
     void processWork();
@@ -151,6 +153,7 @@ private:
     bool m_handleErrorPages;
     bool m_loadFinished;
 
+    QUrl m_userStyleSheetLocation;
     QBasicTimer m_timeoutTimer;
     QWebFrame* m_topLoadingFrame;
     WebCore::DumpRenderTree* m_drt;

-- 
WebKit Debian packaging