| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Torch Mobile, Inc. | 3 * Copyright (C) 2009 Torch Mobile, Inc. |
| 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 | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 if (m_fontData) { | 127 if (m_fontData) { |
| 128 recordPackageFormatHistogram(packageFormatOf(m_data.get())); | 128 recordPackageFormatHistogram(packageFormatOf(m_data.get())); |
| 129 } else { | 129 } else { |
| 130 setStatus(DecodeError); | 130 setStatus(DecodeError); |
| 131 recordPackageFormatHistogram(PackageFormatUnknown); | 131 recordPackageFormatHistogram(PackageFormatUnknown); |
| 132 } | 132 } |
| 133 } | 133 } |
| 134 return m_fontData.get(); | 134 return m_fontData.get(); |
| 135 } | 135 } |
| 136 | 136 |
| 137 FontPlatformData FontResource::platformDataFromCustomData(float size, bool bold,
bool italic, FontOrientation orientation) | 137 FontPlatformData FontResource::platformDataFromCustomData(bool bold, bool italic
, FontOrientation orientation) |
| 138 { | 138 { |
| 139 ASSERT(m_fontData); | 139 ASSERT(m_fontData); |
| 140 return m_fontData->fontPlatformData(size, bold, italic, orientation); | 140 return m_fontData->fontPlatformData(bold, italic, orientation); |
| 141 } | 141 } |
| 142 | 142 |
| 143 bool FontResource::isSafeToUnlock() const | 143 bool FontResource::isSafeToUnlock() const |
| 144 { | 144 { |
| 145 return m_data->hasOneRef(); | 145 return m_data->hasOneRef(); |
| 146 } | 146 } |
| 147 | 147 |
| 148 void FontResource::fontLoadShortLimitCallback(Timer<FontResource>*) | 148 void FontResource::fontLoadShortLimitCallback(Timer<FontResource>*) |
| 149 { | 149 { |
| 150 if (!isLoading()) | 150 if (!isLoading()) |
| (...skipping 24 matching lines...) Expand all Loading... |
| 175 | 175 |
| 176 void FontResource::checkNotify() | 176 void FontResource::checkNotify() |
| 177 { | 177 { |
| 178 m_fontLoadShortLimitTimer.stop(); | 178 m_fontLoadShortLimitTimer.stop(); |
| 179 m_fontLoadLongLimitTimer.stop(); | 179 m_fontLoadLongLimitTimer.stop(); |
| 180 | 180 |
| 181 Resource::checkNotify(); | 181 Resource::checkNotify(); |
| 182 } | 182 } |
| 183 | 183 |
| 184 } // namespace blink | 184 } // namespace blink |
| OLD | NEW |