diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-18 06:19:38 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-18 06:19:38 +0000 |
| commit | fb895939d78c058ed51dfdd383fa9e9656cb85d2 (patch) | |
| tree | cd877661577155024c7d5ed9cf1ee4fc7626923e /content | |
| parent | 1ce815020e91163de153f48f71bb2337584770f3 (diff) | |
| download | chromium_src-fb895939d78c058ed51dfdd383fa9e9656cb85d2.zip chromium_src-fb895939d78c058ed51dfdd383fa9e9656cb85d2.tar.gz chromium_src-fb895939d78c058ed51dfdd383fa9e9656cb85d2.tar.bz2 | |
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
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/font_config_ipc_linux.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/common/font_config_ipc_linux.cc b/content/common/font_config_ipc_linux.cc index ca37889..e6c0291 100644 --- a/content/common/font_config_ipc_linux.cc +++ b/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; |