OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2006, 2007 Apple Inc. All Rights Reserved. |
3 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. | 3 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 12 matching lines...) Expand all Loading... |
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
30 */ | 30 */ |
31 | 31 |
32 #include "config.h" | 32 #include "config.h" |
33 #include "core/platform/graphics/SimpleFontData.h" | 33 #include "platform/fonts/SimpleFontData.h" |
34 | 34 |
35 #include <mlang.h> | 35 #include <mlang.h> |
36 #include <objidl.h> | 36 #include <objidl.h> |
37 #include <unicode/uchar.h> | 37 #include <unicode/uchar.h> |
38 #include <unicode/unorm.h> | 38 #include <unicode/unorm.h> |
39 #include "core/platform/graphics/Font.h" | 39 #include "platform/fonts/Font.h" |
40 #include "core/platform/graphics/FontCache.h" | 40 #include "platform/fonts/FontCache.h" |
41 #include "core/platform/graphics/win/FontPlatformDataWin.h" | |
42 #include "platform/fonts/FontDescription.h" | 41 #include "platform/fonts/FontDescription.h" |
| 42 #include "platform/fonts/win/FontPlatformDataWin.h" |
43 #include "platform/geometry/FloatRect.h" | 43 #include "platform/geometry/FloatRect.h" |
44 #include "platform/win/HWndDC.h" | 44 #include "platform/win/HWndDC.h" |
45 #include "wtf/MathExtras.h" | 45 #include "wtf/MathExtras.h" |
46 | 46 |
47 namespace WebCore { | 47 namespace WebCore { |
48 | 48 |
49 void SimpleFontData::platformInit() | 49 void SimpleFontData::platformInit() |
50 { | 50 { |
51 if (!m_platformData.size()) { | 51 if (!m_platformData.size()) { |
52 m_fontMetrics.reset(); | 52 m_fontMetrics.reset(); |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
172 WTF_LOG_ERROR("Unable to get the char width after second attempt
"); | 172 WTF_LOG_ERROR("Unable to get the char width after second attempt
"); |
173 } | 173 } |
174 } | 174 } |
175 | 175 |
176 SelectObject(dc, oldFont); | 176 SelectObject(dc, oldFont); |
177 | 177 |
178 return static_cast<float>(width); | 178 return static_cast<float>(width); |
179 } | 179 } |
180 | 180 |
181 } // namespace WebCore | 181 } // namespace WebCore |
OLD | NEW |