OLD | NEW |
---|---|
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 Loading... | |
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 NSFont* font = style->font().primaryFont()->getNSFont(); | 81 const FontPlatformData& fontPlatformData = style->font().primaryFont()-> platformData(); |
82 const NSFont* font = reinterpret_cast<const NSFont*>(fontPlatformData.ct Font()); | |
Robert Sesek
2015/03/19 21:53:45
NSObjects are never const.
Dominik Röttsches
2015/03/20 11:01:07
Changed to NSFont* - however, as above, the nested
| |
82 // If the platform font can't be loaded, it's likely that the site is | 83 // If the platform font can't be loaded, it's likely that the site is |
83 // using a web font. For now, just use the default font instead. | 84 // using a web font. For now, just use the default font instead. |
84 // TODO(rsesek): Change the font activation flags to allow other process es | 85 // TODO(rsesek): Change the font activation flags to allow other process es |
85 // to use the font. | 86 // to use the font. |
86 if (!font) | 87 if (!font) |
87 font = [NSFont systemFontOfSize:style->font().fontDescription().comput edSize()]; | 88 font = [NSFont systemFontOfSize:style->font().fontDescription().comput edSize()]; |
88 [attrs setObject:font forKey:NSFontAttributeName]; | 89 [attrs setObject:font forKey:NSFontAttributeName]; |
89 | 90 |
90 if (style->visitedDependentColor(CSSPropertyColor).alpha()) | 91 if (style->visitedDependentColor(CSSPropertyColor).alpha()) |
91 [attrs setObject:nsColor(style->visitedDependentColor(CSSPropertyCol or)) forKey:NSForegroundColorAttributeName]; | 92 [attrs setObject:nsColor(style->visitedDependentColor(CSSPropertyCol or)) forKey:NSForegroundColorAttributeName]; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
158 if (!editable) | 159 if (!editable) |
159 return nil; | 160 return nil; |
160 RefPtrWillBeRawPtr<Range> range(PlainTextRange(location, location + length). createRange(*editable)); | 161 RefPtrWillBeRawPtr<Range> range(PlainTextRange(location, location + length). createRange(*editable)); |
161 if (!range) | 162 if (!range) |
162 return nil; | 163 return nil; |
163 | 164 |
164 return attributedSubstringFromRange(range.get()); | 165 return attributedSubstringFromRange(range.get()); |
165 } | 166 } |
166 | 167 |
167 } // namespace blink | 168 } // namespace blink |
OLD | NEW |