| 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 30 matching lines...) Expand all Loading... |
| 41 , m_orientation(Horizontal) | 41 , m_orientation(Horizontal) |
| 42 , m_size(0) | 42 , m_size(0) |
| 43 , m_widthVariant(RegularWidth) | 43 , m_widthVariant(RegularWidth) |
| 44 #if PLATFORM(WIN) | 44 #if PLATFORM(WIN) |
| 45 , m_font(WTF::HashTableDeletedValue) | 45 , m_font(WTF::HashTableDeletedValue) |
| 46 #elif OS(DARWIN) | 46 #elif OS(DARWIN) |
| 47 , m_font(hashTableDeletedFontValue()) | 47 , m_font(hashTableDeletedFontValue()) |
| 48 #endif | 48 #endif |
| 49 #if USE(CG) && PLATFORM(WIN) | 49 #if USE(CG) && PLATFORM(WIN) |
| 50 , m_cgFont(0) | 50 , m_cgFont(0) |
| 51 #elif USE(CAIRO) | |
| 52 , m_scaledFont(hashTableDeletedFontValue()) | |
| 53 #endif | 51 #endif |
| 54 , m_isColorBitmapFont(false) | 52 , m_isColorBitmapFont(false) |
| 55 , m_isCompositeFontReference(false) | 53 , m_isCompositeFontReference(false) |
| 56 #if OS(DARWIN) | 54 #if OS(DARWIN) |
| 57 , m_isPrinterFont(false) | 55 , m_isPrinterFont(false) |
| 58 #endif | 56 #endif |
| 59 #if PLATFORM(WIN) | 57 #if PLATFORM(WIN) |
| 60 , m_useGDI(false) | 58 , m_useGDI(false) |
| 61 #endif | 59 #endif |
| 62 { | 60 { |
| 63 } | 61 } |
| 64 | 62 |
| 65 FontPlatformData::FontPlatformData() | 63 FontPlatformData::FontPlatformData() |
| 66 : m_syntheticBold(false) | 64 : m_syntheticBold(false) |
| 67 , m_syntheticOblique(false) | 65 , m_syntheticOblique(false) |
| 68 , m_orientation(Horizontal) | 66 , m_orientation(Horizontal) |
| 69 , m_size(0) | 67 , m_size(0) |
| 70 , m_widthVariant(RegularWidth) | 68 , m_widthVariant(RegularWidth) |
| 71 #if OS(DARWIN) | 69 #if OS(DARWIN) |
| 72 , m_font(0) | 70 , m_font(0) |
| 73 #endif | 71 #endif |
| 74 #if USE(CG) && PLATFORM(WIN) | 72 #if USE(CG) && PLATFORM(WIN) |
| 75 , m_cgFont(0) | 73 , m_cgFont(0) |
| 76 #elif USE(CAIRO) | |
| 77 , m_scaledFont(0) | |
| 78 #endif | 74 #endif |
| 79 , m_isColorBitmapFont(false) | 75 , m_isColorBitmapFont(false) |
| 80 , m_isCompositeFontReference(false) | 76 , m_isCompositeFontReference(false) |
| 81 #if OS(DARWIN) | 77 #if OS(DARWIN) |
| 82 , m_isPrinterFont(false) | 78 , m_isPrinterFont(false) |
| 83 #endif | 79 #endif |
| 84 #if PLATFORM(WIN) | 80 #if PLATFORM(WIN) |
| 85 , m_useGDI(false) | 81 , m_useGDI(false) |
| 86 #endif | 82 #endif |
| 87 { | 83 { |
| 88 } | 84 } |
| 89 | 85 |
| 90 FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheti
cOblique, FontOrientation orientation, FontWidthVariant widthVariant) | 86 FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheti
cOblique, FontOrientation orientation, FontWidthVariant widthVariant) |
| 91 : m_syntheticBold(syntheticBold) | 87 : m_syntheticBold(syntheticBold) |
| 92 , m_syntheticOblique(syntheticOblique) | 88 , m_syntheticOblique(syntheticOblique) |
| 93 , m_orientation(orientation) | 89 , m_orientation(orientation) |
| 94 , m_size(size) | 90 , m_size(size) |
| 95 , m_widthVariant(widthVariant) | 91 , m_widthVariant(widthVariant) |
| 96 #if OS(DARWIN) | 92 #if OS(DARWIN) |
| 97 , m_font(0) | 93 , m_font(0) |
| 98 #endif | 94 #endif |
| 99 #if USE(CG) && PLATFORM(WIN) | 95 #if USE(CG) && PLATFORM(WIN) |
| 100 , m_cgFont(0) | 96 , m_cgFont(0) |
| 101 #elif USE(CAIRO) | |
| 102 , m_scaledFont(0) | |
| 103 #endif | 97 #endif |
| 104 , m_isColorBitmapFont(false) | 98 , m_isColorBitmapFont(false) |
| 105 , m_isCompositeFontReference(false) | 99 , m_isCompositeFontReference(false) |
| 106 #if OS(DARWIN) | 100 #if OS(DARWIN) |
| 107 , m_isPrinterFont(false) | 101 , m_isPrinterFont(false) |
| 108 #endif | 102 #endif |
| 109 #if PLATFORM(WIN) | 103 #if PLATFORM(WIN) |
| 110 , m_useGDI(false) | 104 , m_useGDI(false) |
| 111 #endif | 105 #endif |
| 112 { | 106 { |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 m_isColorBitmapFont = other.m_isColorBitmapFont; | 151 m_isColorBitmapFont = other.m_isColorBitmapFont; |
| 158 m_isCompositeFontReference = other.m_isCompositeFontReference; | 152 m_isCompositeFontReference = other.m_isCompositeFontReference; |
| 159 #if OS(DARWIN) | 153 #if OS(DARWIN) |
| 160 m_isPrinterFont = other.m_isPrinterFont; | 154 m_isPrinterFont = other.m_isPrinterFont; |
| 161 #endif | 155 #endif |
| 162 | 156 |
| 163 return platformDataAssign(other); | 157 return platformDataAssign(other); |
| 164 } | 158 } |
| 165 | 159 |
| 166 } | 160 } |
| OLD | NEW |