| 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 #endif | 182 #endif |
| 183 { | 183 { |
| 184 #if OS(MACOSX) | 184 #if OS(MACOSX) |
| 185 platformDataInit(src); | 185 platformDataInit(src); |
| 186 #else | 186 #else |
| 187 querySystemForRenderStyle(FontDescription::subpixelPositioning()); | 187 querySystemForRenderStyle(FontDescription::subpixelPositioning()); |
| 188 #endif | 188 #endif |
| 189 } | 189 } |
| 190 | 190 |
| 191 #if OS(MACOSX) | 191 #if OS(MACOSX) |
| 192 FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticB
old, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVa
riant) | 192 FontPlatformData::FontPlatformData(CGFontRef cgFont, PassRefPtr<SkTypeface> tf,
float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientatio
n, FontWidthVariant widthVariant) |
| 193 : m_typeface(nullptr) | 193 : m_typeface(tf) |
| 194 , m_family(CString()) | 194 , m_family(CString()) |
| 195 , m_textSize(size) | 195 , m_textSize(size) |
| 196 , m_syntheticBold(syntheticBold) | 196 , m_syntheticBold(syntheticBold) |
| 197 , m_syntheticItalic(syntheticItalic) | 197 , m_syntheticItalic(syntheticItalic) |
| 198 , m_orientation(orientation) | 198 , m_orientation(orientation) |
| 199 , m_isColorBitmapFont(false) | 199 , m_isColorBitmapFont(false) |
| 200 , m_isCompositeFontReference(false) | 200 , m_isCompositeFontReference(false) |
| 201 , m_widthVariant(widthVariant) | 201 , m_widthVariant(widthVariant) |
| 202 , m_font(nullptr) | 202 , m_font(nullptr) |
| 203 , m_cgFont(cgFont) | 203 , m_cgFont(cgFont) |
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 if (tableSize) { | 391 if (tableSize) { |
| 392 Vector<char> tableBuffer(tableSize); | 392 Vector<char> tableBuffer(tableSize); |
| 393 m_typeface->getTableData(tag, 0, tableSize, &tableBuffer[0]); | 393 m_typeface->getTableData(tag, 0, tableSize, &tableBuffer[0]); |
| 394 buffer = SharedBuffer::adoptVector(tableBuffer); | 394 buffer = SharedBuffer::adoptVector(tableBuffer); |
| 395 } | 395 } |
| 396 return buffer.release(); | 396 return buffer.release(); |
| 397 } | 397 } |
| 398 #endif | 398 #endif |
| 399 | 399 |
| 400 } // namespace blink | 400 } // namespace blink |
| OLD | NEW |