Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(890)

Side by Side Diff: Source/platform/fonts/Font.cpp

Issue 227083006: [Oilpan]: Moving the FontSelector/FontCacheClient, CSSSegmentedFontFace, and FontFaceCache to the o… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/platform/fonts/Font.h ('k') | Source/platform/fonts/FontCache.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 83
84 FontSelector* first = m_fontFallbackList ? m_fontFallbackList->fontSelector( ) : 0; 84 FontSelector* first = m_fontFallbackList ? m_fontFallbackList->fontSelector( ) : 0;
85 FontSelector* second = other.m_fontFallbackList ? other.m_fontFallbackList-> fontSelector() : 0; 85 FontSelector* second = other.m_fontFallbackList ? other.m_fontFallbackList-> fontSelector() : 0;
86 86
87 return first == second 87 return first == second
88 && m_fontDescription == other.m_fontDescription 88 && m_fontDescription == other.m_fontDescription
89 && (m_fontFallbackList ? m_fontFallbackList->fontSelectorVersion() : 0) == (other.m_fontFallbackList ? other.m_fontFallbackList->fontSelectorVersion() : 0) 89 && (m_fontFallbackList ? m_fontFallbackList->fontSelectorVersion() : 0) == (other.m_fontFallbackList ? other.m_fontFallbackList->fontSelectorVersion() : 0)
90 && (m_fontFallbackList ? m_fontFallbackList->generation() : 0) == (other .m_fontFallbackList ? other.m_fontFallbackList->generation() : 0); 90 && (m_fontFallbackList ? m_fontFallbackList->generation() : 0) == (other .m_fontFallbackList ? other.m_fontFallbackList->generation() : 0);
91 } 91 }
92 92
93 void Font::update(PassRefPtr<FontSelector> fontSelector) const 93 void Font::update(PassRefPtrWillBeRawPtr<FontSelector> fontSelector) const
94 { 94 {
95 // FIXME: It is pretty crazy that we are willing to just poke into a RefPtr, but it ends up 95 // FIXME: It is pretty crazy that we are willing to just poke into a RefPtr, but it ends up
96 // being reasonably safe (because inherited fonts in the render tree pick up the new 96 // being reasonably safe (because inherited fonts in the render tree pick up the new
97 // style anyway. Other copies are transient, e.g., the state in the Graphics Context, and 97 // style anyway. Other copies are transient, e.g., the state in the Graphics Context, and
98 // won't stick around long enough to get you in trouble). Still, this is pre tty disgusting, 98 // won't stick around long enough to get you in trouble). Still, this is pre tty disgusting,
99 // and could eventually be rectified by using RefPtrs for Fonts themselves. 99 // and could eventually be rectified by using RefPtrs for Fonts themselves.
100 if (!m_fontFallbackList) 100 if (!m_fontFallbackList)
101 m_fontFallbackList = FontFallbackList::create(); 101 m_fontFallbackList = FontFallbackList::create();
102 m_fontFallbackList->invalidate(fontSelector); 102 m_fontFallbackList->invalidate(fontSelector);
103 } 103 }
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 if (delta <= 0) 825 if (delta <= 0)
826 break; 826 break;
827 } 827 }
828 } 828 }
829 } 829 }
830 830
831 return offset; 831 return offset;
832 } 832 }
833 833
834 } 834 }
OLDNEW
« no previous file with comments | « Source/platform/fonts/Font.h ('k') | Source/platform/fonts/FontCache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698