Changeset 74060 in webkit

Timestamp:

Dec 14, 2010 2:04:02 PM (13 years ago)

Author:

andersca@apple.com

Message:

2010-12-14 Anders Carlsson <​andersca@apple.com>

Reviewed by John Sullivan.

Switch name and description order when fetching Carbon plug-in info
​https://bugs.webkit.org/show_bug.cgi?id=46211

The plug-in description comes before the name in the Carbon string list resource.

• UIProcess/Plugins/mac/PluginInfoStoreMac.mm: (WebKit::getPluginInfoFromCarbonResources):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Plugins/mac/PluginInfoStoreMac.mm (modified) (4 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-12-14  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by John Sullivan.
+
+        Switch name and description order when fetching Carbon plug-in info
+        https://bugs.webkit.org/show_bug.cgi?id=46211
+
+        The plug-in description comes before the name in the Carbon string list resource.
+
+        * UIProcess/Plugins/mac/PluginInfoStoreMac.mm:
+        (WebKit::getPluginInfoFromCarbonResources):
+
 2010-12-14  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm

@@ -226 +226 @@
     if (stringListSize < static_cast<Size>(sizeof(UInt16)))
         return false;
-  
+
     CFStringEncoding stringEncoding = stringEncodingForResource(stringListHandle);
 
@@ -235 +235 @@
     UInt16 numStrings = *reinterpret_cast<UInt16*>(ptr);
     ptr += sizeof(UInt16);
-                  
+
     for (UInt16 i = 0; i < numStrings; ++i) {
         // We're past the end of the string, bail.
@@ -268 +268 @@
         return false;
 
-    // Get the name and description string list.
-    Vector<String> nameAndDescription;
-    if (!getStringListResource(PluginNameOrDescriptionStringNumber, nameAndDescription))
+    // Get the description and name string list.
+    Vector<String> descriptionAndName;
+    if (!getStringListResource(PluginNameOrDescriptionStringNumber, descriptionAndName))
         return false;
 
@@ -310 +310 @@
     }
 
-    // Set the name and description if they exist.
-    if (nameAndDescription.size() > 0)
-        pluginInfo.name = nameAndDescription[0];
-    if (nameAndDescription.size() > 1)
-        pluginInfo.desc = nameAndDescription[1];
+    // Set the description and name if they exist.
+    if (descriptionAndName.size() > 0)
+        pluginInfo.desc = descriptionAndName[0];
+    if (descriptionAndName.size() > 1)
+        pluginInfo.name = descriptionAndName[1];
 
     return true;