Made result_filefaceid output optional in FontConfigIPC::Match. There are...

Made result_filefaceid output optional in FontConfigIPC::Match. There are cases when we are only interested in result_family.
BUG=142421

Review URL: https://chromiumcodereview.appspot.com/10836242

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152247 0039d316-1c4b-4281-b951-d872f2087c98

content/common/font_config_ipc_linux.cc

@@ -70,7 +70,8 @@ bool FontConfigIPC::Match(std::string* result_family,
     return false;
   }
 
-  *result_filefaceid = reply_filefaceid;
+  if (result_filefaceid)
+    *result_filefaceid = reply_filefaceid;
   if (result_family)
     *result_family = reply_family;
 

skia/ext/SkFontHost_fontconfig_impl.h

@@ -32,8 +32,10 @@ class FontConfigInterface {
 
     /** Performs config match
      *
-     *  @param result_family (output) on success, the resulting family name.
-     *  @param result_filefaceid (output) on success, the resulting fileface id.
+     *  @param result_family (optional, set to NULL to ignore, output)
+     *      on success, set to the resulting family name.
+     *  @param result_filefaceid (optional, set to NULL to ignore, output)
+     *      on success, set to the resulting fileface id.
      *  @param filefaceid_valid if true, then |filefaceid| is valid
      *  @param filefaceid the filefaceid (as returned by this function)
      *         which we are trying to match.