[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 3517c5a5400967af5da9e02e16b20ac820a00d54
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 22:04:02 2010 +0000

    2010-12-14  Anders Carlsson  <andersca at 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):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0d77f57..dfa15fe 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,17 @@
 2010-12-14  Anders Carlsson  <andersca at 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 at apple.com>
+
         Reviewed by Adam Roben.
 
         Move NetscapePluginModule.{cpp|h} to Shared/Plugins/Netscape
diff --git a/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm b/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
index 360d629..7a2f357 100644
--- a/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
+++ b/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
@@ -225,7 +225,7 @@ static bool getStringListResource(ResID resourceID, Vector<String>& stringList)
     Size stringListSize = GetHandleSize(stringListHandle);
     if (stringListSize < static_cast<Size>(sizeof(UInt16)))
         return false;
-  
+
     CFStringEncoding stringEncoding = stringEncodingForResource(stringListHandle);
 
     unsigned char* ptr = reinterpret_cast<unsigned char*>(*stringListHandle);
@@ -234,7 +234,7 @@ static bool getStringListResource(ResID resourceID, Vector<String>& stringList)
     // Get the number of strings in the string list.
     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.
         if (ptr >= end)
@@ -267,9 +267,9 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu
     if (!resourceMap.isValid())
         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;
 
     // Get the MIME types and extensions string list. This list needs to be a multiple of two.
@@ -309,11 +309,11 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu
         pluginInfo.mimes.append(mimeClassInfo);
     }
 
-    // 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;
 }

-- 
WebKit Debian packaging