Changeset 86380 in webkit

Timestamp:

May 12, 2011 2:17:06 PM (13 years ago)

Author:

bweinstein@apple.com

Message:

WebKit2: Implement plugin quirk for Mozilla user agent for older Flash
​https://bugs.webkit.org/show_bug.cgi?id=60726
<rdar://problem/8470824>

Reviewed by Adam Roben.

Implement the quirk for versions of Flash before v10 that only request windowless plugins
if we use a Mozilla user agent.

• Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp:

(WebKit::NetscapePluginModule::determineQuirks): If we have a plugin that handles the

"application/x-shockwave-flash" MIME type with a version less than 10, tell it to use
the Mozilla user agent.

• Shared/Plugins/PluginQuirks.h:
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::userAgent): Add an early return if the plugin uses the Mozilla user

agent.

• win/WebKit2.vcproj: Add PluginQuirks.h.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp (modified) (1 diff)
• Shared/Plugins/PluginQuirks.h (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (1 diff)
• win/WebKit2.vcproj (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-12  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        WebKit2: Implement plugin quirk for Mozilla user agent for older Flash
+        https://bugs.webkit.org/show_bug.cgi?id=60726
+        <rdar://problem/8470824>
+        
+        Implement the quirk for versions of Flash before v10 that only request windowless plugins
+        if we use a Mozilla user agent.
+
+        * Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp:
+        (WebKit::NetscapePluginModule::determineQuirks): If we have a plugin that handles the
+            "application/x-shockwave-flash" MIME type with a version less than 10, tell it to use
+            the Mozilla user agent.
+        * Shared/Plugins/PluginQuirks.h:
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::userAgent): Add an early return if the plugin uses the Mozilla user
+            agent.
+        * win/WebKit2.vcproj: Add PluginQuirks.h.
+
 2011-05-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/win/NetscapePluginModuleWin.cpp

@@ -117 +117 @@
 void NetscapePluginModule::determineQuirks()
 {
+    PluginInfoStore::Plugin plugin;
+    getPluginInfo(m_pluginPath, plugin);
+
+    Vector<MimeClassInfo> mimeTypes = plugin.info.mimes;
+    for (size_t i = 0; i < mimeTypes.size(); ++i) {
+        // FIXME: It seems strange to assume that any plugin that handles this MIME type needs this quirk. Should
+        // we be be checking the plugin's name instead?
+        if (mimeTypes[i].type == "application/x-shockwave-flash") {
+            uint64_t flashTenVersion = fileVersion(0x00000000, 0x000a0000);
+            uint64_t version = plugin.fileVersion;
+
+            // Pre Flash v10 only requests windowless plugins if we use a Mozilla user agent.
+            // For testing information, see: https://bugs.webkit.org/show_bug.cgi?id=60726.
+            if (version < flashTenVersion)
+                m_pluginQuirks.add(PluginQuirks::WantsMozillaUserAgent);
+
+            break;
+        }
+    }
 }
 

trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h

@@ -62 +62 @@
         RequiresGTKToolKit,
 #endif
+   
+        WantsMozillaUserAgent,
+
         NumPluginQuirks
     };

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp

@@ -133 +133 @@
 }
 
+static const char* MozillaUserAgent = "Mozilla/5.0 ("
+#if PLUGIN_ARCHITECTURE(MAC)
+        "Macintosh; U; Intel Mac OS X;"
+#elif PLUGIN_ARCHITECTURE(WIN)
+        "Windows; U; Windows NT 5.1;"
+#elif PLUGIN_ARCHITECTURE(X11)
+// The Gtk port uses X11 plugins in Mac.
+#if OS(DARWIN) && PLATFORM(GTK)
+    "X11; U; Intel Mac OS X;"
+#else
+    "X11; U; Linux i686;"
+#endif
+#endif
+        " en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0";
+
 const char* NetscapePlugin::userAgent()
 {
+    if (quirks().contains(PluginQuirks::WantsMozillaUserAgent))
+        return MozillaUserAgent;
+
     if (m_userAgent.isNull()) {
         m_userAgent = m_pluginController->userAgent().utf8();

trunk/Source/WebKit2/win/WebKit2.vcproj

@@ -1402 +1402 @@
                                 Name="Plugins"
                                 >
+                                <File
+                                        RelativePath="..\Shared\Plugins\PluginQuirks.h"
+                                        >
+                                </File>
                                 <Filter
                                         Name="Netscape"