Changeset 23424 in webkit

Timestamp:

May 29, 2007 1:49:53 PM (17 years ago)

Author:

andersca

Message:

Reviewed by Adam.

<rdar://problem/4761543> nike.com doesn't finish loading if Flash plugin is installed
<rdar://problem/5131528> play button on Flash in ESPN front page does not start movie

Make sure to call NPP_SetWindow right after creating the plugin, and not from the main loop. However,
the WMP plugin needs to have the plugin's window coordinates set correctly when calling NPP_SetWindow so add a
quirk for that.

• plugins/win/PluginViewWin.cpp: (WebCore::PluginViewWin::determineQuirks): (WebCore::PluginViewWin::init):
• plugins/win/PluginViewWin.h: (WebCore::):

Location:

branches/WindowsMerge/WebCore

Files:

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

branches/WindowsMerge/WebCore/ChangeLog

@@ +1 @@
+2007-05-29  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam.
+
+        <rdar://problem/4761543> nike.com doesn't finish loading if Flash plugin is installed
+        <rdar://problem/5131528> play button on Flash in ESPN front page does not start movie
+        
+        Make sure to call NPP_SetWindow right after creating the plugin, and not from the main loop. However,
+        the WMP plugin needs to have the plugin's window coordinates set correctly when calling NPP_SetWindow so add a 
+        quirk for that.
+        
+        * plugins/win/PluginViewWin.cpp:
+        (WebCore::PluginViewWin::determineQuirks):
+        (WebCore::PluginViewWin::init):
+        * plugins/win/PluginViewWin.h:
+        (WebCore::):
+
 2007-05-29  Sam Weinig  <sam@webkit.org>
 

branches/WindowsMerge/WebCore/plugins/win/PluginViewWin.cpp

@@ -1154 +1154 @@
     if (mimeType == "application/x-shockwave-flash")
         m_quirks |= PluginQuirkWantsMozillaUserAgent;
+
+    // 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"))
+        m_quirks |= PluginQuirkDeferFirstSetWindowCall;
 }
 
@@ -1234 +1239 @@
     }
 
+    if (!(m_quirks & PluginQuirkDeferFirstSetWindowCall))
+        setNPWindowRect(frameGeometry());
+
     m_status = PluginStatusLoadedSuccessfully;
 }

branches/WindowsMerge/WebCore/plugins/win/PluginViewWin.h

@@ -62 +62 @@
     enum PluginQuirks {
         PluginQuirkWantsMozillaUserAgent = 1 << 0,
+        PluginQuirkDeferFirstSetWindowCall = 1 << 1,
     };