OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. | 5 * Copyright (C) 2003, 2006, 2010, 2011 Apple Inc. All rights reserved. |
6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. | 6 * Copyright (c) 2007, 2008, 2010 Google Inc. All rights reserved. |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 | 68 |
69 Font& Font::operator=(const Font& other) | 69 Font& Font::operator=(const Font& other) |
70 { | 70 { |
71 m_fontDescription = other.m_fontDescription; | 71 m_fontDescription = other.m_fontDescription; |
72 m_fontFallbackList = other.m_fontFallbackList; | 72 m_fontFallbackList = other.m_fontFallbackList; |
73 return *this; | 73 return *this; |
74 } | 74 } |
75 | 75 |
76 bool Font::operator==(const Font& other) const | 76 bool Font::operator==(const Font& other) const |
77 { | 77 { |
78 // Our FontData don't have to be checked, since checking the font descriptio
n will be fine. | |
79 // FIXME: This does not work if the font was made with the FontPlatformData
constructor. | |
80 if (loadingCustomFonts() || other.loadingCustomFonts()) | |
81 return false; | |
82 | |
83 FontSelector* first = m_fontFallbackList ? m_fontFallbackList->fontSelector(
) : 0; | 78 FontSelector* first = m_fontFallbackList ? m_fontFallbackList->fontSelector(
) : 0; |
84 FontSelector* second = other.m_fontFallbackList ? other.m_fontFallbackList->
fontSelector() : 0; | 79 FontSelector* second = other.m_fontFallbackList ? other.m_fontFallbackList->
fontSelector() : 0; |
85 | 80 |
86 return first == second | 81 return first == second |
87 && m_fontDescription == other.m_fontDescription | 82 && m_fontDescription == other.m_fontDescription |
88 && (m_fontFallbackList ? m_fontFallbackList->fontSelectorVersion() : 0)
== (other.m_fontFallbackList ? other.m_fontFallbackList->fontSelectorVersion() :
0) | 83 && (m_fontFallbackList ? m_fontFallbackList->fontSelectorVersion() : 0)
== (other.m_fontFallbackList ? other.m_fontFallbackList->fontSelectorVersion() :
0) |
89 && (m_fontFallbackList ? m_fontFallbackList->generation() : 0) == (other
.m_fontFallbackList ? other.m_fontFallbackList->generation() : 0); | 84 && (m_fontFallbackList ? m_fontFallbackList->generation() : 0) == (other
.m_fontFallbackList ? other.m_fontFallbackList->generation() : 0); |
90 } | 85 } |
91 | 86 |
92 void Font::update(PassRefPtrWillBeRawPtr<FontSelector> fontSelector) const | 87 void Font::update(PassRefPtrWillBeRawPtr<FontSelector> fontSelector) const |
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
974 if (delta <= 0) | 969 if (delta <= 0) |
975 break; | 970 break; |
976 } | 971 } |
977 } | 972 } |
978 } | 973 } |
979 | 974 |
980 return offset; | 975 return offset; |
981 } | 976 } |
982 | 977 |
983 } // namespace blink | 978 } // namespace blink |
OLD | NEW |