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

eric at webkit.org eric at webkit.org
Thu Apr 8 01:46:26 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 0d11af6f323f933a2ecc1e968ec5e31dfd357a3c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 14:22:31 2010 +0000

    2010-02-12  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Qt DRT now dump the frame loader callbacks when LayoutTestController()
            method is called.
    
            LayoutTests:
                http/tests/security/mixedContent/data-url-script-in-iframe.html
                http/tests/security/mixedContent/empty-url-plugin-in-frame.html
                http/tests/security/mixedContent/insecure-css-in-iframe.html
                http/tests/security/mixedContent/insecure-iframe-in-iframe.html
                http/tests/security/mixedContent/insecure-image-in-iframe.html
                http/tests/security/mixedContent/insecure-plugin-in-iframe.html
                http/tests/security/mixedContent/insecure-script-in-iframe.html
                http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
                http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
    
            [Qt] Make possible Qt DRT dump frame load callbacks
            https://bugs.webkit.org/show_bug.cgi?id=34702
    
            * platform/qt/Skipped:
    2010-02-12  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Qt DRT now dump the frame loader callbacks when LayoutTestController()
            method is called.
    
            LayoutTests:
                http/tests/security/mixedContent/data-url-script-in-iframe.html
                http/tests/security/mixedContent/empty-url-plugin-in-frame.html
                http/tests/security/mixedContent/insecure-css-in-iframe.html
                http/tests/security/mixedContent/insecure-iframe-in-iframe.html
                http/tests/security/mixedContent/insecure-image-in-iframe.html
                http/tests/security/mixedContent/insecure-plugin-in-iframe.html
                http/tests/security/mixedContent/insecure-script-in-iframe.html
                http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
                http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
    
            [Qt] Make possible Qt DRT dump frame load callbacks
            https://bugs.webkit.org/show_bug.cgi?id=34702
    
            * WebCoreSupport/FrameLoaderClientQt.cpp:
            (WebCore::FrameLoaderClientQt::didDisplayInsecureContent):
            (WebCore::FrameLoaderClientQt::didRunInsecureContent):
    2010-02-12  Diego Gonzalez  <diego.gonzalez at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Qt DRT now dump the frame loader callbacks when LayoutTestController()
            method is called.
    
            LayoutTests:
                http/tests/security/mixedContent/data-url-script-in-iframe.html
                http/tests/security/mixedContent/empty-url-plugin-in-frame.html
                http/tests/security/mixedContent/insecure-css-in-iframe.html
                http/tests/security/mixedContent/insecure-iframe-in-iframe.html
                http/tests/security/mixedContent/insecure-image-in-iframe.html
                http/tests/security/mixedContent/insecure-plugin-in-iframe.html
                http/tests/security/mixedContent/insecure-script-in-iframe.html
                http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
                http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
    
            [Qt] Make possible Qt DRT dump frame load callbacks
            https://bugs.webkit.org/show_bug.cgi?id=34702
    
            * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
            (LayoutTestController::reset):
            (LayoutTestController::dumpFrameLoadCallbacks):
            * DumpRenderTree/qt/LayoutTestControllerQt.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54723 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e3d9394..eb6067e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2010-02-12  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Qt DRT now dump the frame loader callbacks when LayoutTestController()
+        method is called.
+
+        LayoutTests:
+            http/tests/security/mixedContent/data-url-script-in-iframe.html
+            http/tests/security/mixedContent/empty-url-plugin-in-frame.html
+            http/tests/security/mixedContent/insecure-css-in-iframe.html
+            http/tests/security/mixedContent/insecure-iframe-in-iframe.html
+            http/tests/security/mixedContent/insecure-image-in-iframe.html
+            http/tests/security/mixedContent/insecure-plugin-in-iframe.html
+            http/tests/security/mixedContent/insecure-script-in-iframe.html
+            http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
+            http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
+
+        [Qt] Make possible Qt DRT dump frame load callbacks
+        https://bugs.webkit.org/show_bug.cgi?id=34702
+
+        * platform/qt/Skipped:
+
 2010-02-12  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 67e8564..ad61718 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -208,8 +208,16 @@ http/tests/misc/will-send-request-returns-null-on-redirect.html
 # Missing layoutTestController.evaluateScriptInIsolatedWorld()
 http/tests/security/isolatedWorld
 
-# Missing layoutTestController.dumpFrameLoadCallbacks()
-http/tests/security/mixedContent
+# Evaluate expected results for frame loader callbacks
+# https://bugs.webkit.org/show_bug.cgi?id=34839
+http/tests/security/mixedContent/about-blank-iframe-in-main-frame.html
+http/tests/security/mixedContent/data-url-iframe-in-main-frame.html
+http/tests/security/mixedContent/insecure-css-in-main-frame.html
+http/tests/security/mixedContent/insecure-iframe-in-main-frame.html
+http/tests/security/mixedContent/insecure-image-in-main-frame.html
+http/tests/security/mixedContent/redirect-http-to-https-iframe-in-main-frame.html
+http/tests/security/mixedContent/redirect-https-to-http-iframe-in-main-frame.html
+
 http/tests/cache/subresource-failover-to-network.html
 
 # Missing layoutTestController.evaluateInWebInspector()
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 0656388..e0d1b28 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,28 @@
+2010-02-12  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Qt DRT now dump the frame loader callbacks when LayoutTestController()
+        method is called.
+
+        LayoutTests:
+            http/tests/security/mixedContent/data-url-script-in-iframe.html
+            http/tests/security/mixedContent/empty-url-plugin-in-frame.html
+            http/tests/security/mixedContent/insecure-css-in-iframe.html
+            http/tests/security/mixedContent/insecure-iframe-in-iframe.html
+            http/tests/security/mixedContent/insecure-image-in-iframe.html
+            http/tests/security/mixedContent/insecure-plugin-in-iframe.html
+            http/tests/security/mixedContent/insecure-script-in-iframe.html
+            http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
+            http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
+
+        [Qt] Make possible Qt DRT dump frame load callbacks
+        https://bugs.webkit.org/show_bug.cgi?id=34702
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::didDisplayInsecureContent):
+        (WebCore::FrameLoaderClientQt::didRunInsecureContent):
+
 2010-02-10  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 760e37e..16a6faa 100644
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -672,11 +672,17 @@ void FrameLoaderClientQt::dispatchDidChangeBackForwardIndex() const
 
 void FrameLoaderClientQt::didDisplayInsecureContent()
 {
+    if (dumpFrameLoaderCallbacks)
+        printf("didDisplayInsecureContent\n");
+
     notImplemented();
 }
 
 void FrameLoaderClientQt::didRunInsecureContent(WebCore::SecurityOrigin*)
 {
+    if (dumpFrameLoaderCallbacks)
+        printf("didRunInsecureContent\n");
+
     notImplemented();
 }
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1e3ea5b..ab4b32d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,29 @@
+2010-02-12  Diego Gonzalez  <diego.gonzalez at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Qt DRT now dump the frame loader callbacks when LayoutTestController()
+        method is called.
+
+        LayoutTests:
+            http/tests/security/mixedContent/data-url-script-in-iframe.html
+            http/tests/security/mixedContent/empty-url-plugin-in-frame.html
+            http/tests/security/mixedContent/insecure-css-in-iframe.html
+            http/tests/security/mixedContent/insecure-iframe-in-iframe.html
+            http/tests/security/mixedContent/insecure-image-in-iframe.html
+            http/tests/security/mixedContent/insecure-plugin-in-iframe.html
+            http/tests/security/mixedContent/insecure-script-in-iframe.html
+            http/tests/security/mixedContent/redirect-http-to-https-script-in-iframe.html
+            http/tests/security/mixedContent/redirect-https-to-http-script-in-iframe.html
+
+        [Qt] Make possible Qt DRT dump frame load callbacks
+        https://bugs.webkit.org/show_bug.cgi?id=34702
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::reset):
+        (LayoutTestController::dumpFrameLoadCallbacks):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-02-12  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Antti Koivisto.
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
index 427944d..51c1181 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp
@@ -37,6 +37,7 @@
 #include <qwebsettings.h>
 
 extern void qt_dump_editing_callbacks(bool b);
+extern void qt_dump_frame_loader(bool b);
 extern void qt_dump_resource_load_callbacks(bool b);
 extern void qt_drt_setFrameSetFlatteningEnabled(QWebPage*, bool);
 extern void qt_drt_setJavaScriptProfilingEnabled(QWebFrame*, bool enabled);
@@ -77,6 +78,7 @@ void LayoutTestController::reset()
     m_webHistory = 0;
     m_globalFlag = false;
     qt_dump_editing_callbacks(false);
+    qt_dump_frame_loader(false);
     qt_dump_resource_load_callbacks(false);
     emit hidePage();
 }
@@ -203,6 +205,11 @@ void LayoutTestController::dumpEditingCallbacks()
     qt_dump_editing_callbacks(true);
 }
 
+void LayoutTestController::dumpFrameLoadCallbacks()
+{
+    qt_dump_frame_loader(true);
+}
+
 void LayoutTestController::dumpResourceLoadCallbacks()
 {
     qt_dump_resource_load_callbacks(true);
diff --git a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
index 3588219..64cbcc9 100644
--- a/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
+++ b/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h
@@ -96,6 +96,7 @@ public slots:
     void setGlobalFlag(bool flag) { m_globalFlag = flag; }
     void handleErrorPages() { m_handleErrorPages = true; }
     void dumpEditingCallbacks();
+    void dumpFrameLoadCallbacks();
     void dumpResourceLoadCallbacks();
     void queueBackNavigation(int howFarBackward);
     void queueForwardNavigation(int howFarForward);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list