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 122.0.6261.0 (#1250580)

Browse Source 
Frame identifiers have changed from int64_t to string type. This is due
to https://crbug.com/1502660 which removes access to frame routing IDs
in the renderer process. New cross-process frame identifiers are 160-bit
values (32-bit child process ID + 128-bit local frame token) and most
easily represented as strings. All other frame-related expectations and
behaviors remain the same.
This commit is contained in:
Marshall Greenblatt
2024-01-25 21:12:43 -05:00
parent 2a86a02bdd
commit 2f1e782f62
156 changed files with 1452 additions and 1436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/ceftests/resource_request_handler_unittest.cc
View File

@@ -1601,7 +1601,7 @@ class SubresourceResponseTest : public RoutingTestHandler {
// Track the frame ID that we'll expect for resource callbacks.
// Do this here instead of OnBeforeBrowse because OnBeforeBrowse may
// return -4 (kInvalidFrameId) for the initial navigation.
if (frame_id_ == 0) {
if (frame_id_.empty()) {
if (subframe_) {
if (is_sub_url) {
frame_id_ = frame->GetIdentifier();
@@ -2406,13 +2406,9 @@ class SubresourceResponseTest : public RoutingTestHandler {
void VerifyFrame(Callback callback, CefRefPtr<CefFrame> frame) const {
EXPECT_TRUE(frame);
if (subframe_) {
EXPECT_FALSE(frame->IsMain()) << callback;
} else {
EXPECT_TRUE(frame->IsMain()) << callback;
}
EXPECT_EQ(frame_id_, frame->GetIdentifier()) << callback;
EXPECT_NE(subframe_, frame->IsMain()) << callback;
EXPECT_STREQ(frame_id_.c_str(), frame->GetIdentifier().ToString().c_str())
<< callback;
}
void VerifyState(Callback callback,
@@ -2591,7 +2587,7 @@ class SubresourceResponseTest : public RoutingTestHandler {
const bool subframe_;
int browser_id_ = 0;
int64_t frame_id_ = 0;
std::string frame_id_;
uint64_t request_id_ = 0U;
int resource_handler_created_ct_ = 0;