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

Side by Side Diff: Source/platform/fonts/harfbuzz/HarfBuzzFaceCoreText.cpp

Issue 546973004: Revert 181541 "Merge FontPlatformDataHarfBuzz and FontPlatformData headers" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 Google Inc. All rights reserved. 2 * Copyright (c) 2012 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // OpenType layout tables(GDEF, GSUB, GPOS). Use CGFontCopyTableForTag inste ad. 126 // OpenType layout tables(GDEF, GSUB, GPOS). Use CGFontCopyTableForTag inste ad.
127 hb_face_t* face = hb_face_create_for_tables(harfBuzzCoreTextGetTable, m_plat formData->cgFont(), 0); 127 hb_face_t* face = hb_face_create_for_tables(harfBuzzCoreTextGetTable, m_plat formData->cgFont(), 0);
128 ASSERT(face); 128 ASSERT(face);
129 return face; 129 return face;
130 } 130 }
131 131
132 hb_font_t* HarfBuzzFace::createFont() 132 hb_font_t* HarfBuzzFace::createFont()
133 { 133 {
134 hb_font_t* font = hb_font_create(m_face); 134 hb_font_t* font = hb_font_create(m_face);
135 hb_font_set_funcs(font, harfBuzzCoreTextGetFontFuncs(), m_platformData, 0); 135 hb_font_set_funcs(font, harfBuzzCoreTextGetFontFuncs(), m_platformData, 0);
136 const float size = m_platformData->m_textSize; 136 const float size = m_platformData->m_size;
137 hb_font_set_ppem(font, size, size); 137 hb_font_set_ppem(font, size, size);
138 const int scale = (1 << 16) * static_cast<int>(size); 138 const int scale = (1 << 16) * static_cast<int>(size);
139 hb_font_set_scale(font, scale, scale); 139 hb_font_set_scale(font, scale, scale);
140 hb_font_make_immutable(font); 140 hb_font_make_immutable(font);
141 return font; 141 return font;
142 } 142 }
143 143
144 } // namespace blink 144 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/fonts/harfbuzz/FontPlatformDataHarfBuzz.cpp ('k') | Source/platform/fonts/linux/FontPlatformDataLinux.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698