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

Side by Side Diff: Source/web/mac/WebSubstringUtil.mm

Issue 1021483004: Revert of Remove Mac native font type members from FontPlatformData (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 9 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/skia/FontCustomPlatformDataSkia.cpp ('k') | no next file » | 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) 2005, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2007, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 if (!numCharacters) 71 if (!numCharacters)
72 continue; 72 continue;
73 73
74 Node* container = it.startContainer(); 74 Node* container = it.startContainer();
75 LayoutObject* renderer = container->layoutObject(); 75 LayoutObject* renderer = container->layoutObject();
76 ASSERT(renderer); 76 ASSERT(renderer);
77 if (!renderer) 77 if (!renderer)
78 continue; 78 continue;
79 79
80 LayoutStyle* style = renderer->style(); 80 LayoutStyle* style = renderer->style();
81 const FontPlatformData& fontPlatformData = style->font().primaryFont()-> platformData(); 81 NSFont* font = style->font().primaryFont()->getNSFont();
82 NSFont* font = toNSFont(fontPlatformData.ctFont());
83 // If the platform font can't be loaded, it's likely that the site is 82 // If the platform font can't be loaded, it's likely that the site is
84 // using a web font. For now, just use the default font instead. 83 // using a web font. For now, just use the default font instead.
85 // TODO(rsesek): Change the font activation flags to allow other process es 84 // TODO(rsesek): Change the font activation flags to allow other process es
86 // to use the font. 85 // to use the font.
87 if (!font) 86 if (!font)
88 font = [NSFont systemFontOfSize:style->font().fontDescription().comput edSize()]; 87 font = [NSFont systemFontOfSize:style->font().fontDescription().comput edSize()];
89 [attrs setObject:font forKey:NSFontAttributeName]; 88 [attrs setObject:font forKey:NSFontAttributeName];
90 89
91 if (style->visitedDependentColor(CSSPropertyColor).alpha()) 90 if (style->visitedDependentColor(CSSPropertyColor).alpha())
92 [attrs setObject:nsColor(style->visitedDependentColor(CSSPropertyCol or)) forKey:NSForegroundColorAttributeName]; 91 [attrs setObject:nsColor(style->visitedDependentColor(CSSPropertyCol or)) forKey:NSForegroundColorAttributeName];
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 if (!editable) 158 if (!editable)
160 return nil; 159 return nil;
161 RefPtrWillBeRawPtr<Range> range(PlainTextRange(location, location + length). createRange(*editable)); 160 RefPtrWillBeRawPtr<Range> range(PlainTextRange(location, location + length). createRange(*editable));
162 if (!range) 161 if (!range)
163 return nil; 162 return nil;
164 163
165 return attributedSubstringFromRange(range.get()); 164 return attributedSubstringFromRange(range.get());
166 } 165 }
167 166
168 } // namespace blink 167 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/fonts/skia/FontCustomPlatformDataSkia.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698