| 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 18 matching lines...) Expand all Loading... |
| 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 "core/platform/graphics/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 "FontPlatformDataChromiumWin.h" | |
| 40 #include "HWndDC.h" | 39 #include "HWndDC.h" |
| 41 #include "core/platform/graphics/FloatRect.h" | 40 #include "core/platform/graphics/FloatRect.h" |
| 42 #include "core/platform/graphics/Font.h" | 41 #include "core/platform/graphics/Font.h" |
| 43 #include "core/platform/graphics/FontCache.h" | 42 #include "core/platform/graphics/FontCache.h" |
| 44 #include "core/platform/graphics/FontDescription.h" | 43 #include "core/platform/graphics/FontDescription.h" |
| 44 #include "core/platform/graphics/chromium/FontPlatformDataChromiumWin.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(); |
| 53 m_avgCharWidth = 0; | 53 m_avgCharWidth = 0; |
| 54 m_maxCharWidth = 0; | 54 m_maxCharWidth = 0; |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 LOG_ERROR("Unable to get the char width after second attempt"); | 191 LOG_ERROR("Unable to get the char width after second attempt"); |
| 192 } | 192 } |
| 193 } | 193 } |
| 194 | 194 |
| 195 SelectObject(dc, oldFont); | 195 SelectObject(dc, oldFont); |
| 196 | 196 |
| 197 return static_cast<float>(width); | 197 return static_cast<float>(width); |
| 198 } | 198 } |
| 199 | 199 |
| 200 } // namespace WebCore | 200 } // namespace WebCore |
| OLD | NEW |