[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 879e1f2b90edd8a1a289ecbe45de79c2aec4542a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 10:47:59 2010 +0000

    2010-01-14  Eric Seidel  <eric at webkit.org>
    
            No review, rolling out r53249.
            http://trac.webkit.org/changeset/53249
            https://bugs.webkit.org/show_bug.cgi?id=33617
    
            This caused http/tests/security/local-user-CSS-from-
            remote.html to fail on the Qt Release Build Bot.
    
            * platform/qt/Skipped:
    2010-01-14  Eric Seidel  <eric at webkit.org>
    
            No review, rolling out r53249.
            http://trac.webkit.org/changeset/53249
            https://bugs.webkit.org/show_bug.cgi?id=33617
    
            This caused http/tests/security/local-user-CSS-from-
            remote.html to fail on the Qt Release Build Bot.
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::WebPage::resetSettings):
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::overridePreference):
            * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53253 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index eba6cfc..bbf8743 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,16 @@
 2010-01-14  Eric Seidel  <eric at webkit.org>
 
+        No review, rolling out r53249.
+        http://trac.webkit.org/changeset/53249
+        https://bugs.webkit.org/show_bug.cgi?id=33617
+
+        This caused http/tests/security/local-user-CSS-from-
+        remote.html to fail on the Qt Release Build Bot.
+
+        * platform/qt/Skipped:
+
+2010-01-14  Eric Seidel  <eric at webkit.org>
+
         No review, rolling out r53248.
         http://trac.webkit.org/changeset/53248
         https://bugs.webkit.org/show_bug.cgi?id=32641
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 4b1a7c2..5cd0453 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -204,6 +204,9 @@ 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 4c91861..5fcdd67 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-14  Eric Seidel  <eric at webkit.org>
+
+        No review, rolling out r53249.
+        http://trac.webkit.org/changeset/53249
+        https://bugs.webkit.org/show_bug.cgi?id=33617
+
+        This caused http/tests/security/local-user-CSS-from-
+        remote.html to fail on the Qt Release Build Bot.
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::resetSettings):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::overridePreference):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-01-14  Chris Jerdonek  <chris.jerdonek at gmail.com>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 52939e4..6367fe3 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -171,7 +171,6 @@ 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 c2e097b..e017ee7 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -391,16 +391,3 @@ 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 cff8474..4451b7a 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -133,8 +133,6 @@ 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();
@@ -153,7 +151,6 @@ private:
     bool m_handleErrorPages;
     bool m_loadFinished;
 
-    QUrl m_userStyleSheetLocation;
     QBasicTimer m_timeoutTimer;
     QWebFrame* m_topLoadingFrame;
     WebCore::DumpRenderTree* m_drt;

-- 
WebKit Debian packaging