[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 8b118211045d50c1884069eac95d0852383936e3
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 15 01:25:07 2010 +0000

    2010-09-14  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] fix http/tests/security/local-user-CSS-from-remote.html
            https://bugs.webkit.org/show_bug.cgi?id=45788
    
            * platform/chromium/test_expectations.txt:
    2010-09-14  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] fix http/tests/security/local-user-CSS-from-remote.html
            https://bugs.webkit.org/show_bug.cgi?id=45788
    
            * DEPS: Include webkit_support::LocalFileToDataURL
    2010-09-14  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] fix http/tests/security/local-user-CSS-from-remote.html
            https://bugs.webkit.org/show_bug.cgi?id=45788
    
            * DumpRenderTree/chromium/LayoutTestController.cpp:
            (LayoutTestController::setUserStyleSheetLocation): use a base64 url like in Chrome
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5bc06ac..01dd726 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-14  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] fix http/tests/security/local-user-CSS-from-remote.html
+        https://bugs.webkit.org/show_bug.cgi?id=45788
+
+        * platform/chromium/test_expectations.txt:
+
 2010-09-14  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 602b9c7..0dba453 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -800,13 +800,6 @@ BUG14885 SLOW : fast/js/JSON-stringify.html = FAIL CRASH
 BUG14885 : fast/js/JSON-parse-reviver.html = FAIL
 BUG14885 : fast/js/JSON-stringify-replacer.html = FAIL
 
-// User stylesheets not currently supported by chrome.
-// Webkit supports them by doing filesystem operations directly.
-// This is disallowed in a sandboxed renderer. The test fails in
-// test_shell.exe because the necessary filesystem stubs are notImplemented(),
-// and would need to be proxied through the browser
-BUG24199 : http/tests/security/local-user-CSS-from-remote.html = FAIL
-
 // Implement CSS -webkit-font-smoothing property support.
 BUG23270 WIN LINUX : fast/css/font-smoothing.html = FAIL
 
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 70d230e..656e742 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,14 @@
 2010-09-14  Tony Chang  <tony at chromium.org>
 
+        Reviewed by Kent Tamura.
+
+        [chromium] fix http/tests/security/local-user-CSS-from-remote.html
+        https://bugs.webkit.org/show_bug.cgi?id=45788
+
+        * DEPS: Include webkit_support::LocalFileToDataURL
+
+2010-09-14  Tony Chang  <tony at chromium.org>
+
         Reviewed by Ojan Vafai.
 
         [chromium] Remove WebKit::areLayoutTestImagesOpaque since it's no longer needed
diff --git a/WebKit/chromium/DEPS b/WebKit/chromium/DEPS
index a087215..2974abd 100644
--- a/WebKit/chromium/DEPS
+++ b/WebKit/chromium/DEPS
@@ -32,7 +32,7 @@
 
 vars = {
   'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_rev': '59406',
+  'chromium_rev': '59459',
 }
 
 deps = {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0f1eb50..54e0617 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,15 @@
 2010-09-14  Tony Chang  <tony at chromium.org>
 
+        Reviewed by Kent Tamura.
+
+        [chromium] fix http/tests/security/local-user-CSS-from-remote.html
+        https://bugs.webkit.org/show_bug.cgi?id=45788
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::setUserStyleSheetLocation): use a base64 url like in Chrome
+
+2010-09-14  Tony Chang  <tony at chromium.org>
+
         Reviewed by Ojan Vafai.
 
         [chromium] Remove WebKit::areLayoutTestImagesOpaque since it's no longer needed
diff --git a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
index 6510e17..d75269b 100644
--- a/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/LayoutTestController.cpp
@@ -608,7 +608,8 @@ void LayoutTestController::setUserStyleSheetEnabled(const CppArgumentList& argum
 void LayoutTestController::setUserStyleSheetLocation(const CppArgumentList& arguments, CppVariant* result)
 {
     if (arguments.size() > 0 && arguments[0].isString()) {
-        m_userStyleSheetLocation = webkit_support::RewriteLayoutTestsURL(arguments[0].toString());
+        m_userStyleSheetLocation = webkit_support::LocalFileToDataURL(
+            webkit_support::RewriteLayoutTestsURL(arguments[0].toString()));
         m_shell->webView()->settings()->setUserStyleSheetLocation(m_userStyleSheetLocation);
     }
     result->setNull();

-- 
WebKit Debian packaging