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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f7346b21c39f401785a742807b554b8b2ef951ea
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 22:59:08 2010 +0000

    Unreviewed.
    
    [Qt] DRT sideeffect revealed by r63657
    https://bugs.webkit.org/show_bug.cgi?id=42578
    
    Remove incorrect Qt specific expected file for http/tests/security/mixedContent/insecure-css-in-main-frame.html.
    Platform independent is the correct one.
    
    Add http/tests/security/mixedContent/insecure-css-in-main-frame.html
    to the Skipped list, because it is a flakey test due to this bug.
    
    * platform/qt/Skipped:
    * platform/qt/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt: Removed.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70498 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 9139591..7779832 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-25  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed.
+
+        [Qt] DRT sideeffect revealed by r63657
+        https://bugs.webkit.org/show_bug.cgi?id=42578
+
+        Remove incorrect Qt specific expected file for http/tests/security/mixedContent/insecure-css-in-main-frame.html.
+        Platform independent is the correct one.
+
+        Add http/tests/security/mixedContent/insecure-css-in-main-frame.html 
+        to the Skipped list, because it is a flakey test due to this bug.
+
+        * platform/qt/Skipped:
+        * platform/qt/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt: Removed.
+
 2010-10-25  Andy Estes  <aestes at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index fe180bd..b6cec6b 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5358,6 +5358,7 @@ fast/forms/search-cancel-button-events.html
 
 # [Qt] DRT sideeffect revealed by r63657
 # https://bugs.webkit.org/show_bug.cgi?id=42578
+http/tests/security/mixedContent/insecure-css-in-main-frame.html
 http/tests/xmlhttprequest/authorization-header.html
 http/tests/xmlhttprequest/null-auth.php
 
diff --git a/LayoutTests/platform/qt/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt b/LayoutTests/platform/qt/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt
deleted file mode 100644
index cba0d7f..0000000
--- a/LayoutTests/platform/qt/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
-didDisplayInsecureContent
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-This test opens a window that loads an insecure style sheet. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.

-- 
WebKit Debian packaging