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

[dglazkov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 3faa41166254460d6d1f57e539055168910cd01d
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 7 03:13:06 2010 +0000

    2010-09-06  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [Chromium/DRT] Empty out user stylesheet after each test run.
            https://bugs.webkit.org/show_bug.cgi?id=45282
    
            This should significantly cut down on the number of the mysterious flaky tests
            whose diffs looked like the page was blown up to a very lage size. This
            was indeed the dirty work of platform/mac/fast/loader/user-stylesheet-fast-path.html,
            which set the base body font to 100px.
    
            Since the user stylesheet was never reset, _all_ pixel tests that ran after it in
            the same thread failed.
    
            * DumpRenderTree/chromium/TestShell.cpp:
            (TestShell::resetWebSettings): Set user stylesheet to an empty URL.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66861 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c1a0e05..ea94a19 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2010-09-06  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium/DRT] Empty out user stylesheet after each test run.
+        https://bugs.webkit.org/show_bug.cgi?id=45282
+
+        This should significantly cut down on the number of the mysterious flaky tests
+        whose diffs looked like the page was blown up to a very lage size. This
+        was indeed the dirty work of platform/mac/fast/loader/user-stylesheet-fast-path.html,
+        which set the base body font to 100px.
+
+        Since the user stylesheet was never reset, _all_ pixel tests that ran after it in
+        the same thread failed.
+
+        * DumpRenderTree/chromium/TestShell.cpp:
+        (TestShell::resetWebSettings): Set user stylesheet to an empty URL.
+
 2010-09-06  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
index bbaa501..aad5a63 100644
--- a/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
+++ b/WebKitTools/DumpRenderTree/chromium/TestShell.cpp
@@ -204,6 +204,7 @@ void TestShell::resetWebSettings(WebView& webView)
     settings->setLocalStorageEnabled(true);
     settings->setOfflineWebApplicationCacheEnabled(true);
     settings->setAllowFileAccessFromFileURLs(true);
+    settings->setUserStyleSheetLocation(WebURL());
 
     // LayoutTests were written with Safari Mac in mind which does not allow
     // tabbing to links by default.

-- 
WebKit Debian packaging