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

Side by Side Diff: Source/platform/fonts/GlyphMetricsMap.h

Issue 858663002: Fix template angle bracket syntax in platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 11 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
« no previous file with comments | « Source/platform/fonts/FontDataCache.cpp ('k') | Source/platform/fonts/GlyphPageTreeNode.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) 2006, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 return &m_primaryPage; 81 return &m_primaryPage;
82 return locatePageSlowCase(pageNumber); 82 return locatePageSlowCase(pageNumber);
83 } 83 }
84 84
85 GlyphMetricsPage* locatePageSlowCase(unsigned pageNumber); 85 GlyphMetricsPage* locatePageSlowCase(unsigned pageNumber);
86 86
87 static T unknownMetrics(); 87 static T unknownMetrics();
88 88
89 bool m_filledPrimaryPage; 89 bool m_filledPrimaryPage;
90 GlyphMetricsPage m_primaryPage; // We optimize for the page that contains gl yph indices 0-255. 90 GlyphMetricsPage m_primaryPage; // We optimize for the page that contains gl yph indices 0-255.
91 OwnPtr<HashMap<int, OwnPtr<GlyphMetricsPage> > > m_pages; 91 OwnPtr<HashMap<int, OwnPtr<GlyphMetricsPage>> > m_pages;
92 }; 92 };
93 93
94 template<> inline float GlyphMetricsMap<float>::unknownMetrics() 94 template<> inline float GlyphMetricsMap<float>::unknownMetrics()
95 { 95 {
96 return cGlyphSizeUnknown; 96 return cGlyphSizeUnknown;
97 } 97 }
98 98
99 template<> inline FloatRect GlyphMetricsMap<FloatRect>::unknownMetrics() 99 template<> inline FloatRect GlyphMetricsMap<FloatRect>::unknownMetrics()
100 { 100 {
101 return FloatRect(0, 0, cGlyphSizeUnknown, cGlyphSizeUnknown); 101 return FloatRect(0, 0, cGlyphSizeUnknown, cGlyphSizeUnknown);
102 } 102 }
103 103
104 template<class T> typename GlyphMetricsMap<T>::GlyphMetricsPage* GlyphMetricsMap <T>::locatePageSlowCase(unsigned pageNumber) 104 template<class T> typename GlyphMetricsMap<T>::GlyphMetricsPage* GlyphMetricsMap <T>::locatePageSlowCase(unsigned pageNumber)
105 { 105 {
106 GlyphMetricsPage* page; 106 GlyphMetricsPage* page;
107 if (!pageNumber) { 107 if (!pageNumber) {
108 ASSERT(!m_filledPrimaryPage); 108 ASSERT(!m_filledPrimaryPage);
109 page = &m_primaryPage; 109 page = &m_primaryPage;
110 m_filledPrimaryPage = true; 110 m_filledPrimaryPage = true;
111 } else { 111 } else {
112 if (m_pages) { 112 if (m_pages) {
113 page = m_pages->get(pageNumber); 113 page = m_pages->get(pageNumber);
114 if (page) 114 if (page)
115 return page; 115 return page;
116 } else 116 } else {
117 m_pages = adoptPtr(new HashMap<int, OwnPtr<GlyphMetricsPage> >); 117 m_pages = adoptPtr(new HashMap<int, OwnPtr<GlyphMetricsPage>>);
118 }
118 page = new GlyphMetricsPage; 119 page = new GlyphMetricsPage;
119 m_pages->set(pageNumber, adoptPtr(page)); 120 m_pages->set(pageNumber, adoptPtr(page));
120 } 121 }
121 122
122 // Fill in the whole page with the unknown glyph information. 123 // Fill in the whole page with the unknown glyph information.
123 for (unsigned i = 0; i < GlyphMetricsPage::size; i++) 124 for (unsigned i = 0; i < GlyphMetricsPage::size; i++)
124 page->setMetricsForIndex(i, unknownMetrics()); 125 page->setMetricsForIndex(i, unknownMetrics());
125 126
126 return page; 127 return page;
127 } 128 }
128 129
129 } // namespace blink 130 } // namespace blink
130 131
131 #endif 132 #endif
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontDataCache.cpp ('k') | Source/platform/fonts/GlyphPageTreeNode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698