Changeset 70544 in webkit

Timestamp:

Oct 26, 2010 11:23:40 AM (14 years ago)

Author:

andersca@apple.com

Message:

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/Skipped (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebKit2Prefix.h (modified) (1 diff)
• WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-26  Anders Carlsson  <andersca@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@chromium.org>
 

trunk/LayoutTests/platform/mac-wk2/Skipped

@@ -1799 +1799 @@
 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
+ 
 ########################################
 
@@ -2195 +2241 @@
 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

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-26  Anders Carlsson  <andersca@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@webkit.org>
 

trunk/WebKit2/WebKit2Prefix.h

@@ -60 +60 @@
 #endif
 
-// FIXME: Enable once this works well enough.
-#define ENABLE_PLUGIN_PROCESS 0
+#define ENABLE_PLUGIN_PROCESS 1
 
 #import <CoreGraphics/CoreGraphics.h>

trunk/WebKit2/WebProcess/Plugins/Netscape/mac/NetscapePluginMac.mm

@@ -153 +153 @@
     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.