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

Side by Side Diff: Source/WebCore/platform/graphics/chromium/FontPlatformDataChromiumWin.cpp

Issue 11348334: Merge 134871 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007 Apple Computer, Inc. 2 * Copyright (C) 2006, 2007 Apple Computer, Inc.
3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google Inc. All rights reserved.
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 are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 185 }
186 } 186 }
187 187
188 SelectObject(dc, oldFont); 188 SelectObject(dc, oldFont);
189 } 189 }
190 } 190 }
191 return m_scriptFontProperties; 191 return m_scriptFontProperties;
192 } 192 }
193 193
194 #if ENABLE(OPENTYPE_VERTICAL) 194 #if ENABLE(OPENTYPE_VERTICAL)
195 const OpenTypeVerticalData* FontPlatformData::verticalData() const 195 PassRefPtr<OpenTypeVerticalData> FontPlatformData::verticalData() const
196 { 196 {
197 SkFontID id = typeface()->uniqueID(); 197 SkFontID id = typeface()->uniqueID();
198 return fontCache()->getVerticalData(id, *this); 198 return fontCache()->getVerticalData(id, *this);
199 } 199 }
200 200
201 PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const 201 PassRefPtr<SharedBuffer> FontPlatformData::openTypeTable(uint32_t table) const
202 { 202 {
203 HWndDC hdc(0); 203 HWndDC hdc(0);
204 HGDIOBJ oldFont = SelectObject(hdc, hfont()); 204 HGDIOBJ oldFont = SelectObject(hdc, hfont());
205 205
(...skipping 11 matching lines...) Expand all
217 #endif 217 #endif
218 218
219 #ifndef NDEBUG 219 #ifndef NDEBUG
220 String FontPlatformData::description() const 220 String FontPlatformData::description() const
221 { 221 {
222 return String(); 222 return String();
223 } 223 }
224 #endif 224 #endif
225 225
226 } 226 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698