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

ossy at webkit.org ossy at webkit.org
Wed Dec 22 11:26:30 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 8800238a927d070f98ff2241e3fd742e253b0028
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 23 15:41:10 2010 +0000

    Unreviewed.
    
    Process link elements immediately if there are no beforeload listeners.
    https://bugs.webkit.org/show_bug.cgi?id=42859
    
    Add Qt specific expected result after r63924.
    
    * platform/qt/http/tests/security/mixedContent: Added.
    * platform/qt/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt: Copied from LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt and updated.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f3561f3..986a902 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
 
         Unreviewed.
 
+        Process link elements immediately if there are no beforeload listeners.
+        https://bugs.webkit.org/show_bug.cgi?id=42859
+
+        Add Qt specific expected result after r63924.
+
+        * platform/qt/http/tests/security/mixedContent: Added.
+        * platform/qt/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt: Copied from LayoutTests/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt and updated.
+
+2010-07-23  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed.
+
         [Qt] Search input field doesn't have cancel button
         https://bugs.webkit.org/show_bug.cgi?id=42887
 
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
new file mode 100644
index 0000000..cba0d7f
--- /dev/null
+++ b/LayoutTests/platform/qt/http/tests/security/mixedContent/insecure-css-in-main-frame-expected.txt
@@ -0,0 +1,10 @@
+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



More information about the Pkg-webkit-commits mailing list