| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Brent Fulgham | 2 * Copyright (C) 2011 Brent Fulgham |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "platform/fonts/FontPlatformData.h" | 22 #include "platform/fonts/FontPlatformData.h" |
| 23 | 23 |
| 24 #include "wtf/HashMap.h" | 24 #include "wtf/HashMap.h" |
| 25 #include "wtf/text/StringHash.h" | 25 #include "wtf/text/StringHash.h" |
| 26 #include "wtf/text/WTFString.h" | 26 #include "wtf/text/WTFString.h" |
| 27 | 27 |
| 28 #if OS(MACOSX) | 28 #if OS(MACOSX) |
| 29 #include "platform/fonts/harfbuzz/HarfBuzzFace.h" | 29 #include "platform/fonts/harfbuzz/HarfBuzzFace.h" |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 using namespace std; | |
| 33 | |
| 34 namespace blink { | 32 namespace blink { |
| 35 | 33 |
| 36 FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType) | 34 FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType) |
| 37 : m_syntheticBold(false) | 35 : m_syntheticBold(false) |
| 38 , m_syntheticOblique(false) | 36 , m_syntheticOblique(false) |
| 39 , m_orientation(Horizontal) | 37 , m_orientation(Horizontal) |
| 40 , m_size(0) | 38 , m_size(0) |
| 41 , m_widthVariant(RegularWidth) | 39 , m_widthVariant(RegularWidth) |
| 42 #if OS(MACOSX) | 40 #if OS(MACOSX) |
| 43 , m_font(hashTableDeletedFontValue()) | 41 , m_font(hashTableDeletedFontValue()) |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 m_orientation = other.m_orientation; | 111 m_orientation = other.m_orientation; |
| 114 m_size = other.m_size; | 112 m_size = other.m_size; |
| 115 m_widthVariant = other.m_widthVariant; | 113 m_widthVariant = other.m_widthVariant; |
| 116 m_isColorBitmapFont = other.m_isColorBitmapFont; | 114 m_isColorBitmapFont = other.m_isColorBitmapFont; |
| 117 m_isCompositeFontReference = other.m_isCompositeFontReference; | 115 m_isCompositeFontReference = other.m_isCompositeFontReference; |
| 118 | 116 |
| 119 return platformDataAssign(other); | 117 return platformDataAssign(other); |
| 120 } | 118 } |
| 121 | 119 |
| 122 } // namespace blink | 120 } // namespace blink |
| OLD | NEW |