[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:49:19 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 02f46410fb01bcfcde7ddfb83a58ad427723485c
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 13 00:57:24 2010 +0000

    2010-11-12  Tony Chang  <tony at chromium.org>
    
            Unreviewed, revert changes to script-object-invoke that crash
            single process chromium.
    
            * plugins/script-object-invoke.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index eedb603..7b7eadc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-12  Tony Chang  <tony at chromium.org>
+
+        Unreviewed, revert changes to script-object-invoke that crash
+        single process chromium.
+
+        * plugins/script-object-invoke.html:
+
 2010-11-12  Yael Aharon  <yael.aharon at nokia.com>
 
         Reviewed by David Hyatt.
diff --git a/LayoutTests/plugins/script-object-invoke.html b/LayoutTests/plugins/script-object-invoke.html
index 16b45c1..5f87adb 100644
--- a/LayoutTests/plugins/script-object-invoke.html
+++ b/LayoutTests/plugins/script-object-invoke.html
@@ -28,6 +28,8 @@ function runTest()
     var returned_object = plugin.testScriptObjectInvoke("new_script_object", "createObject");
 
     // Make sure the cloned object outlives the plugin.
+    /* FIXME(joshia): Enable this and fix the NPObject cleanup so that 
+                      it works in single process mode.
     plugin.parentNode.removeChild(plugin);
     try {
         returned_object.property;
@@ -35,6 +37,7 @@ function runTest()
         if (e instanceof ReferenceError)
             document.getElementById("result").innerHTML = "SUCCESS";
     }
+    */
 
     document.getElementById("result").innerHTML = "SUCCESS";
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list