| 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 27 matching lines...) Expand all Loading... |
| 38 : m_syntheticBold(false) | 38 : m_syntheticBold(false) |
| 39 , m_syntheticOblique(false) | 39 , m_syntheticOblique(false) |
| 40 , m_orientation(Horizontal) | 40 , m_orientation(Horizontal) |
| 41 , m_size(0) | 41 , m_size(0) |
| 42 , m_widthVariant(RegularWidth) | 42 , m_widthVariant(RegularWidth) |
| 43 #if OS(MACOSX) | 43 #if OS(MACOSX) |
| 44 , m_font(hashTableDeletedFontValue()) | 44 , m_font(hashTableDeletedFontValue()) |
| 45 #endif | 45 #endif |
| 46 , m_isColorBitmapFont(false) | 46 , m_isColorBitmapFont(false) |
| 47 , m_isCompositeFontReference(false) | 47 , m_isCompositeFontReference(false) |
| 48 #if OS(MACOSX) | |
| 49 , m_isPrinterFont(false) | |
| 50 #endif | |
| 51 { | 48 { |
| 52 } | 49 } |
| 53 | 50 |
| 54 FontPlatformData::FontPlatformData() | 51 FontPlatformData::FontPlatformData() |
| 55 : m_syntheticBold(false) | 52 : m_syntheticBold(false) |
| 56 , m_syntheticOblique(false) | 53 , m_syntheticOblique(false) |
| 57 , m_orientation(Horizontal) | 54 , m_orientation(Horizontal) |
| 58 , m_size(0) | 55 , m_size(0) |
| 59 , m_widthVariant(RegularWidth) | 56 , m_widthVariant(RegularWidth) |
| 60 #if OS(MACOSX) | 57 #if OS(MACOSX) |
| 61 , m_font(0) | 58 , m_font(0) |
| 62 #endif | 59 #endif |
| 63 , m_isColorBitmapFont(false) | 60 , m_isColorBitmapFont(false) |
| 64 , m_isCompositeFontReference(false) | 61 , m_isCompositeFontReference(false) |
| 65 #if OS(MACOSX) | |
| 66 , m_isPrinterFont(false) | |
| 67 #endif | |
| 68 { | 62 { |
| 69 } | 63 } |
| 70 | 64 |
| 71 FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheti
cOblique, FontOrientation orientation, FontWidthVariant widthVariant) | 65 FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheti
cOblique, FontOrientation orientation, FontWidthVariant widthVariant) |
| 72 : m_syntheticBold(syntheticBold) | 66 : m_syntheticBold(syntheticBold) |
| 73 , m_syntheticOblique(syntheticOblique) | 67 , m_syntheticOblique(syntheticOblique) |
| 74 , m_orientation(orientation) | 68 , m_orientation(orientation) |
| 75 , m_size(size) | 69 , m_size(size) |
| 76 , m_widthVariant(widthVariant) | 70 , m_widthVariant(widthVariant) |
| 77 #if OS(MACOSX) | 71 #if OS(MACOSX) |
| 78 , m_font(0) | 72 , m_font(0) |
| 79 #endif | 73 #endif |
| 80 , m_isColorBitmapFont(false) | 74 , m_isColorBitmapFont(false) |
| 81 , m_isCompositeFontReference(false) | 75 , m_isCompositeFontReference(false) |
| 82 #if OS(MACOSX) | |
| 83 , m_isPrinterFont(false) | |
| 84 #endif | |
| 85 { | 76 { |
| 86 } | 77 } |
| 87 | 78 |
| 88 #if OS(MACOSX) | 79 #if OS(MACOSX) |
| 89 FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticB
old, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthV
ariant) | 80 FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticB
old, bool syntheticOblique, FontOrientation orientation, FontWidthVariant widthV
ariant) |
| 90 : m_syntheticBold(syntheticBold) | 81 : m_syntheticBold(syntheticBold) |
| 91 , m_syntheticOblique(syntheticOblique) | 82 , m_syntheticOblique(syntheticOblique) |
| 92 , m_orientation(orientation) | 83 , m_orientation(orientation) |
| 93 , m_size(size) | 84 , m_size(size) |
| 94 , m_widthVariant(widthVariant) | 85 , m_widthVariant(widthVariant) |
| 95 , m_font(0) | 86 , m_font(0) |
| 96 , m_cgFont(cgFont) | 87 , m_cgFont(cgFont) |
| 97 , m_isColorBitmapFont(false) | 88 , m_isColorBitmapFont(false) |
| 98 , m_isCompositeFontReference(false) | 89 , m_isCompositeFontReference(false) |
| 99 , m_isPrinterFont(false) | |
| 100 { | 90 { |
| 101 } | 91 } |
| 102 #endif | 92 #endif |
| 103 | 93 |
| 104 FontPlatformData::FontPlatformData(const FontPlatformData& source) | 94 FontPlatformData::FontPlatformData(const FontPlatformData& source) |
| 105 : m_syntheticBold(source.m_syntheticBold) | 95 : m_syntheticBold(source.m_syntheticBold) |
| 106 , m_syntheticOblique(source.m_syntheticOblique) | 96 , m_syntheticOblique(source.m_syntheticOblique) |
| 107 , m_orientation(source.m_orientation) | 97 , m_orientation(source.m_orientation) |
| 108 , m_size(source.m_size) | 98 , m_size(source.m_size) |
| 109 , m_widthVariant(source.m_widthVariant) | 99 , m_widthVariant(source.m_widthVariant) |
| 110 , m_isColorBitmapFont(source.m_isColorBitmapFont) | 100 , m_isColorBitmapFont(source.m_isColorBitmapFont) |
| 111 , m_isCompositeFontReference(source.m_isCompositeFontReference) | 101 , m_isCompositeFontReference(source.m_isCompositeFontReference) |
| 112 #if OS(MACOSX) | |
| 113 , m_isPrinterFont(source.m_isPrinterFont) | |
| 114 #endif | |
| 115 { | 102 { |
| 116 platformDataInit(source); | 103 platformDataInit(source); |
| 117 } | 104 } |
| 118 | 105 |
| 119 const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& othe
r) | 106 const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& othe
r) |
| 120 { | 107 { |
| 121 // Check for self-assignment. | 108 // Check for self-assignment. |
| 122 if (this == &other) | 109 if (this == &other) |
| 123 return *this; | 110 return *this; |
| 124 | 111 |
| 125 m_syntheticBold = other.m_syntheticBold; | 112 m_syntheticBold = other.m_syntheticBold; |
| 126 m_syntheticOblique = other.m_syntheticOblique; | 113 m_syntheticOblique = other.m_syntheticOblique; |
| 127 m_orientation = other.m_orientation; | 114 m_orientation = other.m_orientation; |
| 128 m_size = other.m_size; | 115 m_size = other.m_size; |
| 129 m_widthVariant = other.m_widthVariant; | 116 m_widthVariant = other.m_widthVariant; |
| 130 m_isColorBitmapFont = other.m_isColorBitmapFont; | 117 m_isColorBitmapFont = other.m_isColorBitmapFont; |
| 131 m_isCompositeFontReference = other.m_isCompositeFontReference; | 118 m_isCompositeFontReference = other.m_isCompositeFontReference; |
| 132 #if OS(MACOSX) | |
| 133 m_isPrinterFont = other.m_isPrinterFont; | |
| 134 #endif | |
| 135 | 119 |
| 136 return platformDataAssign(other); | 120 return platformDataAssign(other); |
| 137 } | 121 } |
| 138 | 122 |
| 139 } | 123 } |
| OLD | NEW |