Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(181)

Side by Side Diff: content/common/font_list_pango.cc

Issue 2058233002: Rewrite simple uses of base::ListValue::Append() taking a raw pointer var. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: less comments more ownership Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/font_list.h" 5 #include "content/common/font_list.h"
6 6
7 #include <pango/pango.h> 7 #include <pango/pango.h>
8 #include <pango/pangocairo.h> 8 #include <pango/pangocairo.h>
9 9
10 #include <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 #include <utility>
12 13
13 #include "base/values.h" 14 #include "base/values.h"
14 15
15 namespace content { 16 namespace content {
16 17
17 std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() { 18 std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() {
18 std::unique_ptr<base::ListValue> font_list(new base::ListValue); 19 std::unique_ptr<base::ListValue> font_list(new base::ListValue);
19 20
20 PangoFontMap* font_map = ::pango_cairo_font_map_get_default(); 21 PangoFontMap* font_map = ::pango_cairo_font_map_get_default();
21 PangoFontFamily** families = NULL; 22 PangoFontFamily** families = NULL;
22 int num_families = 0; 23 int num_families = 0;
23 ::pango_font_map_list_families(font_map, &families, &num_families); 24 ::pango_font_map_list_families(font_map, &families, &num_families);
24 25
25 std::set<std::string> sorted_families; 26 std::set<std::string> sorted_families;
26 for (int i = 0; i < num_families; i++) { 27 for (int i = 0; i < num_families; i++) {
27 sorted_families.insert(::pango_font_family_get_name(families[i])); 28 sorted_families.insert(::pango_font_family_get_name(families[i]));
28 } 29 }
29 g_free(families); 30 g_free(families);
30 31
31 for (std::set<std::string>::const_iterator iter = sorted_families.begin(); 32 for (std::set<std::string>::const_iterator iter = sorted_families.begin();
32 iter != sorted_families.end(); ++iter) { 33 iter != sorted_families.end(); ++iter) {
33 base::ListValue* font_item = new base::ListValue(); 34 std::unique_ptr<base::ListValue> font_item(new base::ListValue());
34 font_item->AppendString(*iter); 35 font_item->AppendString(*iter);
35 font_item->AppendString(*iter); // localized name. 36 font_item->AppendString(*iter); // localized name.
36 // TODO(yusukes): Support localized family names. 37 // TODO(yusukes): Support localized family names.
37 font_list->Append(font_item); 38 font_list->Append(std::move(font_item));
38 } 39 }
39 40
40 return font_list; 41 return font_list;
41 } 42 }
42 43
43 } // namespace content 44 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_worker/service_worker_internals_ui.cc ('k') | dbus/values_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698