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

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7252c5d9763a6af3c610eb42431f93edc79281a2
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 4 21:01:48 2009 +0000

    WebKitTools: Implement the setAllowUniversalAccessFromFileURLs method
    for the Qt LayoutTestController.
    
    Reviewed by Adam Treat.
    
    * DumpRenderTree/qt/DumpRenderTree.cpp:
    (WebCore::WebPage::resetSettings):
    * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
    (LayoutTestController::setAllowUniversalAccessFromFileURLs):
    * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    LayoutTests: Remove test that works after adding setAllowUniversalAccessFromFileURLs
    to Qt's version of the LayoutTestController.
    
    Reviewed by Adam Treat.
    
    * platform/qt/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51709 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3794407..e35a052 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-04  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Adam Treat.
+
+        Remove test that works after adding setAllowUniversalAccessFromFileURLs
+        to Qt's version of the LayoutTestController.
+
+        * platform/qt/Skipped:
+
 2009-12-04  Dirk Schulze  <krit at webkit.org>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 7f2e2c3..5fe287b 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -224,9 +224,6 @@ 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.setAllowUniversalAccessFromFileURLs()
-fast/xmlhttprequest/xmlhttprequest-nonexistent-file.html
-
 # Missing layoutTestController.evaluateInWebInspector()
 inspector/elements-img-tooltip.html
 inspector/elements-panel-selection-on-refresh.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5b633aa..7e439f4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-04  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Adam Treat.
+
+        Implement the setAllowUniversalAccessFromFileURLs method
+        for the Qt LayoutTestController.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::WebPage::resetSettings):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::setAllowUniversalAccessFromFileURLs):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2009-12-04  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
index a49be44..ff06dbe 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp
@@ -152,6 +152,7 @@ void WebPage::resetSettings()
     settings()->resetAttribute(QWebSettings::PrivateBrowsingEnabled);
     settings()->resetAttribute(QWebSettings::LinksIncludedInFocusChain);
     settings()->resetAttribute(QWebSettings::OfflineWebApplicationCacheEnabled);
+    settings()->resetAttribute(QWebSettings::LocalContentCanAccessRemoteUrls);
     QWebSettings::setMaximumPagesInCache(0); // reset to default
 }
 
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index be54220..0f68292 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -237,6 +237,11 @@ QString LayoutTestController::decodeHostName(const QString& host)
     return decoded;
 }
 
+void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
+{
+    m_drt->webPage()->settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, enabled);
+}
+
 void LayoutTestController::setJavaScriptProfilingEnabled(bool enable)
 {
     m_topLoadingFrame->page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index f023f67..03397d6 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -107,6 +107,7 @@ public slots:
     QString encodeHostName(const QString& host);
     QString decodeHostName(const QString& host);
     void dumpSelectionRect() const {}
+    void setAllowUniversalAccessFromFileURLs(bool enable);
     void setJavaScriptProfilingEnabled(bool enable);
     void setFixedContentsSize(int width, int height);
     void setPrivateBrowsingEnabled(bool enable);

-- 
WebKit Debian packaging