[CoreText] Remove the Foundation dependency from CTFramesetter and CTTypeSetter with code improvements #2437
Conversation
| @@ -17,7 +17,7 @@ | |||
|
|
|||
| #import <CoreText/CoreText.h> | |||
| #import <CoreText/CTParagraphStyle.h> | |||
|
|
|||
| #import <CFCppBase.h> | |||
There was a problem hiding this comment.
this can go away #Resolved
Frameworks/CoreText/CTFramesetter.mm
Outdated
| if (range.length == 0L) { | ||
| range.length = [typesetter->_string length] - range.location; | ||
| range.length = CFStringGetLength(CFAttributedStringGetString(attributedString)) - range.location; |
There was a problem hiding this comment.
why not CFAttributedStringGetLength? Technically, an NSAttributedString subclass can override -length, and with the way you've implemented this, it will not get called. #Resolved
There was a problem hiding this comment.
The initial implementation is this, so the bug pretains. get the string out of the attributedString then get the length.
you are correct, needs to be updated.
In reply to: 110286467 [](ancestors = 110286467)
Frameworks/CoreText/CTFramesetter.mm
Outdated
|
|
||
| // Call _DWriteWrapper to get _CTLine object list that makes up this frame | ||
| _CTTypesetter* typesetter = static_cast<_CTTypesetter*>(framesetter->_typesetter); | ||
| CFAttributedStringRef attributedString = __CTTypesetterGetAttributedString(framesetter->Typesetter()); |
There was a problem hiding this comment.
Double underscores are for file-private static functions in the CT convention. #Resolved
Frameworks/CoreText/CTTypesetter.mm
Outdated
| return ([frame->_lines count] > 0) ? static_cast<_CTLine*>([frame->_lines firstObject])->_strRange.length : 0; | ||
| __CTTypesetter* typesetter = const_cast<__CTTypesetter*>(ts); | ||
| _CTFrame* frame = | ||
| _DWriteGetFrame(__CTTypesetterGetAttributedString(typesetter), |
There was a problem hiding this comment.
this one can use the internal function ->AttributedString() #Resolved
Frameworks/CoreText/CTTypesetter.mm
Outdated
| __CTTypesetter* typesetter = const_cast<__CTTypesetter*>(ts); | ||
| _CTFrame* frame = | ||
| _DWriteGetFrame(__CTTypesetterGetAttributedString(typesetter), | ||
| CFRangeMake(index, CFStringGetLength(CFAttributedStringGetString(typesetter->AttributedString())) - index), |
There was a problem hiding this comment.
same as in CTFramesetter #Resolved
| CGRectMake(offset, 0, width, FLT_MAX)); | ||
| return ([frame->_lines count] > 0) ? static_cast<_CTLine*>([frame->_lines firstObject])->_strRange.length : 0; | ||
| if ([frame->_lines count] > 0) { |
There was a problem hiding this comment.
[frame->_lines count] [](start = 8, length = 21)
These objc calls can already be changed to CFCalls due to bridging so you dont have to touch this again when you fix CTLines #ByDesign
There was a problem hiding this comment.
I've already done them in a separate branch, i'll merge that in when it's done.
Main reason it's not part of this cr is that i would have to add extra castings, which would get removed in the final sweep. so waiting till then.
In reply to: 110446875 [](ancestors = 110446875)
msft-Jeyaram
changed the title
|
nit: can you reword this to be <72 characters |
- Removed the dependency on Foundation - Removed the private member access of CTTypeSetter - Code improvements Fixes microsoft#2355
- Removed the dependency on Foundation - Removed the private member access of CTFramesetter - Code improvements Fixes microsoft#2358
msft-Jeyaram
force-pushed
the
CTTypeSetter
branch
from
43ef1aa to
37ba3a8
Compare
Fixes #2355 and #2358