Update to Chromium version 130.0.6723.0 (#1356013)

This commit is contained in:
Marshall Greenblatt
2024-09-27 14:15:44 +00:00
parent e44d33d5bf
commit cd052ec7c3
84 changed files with 758 additions and 736 deletions

View File

@ -415,8 +415,7 @@ TEST(MediaAccessTest, DeviceFailureWhenRequestingAudioButReturningVideo) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -431,8 +430,7 @@ TEST(MediaAccessTest, DeviceFailureWhenRequestingVideoButReturningAudio) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -449,8 +447,7 @@ TEST(MediaAccessTest, DevicePartialFailureReturningVideo) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -467,8 +464,7 @@ TEST(MediaAccessTest, DevicePartialFailureReturningAudio) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -485,8 +481,7 @@ TEST(MediaAccessTest, DeviceFailureWhenReturningScreenCapture1) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -503,8 +498,7 @@ TEST(MediaAccessTest, DeviceFailureWhenReturningScreenCapture2) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -519,8 +513,7 @@ TEST(MediaAccessTest, DeviceFailureWhenReturningScreenCapture3) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -535,8 +528,7 @@ TEST(MediaAccessTest, DeviceFailureWhenReturningScreenCapture4) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -551,8 +543,7 @@ TEST(MediaAccessTest, DeviceFailureWhenReturningScreenCapture5) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -567,8 +558,7 @@ TEST(MediaAccessTest, DeviceFailureWhenReturningScreenCapture6) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -675,8 +665,7 @@ TEST(MediaAccessTest, DesktopFailureWhenRequestingVideoButReturningAudio) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}
@ -713,8 +702,7 @@ TEST(MediaAccessTest, DesktopPartialFailureReturningAudio) {
EXPECT_TRUE(test_setup.got_request);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Invalid state",
test_setup.js_error_str.c_str());
EXPECT_STREQ("AbortError: Invalid state", test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_change);
}

View File

@ -1399,7 +1399,7 @@ TEST(SchemeHandlerTest, CustomNonStandardXSSSameOrigin) {
"customnonstd:xhr%20value");
test_results.console_messages.push_back(
"Error: Failed to read a named property 'getResult' from "
"SecurityError: Failed to read a named property 'getResult' from "
"'Window': Blocked a frame with origin \"null\" from accessing a "
"cross-origin frame.");
@ -1525,7 +1525,7 @@ TEST(SchemeHandlerTest, CustomStandardXSSDifferentOrigin) {
"customstd://test2/iframe.html");
test_results.console_messages.push_back(
"Error: Failed to read a named property 'getResult' from "
"SecurityError: Failed to read a named property 'getResult' from "
"'Window': Blocked a frame with origin \"customstd://test2\" from "
"accessing a cross-origin frame.");
@ -1553,7 +1553,7 @@ TEST(SchemeHandlerTest, CustomStandardXSSDifferentProtocolHttp) {
"https://test2/iframe.html");
test_results.console_messages.push_back(
"Error: Failed to read a named property 'getResult' from "
"SecurityError: Failed to read a named property 'getResult' from "
"'Window': Blocked a frame with origin \"https://test2\" from accessing "
"a cross-origin frame.");
@ -1582,7 +1582,7 @@ TEST(SchemeHandlerTest, CustomStandardXSSDifferentProtocolCustomNonStandard) {
"customnonstd:some%20value");
test_results.console_messages.push_back(
"Error: Failed to read a named property 'getResult' from "
"SecurityError: Failed to read a named property 'getResult' from "
"'Window': Blocked a frame with origin \"null\" from accessing a "
"cross-origin frame.");
@ -1610,7 +1610,7 @@ TEST(SchemeHandlerTest, HttpXSSDifferentProtocolCustomStandard) {
"customstd://test2/iframe.html");
test_results.console_messages.push_back(
"Error: Failed to read a named property 'getResult' from "
"SecurityError: Failed to read a named property 'getResult' from "
"'Window': Blocked a frame with origin \"customstd://test2\" from "
"accessing a cross-origin frame.");
@ -1638,7 +1638,7 @@ TEST(SchemeHandlerTest, HttpXSSDifferentProtocolCustomNonStandard) {
"customnonstd:some%20value");
test_results.console_messages.push_back(
"Error: Failed to read a named property 'getResult' from "
"SecurityError: Failed to read a named property 'getResult' from "
"'Window': Blocked a frame with origin \"null\" from accessing a "
"cross-origin frame.");
@ -1764,7 +1764,7 @@ TEST(SchemeHandlerTest, HttpXSSDifferentOrigin) {
SetUpXSS(&test_results, "https://test1/run.html", "https://test2/xss.html");
test_results.console_messages.push_back(
"Error: Failed to read a named property 'getResult' from "
"SecurityError: Failed to read a named property 'getResult' from "
"'Window': Blocked a frame with origin \"https://test2\" from accessing "
"a cross-origin frame.");

View File

@ -951,8 +951,12 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
static const char* kName = "val";
static const char* kGetException = "My get exception";
static const char* kSetException = "My set exception";
static const char* kGetExceptionMsg = "Uncaught Error: My get exception";
static const char* kSetExceptionMsg = "Uncaught Error: My set exception";
static const char* kGetExceptionMsg =
"Uncaught Error: Failed to read the 'val' property from 'Object': My "
"get exception";
static const char* kSetExceptionMsg =
"Uncaught Error: Failed to set the 'val' property on 'Object': My set "
"exception";
class Accessor : public CefV8Accessor {
public:
@ -1493,13 +1497,17 @@ class V8RendererTest : public ClientAppRenderer::Delegate,
static const char* kSetByIndexException = "My set_byindex exception";
static const char* kGetByNameExceptionMsg =
"Uncaught Error: My get_byname exception";
"Uncaught Error: Failed to read a named property 'val' from 'Object': "
"My get_byname exception";
static const char* kGetByIndexExceptionMsg =
"Uncaught Error: My get_byindex exception";
"Uncaught Error: Failed to read an indexed property [1] from 'Object': "
"My get_byindex exception";
static const char* kSetByNameExceptionMsg =
"Uncaught Error: My set_byname exception";
"Uncaught Error: Failed to set a named property 'val' on 'Object': My "
"set_byname exception";
static const char* kSetByIndexExceptionMsg =
"Uncaught Error: My set_byindex exception";
"Uncaught Error: Failed to set an indexed property [1] on 'Object': My "
"set_byindex exception";
class Interceptor : public CefV8Interceptor {
public:

View File

@ -240,9 +240,9 @@ void CreateBoxLayout(CefRefPtr<CefWindow> parent) {
// The children should each take up 50% of the client area.
ExpectCloseRects(CefRect(0, 0, kWSize, kWSize / 2), panel_child1->GetBounds(),
2);
3);
ExpectCloseRects(CefRect(0, kWSize / 2, kWSize, kWSize / 2),
panel_child2->GetBounds(), 2);
panel_child2->GetBounds(), 3);
}
void RunWindowLayoutAndCoords(CefRefPtr<CefWindow> window) {
@ -267,7 +267,7 @@ void RunWindowLayoutAndCoords(CefRefPtr<CefWindow> window) {
EXPECT_TRUE(view2->ConvertPointToScreen(point));
ExpectClosePoints(CefPoint(client_bounds_in_screen.x,
client_bounds_in_screen.y + kWSize / 2),
point, 1);
point, 3);
// Test view from screen coordinate conversions.
point = CefPoint(client_bounds_in_screen.x, client_bounds_in_screen.y);
@ -276,7 +276,7 @@ void RunWindowLayoutAndCoords(CefRefPtr<CefWindow> window) {
point = CefPoint(client_bounds_in_screen.x,
client_bounds_in_screen.y + kWSize / 2);
EXPECT_TRUE(view2->ConvertPointFromScreen(point));
ExpectClosePoints(CefPoint(0, 0), point, 1);
ExpectClosePoints(CefPoint(0, 0), point, 3);
// Test view to window coordinate conversions.
point = CefPoint(0, 0);
@ -284,7 +284,7 @@ void RunWindowLayoutAndCoords(CefRefPtr<CefWindow> window) {
EXPECT_EQ(CefPoint(0, 0), point);
point = CefPoint(0, 0);
EXPECT_TRUE(view2->ConvertPointToWindow(point));
ExpectClosePoints(CefPoint(0, kWSize / 2), point, 1);
ExpectClosePoints(CefPoint(0, kWSize / 2), point, 3);
// Test view from window coordinate conversions.
point = CefPoint(0, 0);
@ -292,23 +292,23 @@ void RunWindowLayoutAndCoords(CefRefPtr<CefWindow> window) {
EXPECT_EQ(CefPoint(0, 0), point);
point = CefPoint(0, kWSize / 2);
EXPECT_TRUE(view2->ConvertPointFromWindow(point));
ExpectClosePoints(CefPoint(0, 0), point, 1);
ExpectClosePoints(CefPoint(0, 0), point, 3);
// Test view to view coordinate conversions.
point = CefPoint(0, 0);
EXPECT_TRUE(view1->ConvertPointToView(view2, point));
ExpectClosePoints(CefPoint(0, -kWSize / 2), point, 1);
ExpectClosePoints(CefPoint(0, -kWSize / 2), point, 3);
point = CefPoint(0, 0);
EXPECT_TRUE(view2->ConvertPointToView(view1, point));
ExpectClosePoints(CefPoint(0, kWSize / 2), point, 1);
ExpectClosePoints(CefPoint(0, kWSize / 2), point, 3);
// Test view from view coordinate conversions.
point = CefPoint(0, -kWSize / 2);
EXPECT_TRUE(view1->ConvertPointFromView(view2, point));
ExpectClosePoints(CefPoint(0, 0), point, 1);
ExpectClosePoints(CefPoint(0, 0), point, 3);
point = CefPoint(0, kWSize / 2);
EXPECT_TRUE(view2->ConvertPointFromView(view1, point));
ExpectClosePoints(CefPoint(0, 0), point, 1);
ExpectClosePoints(CefPoint(0, 0), point, 3);
CefRefPtr<CefDisplay> display = window->GetDisplay();
EXPECT_TRUE(display.get());
@ -324,7 +324,7 @@ void RunWindowLayoutAndCoords(CefRefPtr<CefWindow> window) {
point = CefPoint(client_bounds_in_screen.x, client_bounds_in_screen.y);
const auto pixels = CefDisplay::ConvertScreenPointToPixels(point);
const auto dip = CefDisplay::ConvertScreenPointFromPixels(pixels);
EXPECT_EQ(point, dip);
ExpectClosePoints(point, dip, 1);
}
void WindowLayoutAndCoordsImpl(CefRefPtr<CefWaitableEvent> event) {