OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. | 2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 18 matching lines...) Expand all Loading... |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/platform/graphics/SimpleFontData.h" | 32 #include "core/platform/graphics/SimpleFontData.h" |
33 | 33 |
34 #include <unicode/normlzr.h> | 34 #include <unicode/normlzr.h> |
35 #include "SkPaint.h" | 35 #include "SkPaint.h" |
36 #include "SkPath.h" | 36 #include "SkPath.h" |
37 #include "SkTypeface.h" | 37 #include "SkTypeface.h" |
38 #include "SkTypes.h" | 38 #include "SkTypes.h" |
39 #include "core/platform/graphics/FontDescription.h" | |
40 #include "core/platform/graphics/chromium/VDMXParser.h" | 39 #include "core/platform/graphics/chromium/VDMXParser.h" |
| 40 #include "platform/fonts/FontDescription.h" |
41 #include "platform/geometry/FloatRect.h" | 41 #include "platform/geometry/FloatRect.h" |
42 #include "wtf/unicode/Unicode.h" | 42 #include "wtf/unicode/Unicode.h" |
43 | 43 |
44 #if OS(WIN) | 44 #if OS(WIN) |
45 #include "platform/win/HWndDC.h" | 45 #include "platform/win/HWndDC.h" |
46 #endif | 46 #endif |
47 | 47 |
48 namespace WebCore { | 48 namespace WebCore { |
49 | 49 |
50 // This is the largest VDMX table which we'll try to load and parse. | 50 // This is the largest VDMX table which we'll try to load and parse. |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
283 paint.setTextEncoding(SkPaint::kUTF16_TextEncoding); | 283 paint.setTextEncoding(SkPaint::kUTF16_TextEncoding); |
284 if (paint.textToGlyphs(&normalizedCharacters[0], normalizedLength * 2, 0)) { | 284 if (paint.textToGlyphs(&normalizedCharacters[0], normalizedLength * 2, 0)) { |
285 addResult.iterator->value = true; | 285 addResult.iterator->value = true; |
286 return true; | 286 return true; |
287 } | 287 } |
288 return false; | 288 return false; |
289 } | 289 } |
290 #endif | 290 #endif |
291 | 291 |
292 } // namespace WebCore | 292 } // namespace WebCore |
OLD | NEW |