Changeset 30218 in webkit

Timestamp:

Feb 13, 2008 6:13:53 PM (16 years ago)

Author:

jhoneycutt@apple.com

Message:

2008-02-13 Jon Honeycutt <​jhoneycutt@apple.com>

Reviewed by Anders.

<rdar://problem/5739282> Hangs after closing video trailer popup with
VLC plugin

VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window
handle.

• plugins/PluginQuirkSet.h: Added new quirk PluginQuirkDontSetNullWindowHandleOnDestroy. (WebCore::):
• plugins/win/PluginViewWin.cpp: (WebCore::PluginView::stop): Selectively call NPP_SetWindow. (WebCore::PluginView::determineQuirks): Set new quirk for VLC plug-in.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/PluginQuirkSet.h (modified) (1 diff)
• plugins/win/PluginViewWin.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-13  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Reviewed by Anders.
+
+        <rdar://problem/5739282> Hangs after closing video trailer popup with
+        VLC plugin
+
+        VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window
+        handle.
+
+        * plugins/PluginQuirkSet.h: Added new quirk
+        PluginQuirkDontSetNullWindowHandleOnDestroy.
+        (WebCore::):
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::PluginView::stop): Selectively call NPP_SetWindow.
+        (WebCore::PluginView::determineQuirks): Set new quirk for VLC plug-in.
+
 2008-02-13  Rodney Dawes  <dobey@wayofthemonkey.com>
 

trunk/WebCore/plugins/PluginQuirkSet.h

@@ -44 +44 @@
         PluginQuirkFlashURLNotifyBug = 1 << 8,
         PluginQuirkDontClipToZeroRectWhenScrolling = 1 << 9,
+        PluginQuirkDontSetNullWindowHandleOnDestroy = 1 << 10,
     };
 

trunk/WebCore/plugins/win/PluginViewWin.cpp

@@ -786 +786 @@
     // Clear the window
     m_npWindow.window = 0;
-    if (m_plugin->pluginFuncs()->setwindow) {
+    if (m_plugin->pluginFuncs()->setwindow && !m_quirks.contains(PluginQuirkDontSetNullWindowHandleOnDestroy)) {
         setCallingPlugin(true);
         m_plugin->pluginFuncs()->setwindow(m_instance, &m_npWindow);
@@ -1474 +1474 @@
     static const unsigned lastKnownUnloadableRealPlayerVersionMS = 0x00060000;
 
-    // The flash plugin only requests windowless plugins if we return a mozilla user agent
     if (mimeType == "application/x-shockwave-flash") {
+        // The flash plugin only requests windowless plugins if we return a mozilla user agent
         m_quirks.add(PluginQuirkWantsMozillaUserAgent);
         m_quirks.add(PluginQuirkThrottleInvalidate);
@@ -1482 +1482 @@
     }
 
-    // The WMP plugin sets its size on the first NPP_SetWindow call and never updates its size, so
-    // call SetWindow when the plugin view has a correct size
     if (m_plugin->name().contains("Microsoft") && m_plugin->name().contains("Windows Media")) {
+        // The WMP plugin sets its size on the first NPP_SetWindow call and never updates its size, so
+        // call SetWindow when the plugin view has a correct size
         m_quirks.add(PluginQuirkDeferFirstSetWindowCall);
 
@@ -1498 +1498 @@
         m_quirks.add(PluginQuirkHasModalMessageLoop);
     }
+
+    // VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window handle
+    if (m_plugin->name() == "VLC Multimedia Plugin")
+        m_quirks.add(PluginQuirkDontSetNullWindowHandleOnDestroy);
 
     // The DivX plugin sets its size on the first NPP_SetWindow call and never updates its size, so