| OLD | NEW |
| 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 <windows.h> | 7 #include <windows.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 if (font_names) { | 22 if (font_names) { |
| 23 const LOGFONTW& lf = logical_font->elfLogFont; | 23 const LOGFONTW& lf = logical_font->elfLogFont; |
| 24 if (lf.lfFaceName[0] && lf.lfFaceName[0] != '@') { | 24 if (lf.lfFaceName[0] && lf.lfFaceName[0] != '@') { |
| 25 string16 face_name(lf.lfFaceName); | 25 string16 face_name(lf.lfFaceName); |
| 26 font_names->insert(face_name); | 26 font_names->insert(face_name); |
| 27 } | 27 } |
| 28 } | 28 } |
| 29 return 1; | 29 return 1; |
| 30 } | 30 } |
| 31 | 31 |
| 32 scoped_ptr<ListValue> GetFontList_SlowBlocking() { | 32 scoped_ptr<base::ListValue> GetFontList_SlowBlocking() { |
| 33 std::set<string16> font_names; | 33 std::set<string16> font_names; |
| 34 | 34 |
| 35 LOGFONTW logfont; | 35 LOGFONTW logfont; |
| 36 memset(&logfont, 0, sizeof(logfont)); | 36 memset(&logfont, 0, sizeof(logfont)); |
| 37 logfont.lfCharSet = DEFAULT_CHARSET; | 37 logfont.lfCharSet = DEFAULT_CHARSET; |
| 38 | 38 |
| 39 HDC hdc = ::GetDC(NULL); | 39 HDC hdc = ::GetDC(NULL); |
| 40 ::EnumFontFamiliesExW(hdc, &logfont, (FONTENUMPROCW)&EnumFontFamExProc, | 40 ::EnumFontFamiliesExW(hdc, &logfont, (FONTENUMPROCW)&EnumFontFamExProc, |
| 41 (LPARAM)&font_names, 0); | 41 (LPARAM)&font_names, 0); |
| 42 ::ReleaseDC(NULL, hdc); | 42 ::ReleaseDC(NULL, hdc); |
| 43 | 43 |
| 44 scoped_ptr<ListValue> font_list(new ListValue); | 44 scoped_ptr<base::ListValue> font_list(new base::ListValue); |
| 45 std::set<string16>::iterator iter; | 45 std::set<string16>::iterator iter; |
| 46 for (iter = font_names.begin(); iter != font_names.end(); iter++) { | 46 for (iter = font_names.begin(); iter != font_names.end(); ++iter) { |
| 47 ListValue* font_item = new ListValue(); | 47 base::ListValue* font_item = new base::ListValue(); |
| 48 font_item->Append(Value::CreateStringValue(*iter)); | 48 font_item->Append(new base::StringValue(*iter)); |
| 49 font_item->Append(Value::CreateStringValue(*iter)); | 49 font_item->Append(new base::StringValue(*iter)); |
| 50 font_list->Append(font_item); | 50 font_list->Append(font_item); |
| 51 } | 51 } |
| 52 return font_list.Pass(); | 52 return font_list.Pass(); |
| 53 } | 53 } |
| 54 | 54 |
| 55 } // namespace content | 55 } // namespace content |
| OLD | NEW |