bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix implicit type cast errors with Xcode 14.1

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-01-04 14:23:52 -05:00
parent 3af3eab3e4
commit 7ba45a0451
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cefclient/browser/text_input_client_osr_mac.mm
View File

@@ -30,7 +30,7 @@ cef_color_t CefColorFromNSColor(NSColor* color) {
// third_party/WebKit/Source/WebKit/mac/WebView/WebHTMLView.mm
void ExtractUnderlines(NSAttributedString* string,
std::vector<CefCompositionUnderline>* underlines) {
int length = [[string string] length];
int length = static_cast<int>([[string string] length]);
int i = 0;
while (i < length) {
NSRange range;
@@ -52,7 +52,7 @@ void ExtractUnderlines(NSAttributedString* string,
[style intValue] > 1};
underlines->push_back(line);
}
i = range.location + range.length;
i = static_cast<int>(range.location + range.length);
}
}
@@ -131,7 +131,7 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
BOOL isAttributedString = [aString isKindOfClass:[NSAttributedString class]];
NSString* im_text = isAttributedString ? [aString string] : aString;
int length = [im_text length];
int length = static_cast<int>([im_text length]);
// |markedRange_| will get set in a callback from ImeSetComposition().
selectedRange_ = newSelRange;
@@ -157,9 +157,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
static_cast<int>(replacementRange.location),
static_cast<int>(NSMaxRange(replacementRange))};
} else if (!handlingKeyDown_) {
CefRange replacement_range(replacementRange.location,
NSMaxRange(replacementRange));
CefRange selection_range(newSelRange.location, NSMaxRange(newSelRange));
CefRange replacement_range(static_cast<int>(replacementRange.location),
static_cast<int>(NSMaxRange(replacementRange)));
CefRange selection_range(static_cast<int>(newSelRange.location),
static_cast<int>(NSMaxRange(newSelRange)));
browser_->GetHost()->ImeSetComposition(markedText_, underlines_,
replacement_range, selection_range);
@@ -316,7 +317,8 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
// |selectedRange_| is the range being selected inside the marked text.
browser_->GetHost()->ImeSetComposition(
markedText_, underlines_, setMarkedTextReplacementRange_,
CefRange(selectedRange_.location, NSMaxRange(selectedRange_)));
CefRange(static_cast<int>(selectedRange_.location),
static_cast<int>(NSMaxRange(selectedRange_))));
} else if (oldHasMarkedText_ && !hasMarkedText_ && !textInserted) {
// There was no marked text or inserted text. Complete or cancel the
// composition.