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

Update to Chromium version 93.0.4577.0 (#902210)

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-07-23 12:40:13 -04:00
parent 1ffa5528b3
commit b4ea0496e7
141 changed files with 1188 additions and 1061 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

@@ -45,8 +45,11 @@ void ExtractUnderlines(NSAttributedString* string,
color = CefColorFromNSColor(
[colorAttr colorUsingColorSpaceName:NSDeviceRGBColorSpace]);
}
cef_composition_underline_t line = {
{range.location, NSMaxRange(range)}, color, 0, [style intValue] > 1};
cef_composition_underline_t line = {{static_cast<int>(range.location),
static_cast<int>(NSMaxRange(range))},
color,
0,
[style intValue] > 1};
underlines->push_back(line);
}
i = range.location + range.length;
@@ -105,8 +108,8 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
if (handlingKeyDown_) {
textToBeInserted_.append([im_text UTF8String]);
} else {
cef_range_t range = {replacementRange.location,
NSMaxRange(replacementRange)};
cef_range_t range = {static_cast<int>(replacementRange.location),
static_cast<int>(NSMaxRange(replacementRange))};
browser_->GetHost()->ImeCommitText([im_text UTF8String], range, 0);
}
@@ -149,8 +152,9 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
// ongoing composition. Our input method backend will automatically cancel an
// ongoing composition when we send empty text.
if (handlingKeyDown_) {
setMarkedTextReplacementRange_ = {replacementRange.location,
NSMaxRange(replacementRange)};
setMarkedTextReplacementRange_ = {
static_cast<int>(replacementRange.location),
static_cast<int>(NSMaxRange(replacementRange))};
} else if (!handlingKeyDown_) {
CefRange replacement_range(replacementRange.location,
NSMaxRange(replacementRange));

14
tests/ceftests/os_rendering_unittest.cc
View File

@@ -483,8 +483,8 @@ class OSRTestHandler : public RoutingTestHandler,
EXPECT_EQ(kExpandedSelectRect.width, rect.width);
EXPECT_EQ(kExpandedSelectRect.height, rect.height);
} else {
EXPECT_GT(rect.width, kExpandedSelectRect.width);
EXPECT_GT(rect.height, kExpandedSelectRect.height);
EXPECT_GE(rect.width, kExpandedSelectRect.width);
EXPECT_GE(rect.height, kExpandedSelectRect.height);
}
DestroySucceededTestSoon();
break;
@@ -1385,18 +1385,14 @@ class OSRTestHandler : public RoutingTestHandler,
}
bool ExpectComputedPopupSize() const {
#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_MAC))
// On Windows the device scale factor is ignored in Blink when computing
// The device scale factor is ignored in Blink when computing
// the default form control font size (see https://crbug.com/674663#c11).
// This results in better font size display but also means that we won't
// get the expected (scaled) width/height value for non-1.0 scale factor
// select popups.
// On both Windows and Linux the non-1.0 scale factor size is off by a few
// pixels so we can't perform an exact comparison.
// The non-1.0 scale factor size is off by a few pixels so we can't perform
// an exact comparison.
return scale_factor_ == 1.0;
#else
return true;
#endif
}
void DestroySucceededTestSoon() {