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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit ef1e82efb2122ad34506c54ee2f15ca09fada5b8
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 26 18:23:40 2010 +0000

    Enable the plug-in process on Mac
    https://bugs.webkit.org/show_bug.cgi?id=48350
    
    Reviewed by Sam Weinig.
    
    WebKit2:
    
    * WebKit2Prefix.h:
    Flip the switch and enable the plug-in process on Mac.
    
    * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
    (WebKit::NetscapePlugin::platformDestroy):
    Fix a bogus assert.
    
    LayoutTests:
    
    * platform/mac-wk2/Skipped:
    Update WebKit2 mac skipped list.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70544 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ae8bf65..e02a1d0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-26  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Enable the plug-in process on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=48350
+
+        * platform/mac-wk2/Skipped:
+        Update WebKit2 mac skipped list.
+
 2010-10-26  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed. Disabling inspector audits tests on Qt.
diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index 2e990f9..f794484 100644
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -1798,6 +1798,52 @@ http/tests/loading/simple-subframe.html
 http/tests/loading/slow-parsing-subframe.html
 http/tests/loading/text-content-type-with-binary-extension.html
 
+# NPRuntime support for out-of-process plug-ins
+# <https://bugs.webkit.org/show_bug.cgi?id=48346>
+http/tests/plugins/cross-frame-object-access.html
+http/tests/plugins/get-url.html
+http/tests/plugins/geturlnotify-from-npp-destroystream.html
+http/tests/plugins/interrupted-get-url.html
+http/tests/plugins/local-geturl-from-remote.html
+http/tests/plugins/npapi-response-headers.html
+plugins/destroy-during-npp-new.html
+plugins/destroy-stream-twice.html
+plugins/embed-inside-object.html
+plugins/get-empty-url.html
+plugins/get-file-url.html
+plugins/get-javascript-url.html
+plugins/get-url-with-iframe-target.html
+plugins/geturl-replace-query.html
+plugins/inner-html-display-none.html
+plugins/instance-available-before-stylesheets-loaded-object.html
+plugins/instance-available-before-stylesheets-loaded.html
+plugins/netscape-plugin-map-data-to-src.html
+plugins/netscape-plugin-setwindow-size.html
+plugins/override-node-method.html
+plugins/pass-different-npp-struct.html
+plugins/plugin-remove-subframe.html
+plugins/reentrant-update-widget-positions.html
+plugins/reloadplugins-no-pages.html
+plugins/return-error-from-new-stream-doesnt-invoke-destroy-stream.html
+plugins/return-negative-one-from-write.html
+plugins/set-status.html
+plugins/update-widgets-crash.html
+plugins/window-open.html
+plugins/npruntime/embed-property.html
+plugins/npruntime/enumerate.html
+plugins/npruntime/evaluate.html
+plugins/npruntime/get-int-identifier-special-values.html
+plugins/npruntime/get-property-return-value.html
+plugins/npruntime/identifier-conversion.html
+plugins/npruntime/invoke-browserfuncs.html
+plugins/npruntime/invoke-default.html
+plugins/npruntime/invoke.html
+plugins/npruntime/npruntime.html
+plugins/npruntime/object-from-destroyed-plugin.html
+plugins/npruntime/plugin-scriptable-object-invoke-default.html
+plugins/npruntime/round-trip-npobject.html
+plugins/npruntime/set-property.html
+ 
 ########################################
 
 # NOT YET TRACKED BY BUG REPORTS
@@ -2194,6 +2240,7 @@ media/controls-after-reload.html
 media/controls-styling.html
 media/video-zoom-controls.html
 platform/mac/fast/loader/non-html-load-event.html
+plugins/embed-attributes-style.html
 storage/multiple-databases-garbage-collection.html
 storage/open-database-while-transaction-in-progress.html
 svg/custom/clip-path-referencing-use2.svg
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b2a6dbf..0823ea3 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-26  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Enable the plug-in process on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=48350
+
+        * WebKit2Prefix.h:
+        Flip the switch and enable the plug-in process on Mac.
+
+        * WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm:
+        (WebKit::NetscapePlugin::platformDestroy):
+        Fix a bogus assert.
+
 2010-10-26  Zoltan Horvath  <zoltan at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/WebKit2Prefix.h b/WebKit2/WebKit2Prefix.h
index ef91570..2e61ceb 100644
--- a/WebKit2/WebKit2Prefix.h
+++ b/WebKit2/WebKit2Prefix.h
@@ -59,8 +59,7 @@ static const type& name() \
 #define ENABLE_WEB_PROCESS_SANDBOX 1
 #endif
 
-// FIXME: Enable once this works well enough.
-#define ENABLE_PLUGIN_PROCESS 0
+#define ENABLE_PLUGIN_PROCESS 1
 
 #import <CoreGraphics/CoreGraphics.h>
 
diff --git a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
index a3cfed2..0d18fee 100644
--- a/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
+++ b/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm
@@ -152,8 +152,8 @@ void NetscapePlugin::platformDestroy()
 #ifndef NP_NO_CARBON
     if (m_eventModel == NPEventModelCarbon) {
         // Destroy the fake Carbon window.
-        ASSERT(m_npCGContext.window);
-        DisposeWindow(static_cast<WindowRef>(m_npCGContext.window));
+        if (m_npCGContext.window)
+            DisposeWindow(static_cast<WindowRef>(m_npCGContext.window));
 
         // Stop the null event timer.
         m_nullEventTimer.stop();

-- 
WebKit Debian packaging