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

tony at chromium.org tony at chromium.org
Wed Dec 22 15:34:57 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 750f3b5b07f306daf5f73befe16d2cc6aab06bb4
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 19:29:35 2010 +0000

    2010-11-08  Tony Chang  <tony at chromium.org>
    
            Unreviewed, adding qt results for new test (only console line number
            is different).  Test failing for unknown reasons on mac-- will fix
            offline.
    
            * platform/mac/Skipped:
            * platform/qt/plugins/nested-plugin-objects-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8c710a8..3257190 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-08  Tony Chang  <tony at chromium.org>
+
+        Unreviewed, adding qt results for new test (only console line number
+        is different).  Test failing for unknown reasons on mac-- will fix
+        offline.
+
+        * platform/mac/Skipped:
+        * platform/qt/plugins/nested-plugin-objects-expected.txt: Added.
+
 2010-11-08  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index b063896..d3ff503 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -276,3 +276,6 @@ fast/canvas/canvas-getImageData-negative-source.html
 
 # Times out because plugins aren't allowed to execute JS after NPP_Destroy has been called in WebKit1's OOP plugins implementation http://webkit.org/b/48929
 plugins/evaluate-js-after-removing-plugin-element.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=49194
+plugins/nested-plugin-objects.html
diff --git a/LayoutTests/platform/qt/plugins/nested-plugin-objects-expected.txt b/LayoutTests/platform/qt/plugins/nested-plugin-objects-expected.txt
new file mode 100644
index 0000000..8efed8e
--- /dev/null
+++ b/LayoutTests/platform/qt/plugins/nested-plugin-objects-expected.txt
@@ -0,0 +1,17 @@
+CONSOLE MESSAGE: line 0: PLUGIN: NPP_Destroy
+This tests that objects from plugin objects are properly cleaned up.
+
+Example:
+   plugin
+     ------- (Creates) ------ Object1
+                                  ------- (Creates) ------ Object2
+
+It is important that both Object1 and Object2 cleanup as a result of
+cleaning up the plugin.
+
+SUCCESS
+
+
+
+
+

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list