Changeset 91188 in webkit

Timestamp:

Jul 18, 2011 9:43:27 AM (13 years ago)

Author:

andersca@apple.com

Message:

Make using lowercase parameter names for AppleConnect be a plug-in quirk
​https://bugs.webkit.org/show_bug.cgi?id=64638

Reviewed by Sam Weinig.

• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:

(WebKit::NetscapePluginModule::determineQuirks):
Set the WantsLowercaseParameterNames quirk for the AppleConnect plug-in.

• Shared/Plugins/PluginQuirks.h:

Add WantsLowercaseParameterNames quirk.

• WebProcess/Plugins/Netscape/NetscapePlugin.cpp:

(WebKit::NetscapePlugin::initialize):
If the plug-in has the WantsLowercaseParameterNames quirk, convert the parameter
names to lowercase.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::createPlugin):
Remove the code that would convert the parameters here. Also remove the FIXME; plug-in quirks
aren't really the same thing as site-specific quirks.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (modified) (1 diff)
• Shared/Plugins/PluginQuirks.h (modified) (1 diff)
• WebProcess/Plugins/Netscape/NetscapePlugin.cpp (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-18  Anders Carlsson  <andersca@apple.com>
+
+        Make using lowercase parameter names for AppleConnect be a plug-in quirk
+        https://bugs.webkit.org/show_bug.cgi?id=64638
+
+        Reviewed by Sam Weinig.
+
+        * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+        (WebKit::NetscapePluginModule::determineQuirks):
+        Set the WantsLowercaseParameterNames quirk for the AppleConnect plug-in.
+
+        * Shared/Plugins/PluginQuirks.h:
+        Add WantsLowercaseParameterNames quirk.
+
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::initialize):
+        If the plug-in has the WantsLowercaseParameterNames quirk, convert the parameter
+        names to lowercase.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createPlugin):
+        Remove the code that would convert the parameters here. Also remove the FIXME; plug-in quirks
+        aren't really the same thing as site-specific quirks.
+
 2011-07-15  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm

@@ -482 +482 @@
     }
 
+    if (plugin.bundleIdentifier == "com.apple.ist.ds.appleconnect.webplugin") {
+        // <rdar://problem/8440903>: AppleConnect has a bug where it does not
+        // understand the parameter names specified in the <object> element that
+        // embeds its plug-in. 
+        m_pluginQuirks.add(PluginQuirks::WantsLowercaseParameterNames);
+
 #ifndef NP_NO_QUICKDRAW
-    if (plugin.bundleIdentifier == "com.apple.ist.ds.appleconnect.webplugin") {
         // The AppleConnect plug-in uses QuickDraw but doesn't paint or receive events
         // so we'll allow it to be instantiated even though we don't support QuickDraw.
         m_pluginQuirks.add(PluginQuirks::AllowHalfBakedQuickDrawSupport);
-    }
-
+#endif
+    }
+
+#ifndef NP_NO_QUICKDRAW
     if (plugin.bundleIdentifier == "com.microsoft.sharepoint.browserplugin") {
         // The Microsoft SharePoint plug-in uses QuickDraw but doesn't paint or receive events

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

@@ -64 +64 @@
         ReturnsNonRetainedScriptableNPObject,
 
+        // Whether the plug-in wants parameter names to be lowercase.
+        // <rdar://problem/8440903>: AppleConnect has a bug where it does not
+        // understand the parameter names specified in the <object> element that
+        // embeds its plug-in. 
+        WantsLowercaseParameterNames,
+
 #ifndef NP_NO_QUICKDRAW
         // Allow the plug-in to use the QuickDraw drawing model, since we know that the plug-in

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

@@ -461 +461 @@
     Vector<CString> paramValues;
     for (size_t i = 0; i < parameters.names.size(); ++i) {
-        paramNames.append(parameters.names[i].utf8());
+        String parameterName = parameters.names[i];
+
+#if PLUGIN_ARCHITECTURE(MAC)
+        if (m_pluginModule->pluginQuirks().contains(PluginQuirks::WantsLowercaseParameterNames))
+            parameterName = parameterName.lower();
+#endif
+
+        paramNames.append(parameterName.utf8());
         paramValues.append(parameters.values[i].utf8());
     }
@@ -473 +480 @@
     }
 
-#if PLATFORM(MAC)
+#if PLUGIN_ARCHITECTURE(MAC)
     if (m_pluginModule->pluginQuirks().contains(PluginQuirks::MakeTransparentIfBackgroundAttributeExists)) {
         for (size_t i = 0; i < parameters.names.size(); ++i) {

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1260 +1260 @@
     }
 
-    // <rdar://problem/8440903>: AppleConnect has a bug where it does not
-    // understand the parameter names specified in the <object> element that
-    // embeds its plug-in. This hack works around the issue by converting the
-    // parameter names to lowercase before passing them to the plug-in.
-    // FIXME: This workaround should be dependent on site-specific quirks being
-    // enabled. This requires adding this setting to WebKit2's WebPreferences
-    // implementation. See <https://bugs.webkit.org/show_bug.cgi?id=46076>.
-    if (equalIgnoringCase(mimeType, "application/x-snkp")) {
-        for (size_t i = 0; i < paramNames.size(); ++i)
-            parameters.names[i] = paramNames[i].lower();
-    }
-
 #if PLUGIN_ARCHITECTURE(X11)
+    // FIXME: This should really be X11-specific plug-in quirks.
     if (equalIgnoringCase(mimeType, "application/x-shockwave-flash")) {
         // Currently we don't support transparency and windowed mode.