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

[tony at chromium.org]

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

    2010-11-08  Tony Chang  <tony at chromium.org>
    
            Unreviewed, updating plugin expectations.
    
            * platform/chromium-mac/plugins/netscape-destroy-plugin-script-objects-expected.txt: Removed.
            * platform/chromium-win/plugins/netscape-destroy-plugin-script-objects-expected.txt: Removed.
            * platform/mac-snowleopard/Skipped: Only failing on SL.
            * platform/mac/Skipped:
            * platform/qt/plugins/nested-plugin-objects-expected.txt: Removed.
            * plugins/nested-plugin-objects-expected.txt: Made the main version
                  have a console error line of 0 since it seems to be a chromium
                  specific difference.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71558 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c920f9a..29332dd 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-08  Tony Chang  <tony at chromium.org>
+
+        Unreviewed, updating plugin expectations.
+
+        * platform/chromium-mac/plugins/netscape-destroy-plugin-script-objects-expected.txt: Removed.
+        * platform/chromium-win/plugins/netscape-destroy-plugin-script-objects-expected.txt: Removed.
+        * platform/mac-snowleopard/Skipped: Only failing on SL.
+        * platform/mac/Skipped:
+        * platform/qt/plugins/nested-plugin-objects-expected.txt: Removed.
+        * plugins/nested-plugin-objects-expected.txt: Made the main version
+              have a console error line of 0 since it seems to be a chromium
+              specific difference.
+
 2010-11-08  Dumitru Daniliuc  <dumi at chromium.org>
 
         Unreviewed, updating Chromium expectations.
diff --git a/LayoutTests/platform/chromium-win/plugins/netscape-destroy-plugin-script-objects-expected.txt b/LayoutTests/platform/chromium-win/plugins/netscape-destroy-plugin-script-objects-expected.txt
deleted file mode 100644
index 160672d..0000000
--- a/LayoutTests/platform/chromium-win/plugins/netscape-destroy-plugin-script-objects-expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-CONSOLE MESSAGE: line 13: PLUGIN: NPP_Destroy
-This tests that accessing plug-in script objects from a destroyed plugin cause throws the right exceptions.
-SUCCESS
-
diff --git a/LayoutTests/plugins/nested-plugin-objects-expected.txt b/LayoutTests/platform/chromium/plugins/nested-plugin-objects-expected.txt
similarity index 100%
copy from LayoutTests/plugins/nested-plugin-objects-expected.txt
copy to LayoutTests/platform/chromium/plugins/nested-plugin-objects-expected.txt
diff --git a/LayoutTests/platform/chromium-mac/plugins/netscape-destroy-plugin-script-objects-expected.txt b/LayoutTests/platform/chromium/plugins/netscape-destroy-plugin-script-objects-expected.txt
similarity index 100%
rename from LayoutTests/platform/chromium-mac/plugins/netscape-destroy-plugin-script-objects-expected.txt
rename to LayoutTests/platform/chromium/plugins/netscape-destroy-plugin-script-objects-expected.txt
diff --git a/LayoutTests/platform/mac-snowleopard/Skipped b/LayoutTests/platform/mac-snowleopard/Skipped
index d461dc7..fbb498d 100644
--- a/LayoutTests/platform/mac-snowleopard/Skipped
+++ b/LayoutTests/platform/mac-snowleopard/Skipped
@@ -140,3 +140,6 @@ platform/mac/editing/spelling/forward-delete-into-autocorrected-word.html
 platform/mac/editing/spelling/move-cursor-around-misspelled-word.html
 platform/mac/editing/spelling/move-cursor-to-autocorrected-word.html
 platform/mac/editing/spelling/move-cursor-to-beginning-of-autocorrected-word.html
+
+# https://bugs.webkit.org/show_bug.cgi?id=49194
+plugins/nested-plugin-objects.html
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index d3ff503..b063896 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -276,6 +276,3 @@ 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
deleted file mode 100644
index 8efed8e..0000000
--- a/LayoutTests/platform/qt/plugins/nested-plugin-objects-expected.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-
-
-
-
-
diff --git a/LayoutTests/plugins/nested-plugin-objects-expected.txt b/LayoutTests/plugins/nested-plugin-objects-expected.txt
index 08ba7b5..8efed8e 100644
--- a/LayoutTests/plugins/nested-plugin-objects-expected.txt
+++ b/LayoutTests/plugins/nested-plugin-objects-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 29: PLUGIN: NPP_Destroy
+CONSOLE MESSAGE: line 0: PLUGIN: NPP_Destroy
 This tests that objects from plugin objects are properly cleaned up.
 
 Example:

-- 
WebKit Debian packaging