Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update patches from Chromium 76.0.3809.87 to Chromium 77.0.3865.10 #3089

Closed
wants to merge 26 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a289bf5
Update patches from Chromium 76.0.3809.87 to Chromium 77.0.3865.10
mkarolin Jul 24, 2019
70ddd21
Process version shouldn't create a source set.
mkarolin Jul 24, 2019
68ceae3
Updated chrome_constants override with the changes in the original.
mkarolin Jul 25, 2019
3c5b5da
OmniboxInputType::INVALID was renamed to EMPTY.
mkarolin Jul 25, 2019
5990b61
Updated HandleExternalProtocol signature in BraveContentBrowserClient.
mkarolin Jul 31, 2019
df02c7d
Updated signature of BraveExtensionsAPIClient::ShouldHideBrowserNetwo…
mkarolin Jul 31, 2019
7665708
AddRestoredTab now takes a tab group param.
mkarolin Jul 31, 2019
84d8cbd
content/public interfaces are no longer const.
mkarolin Jul 31, 2019
94c08b2
.idl files aren't allowed in GN sources.
mkarolin Aug 2, 2019
466fcc1
Readded code to get top document GURL in NavigationRequest.
mkarolin Aug 2, 2019
bd45597
Moved start of Brave services to BraveBrowserMainExtraParts::PreMainM…
mkarolin Aug 2, 2019
420c35e
PrefProvider::is_incognito_ was renamed to off_the_record_.
mkarolin Aug 2, 2019
591be33
APISignature::ParseArgumentsToJSON signature change.
mkarolin Aug 5, 2019
66a7c6d
ComponentLoader ctor signature change.
mkarolin Aug 5, 2019
40e5d24
SimplifyHttpsIndicator feature is now on by default.
mkarolin Aug 5, 2019
b434c77
Removed Win10 specific welcome UI flow.
mkarolin Aug 6, 2019
7ec6c6c
Signin restructure.
mkarolin Aug 6, 2019
6a2ba54
Use base::Contains instead of ContainsKey.
mkarolin Aug 6, 2019
7e70b0b
IOThread class has been removed.
mkarolin Aug 6, 2019
01aa4b4
Fixes compilation of brave_actions_container.h
mkarolin Aug 6, 2019
6445003
views::BoxLayout orientation is now a class enum.
mkarolin Aug 6, 2019
3d02930
Fixes RenderViewContextMenu override compilation.
mkarolin Aug 6, 2019
f4dc03c
BookmarkChangeProcessor overrides now use size_t.
mkarolin Aug 6, 2019
9221940
BookmarkNode::set_type was removed.
mkarolin Aug 5, 2019
7009ef4
Update strings for 77.0.3865.10.
mkarolin Jul 25, 2019
43ed3c5
TreeNode::GetChild and child_count were removed.
mkarolin Aug 7, 2019
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Prev

TreeNode::GetChild and child_count were removed.

Updated bookmark_change_processor to use children()[] and
children().size() instead. Updated relevant code to use size_t instead of
int.

Chromium changes:

https://chromium.googlesource.com/chromium/src/+/5174590b09badcd86c14d322266039782e94a532

commit 5174590b09badcd86c14d322266039782e94a532
Author: Peter Kasting <pkasting@chromium.org>
Date:   Fri Jun 28 21:54:55 2019 +0000

    Remove TreeNode::GetChild().

    Bug: 956419

https://chromium.googlesource.com/chromium/src/+/b0d21f299ba5fd0c51c26f1f440fb1a006fc4753

commit b0d21f299ba5fd0c51c26f1f440fb1a006fc4753
Author: Peter Kasting <pkasting@chromium.org>
Date:   Tue Jun 25 00:26:16 2019 +0000

    Remove instances of TreeNode::child_count().

    Bug: 956419
  • Loading branch information
mkarolin committed Aug 7, 2019
commit 43ed3c52e9b194e0095b2908f08326d7857f3a7c
@@ -99,15 +99,15 @@ bookmarks::BookmarkPermanentNodeList LoadExtraNodes(
namespace {

void GetOrder(const bookmarks::BookmarkNode* parent,
int index,
size_t index,
std::string* prev_order,
std::string* next_order,
std::string* parent_order) {
DCHECK_GE(index, 0);
auto* prev_node = index == 0 ? nullptr : parent->GetChild(index - 1);
auto* next_node = index == parent->child_count() - 1
DCHECK_LT(index, parent->children().size());
auto* prev_node = index == 0 ? nullptr : parent->children()[index - 1].get();
auto* next_node = index + 1 == parent->children().size()
? nullptr
: parent->GetChild(index + 1);
: parent->children()[index + 1].get();

if (prev_node)
prev_node->GetMetaInfo("order", prev_order);
@@ -119,10 +119,10 @@ void GetOrder(const bookmarks::BookmarkNode* parent,
}

void GetPrevObjectId(const bookmarks::BookmarkNode* parent,
int index,
size_t index,
std::string* prev_object_id) {
DCHECK_GE(index, 0);
auto* prev_node = index == 0 ? nullptr : parent->GetChild(index - 1);
DCHECK_LT(index, parent->children().size());
auto* prev_node = index == 0 ? nullptr : parent->children()[index - 1].get();

if (prev_node)
prev_node->GetMetaInfo("object_id", prev_object_id);
@@ -143,11 +143,11 @@ const bookmarks::BookmarkNode* FindByObjectId(bookmarks::BookmarkModel* model,
return nullptr;
}

uint64_t GetIndexByOrder(const bookmarks::BookmarkNode* root_node,
size_t GetIndexByOrder(const bookmarks::BookmarkNode* root_node,
const std::string& record_order) {
int index = 0;
while (index < root_node->child_count()) {
const bookmarks::BookmarkNode* node = root_node->GetChild(index);
size_t index = 0;
while (index < root_node->children().size()) {
const bookmarks::BookmarkNode* node = root_node->children()[index].get();
std::string node_order;
node->GetMetaInfo("order", &node_order);

@@ -160,7 +160,7 @@ uint64_t GetIndexByOrder(const bookmarks::BookmarkNode* root_node,
return index;
}

uint64_t GetIndex(const bookmarks::BookmarkNode* root_node,
size_t GetIndex(const bookmarks::BookmarkNode* root_node,
const jslib::Bookmark& record) {
return GetIndexByOrder(root_node, record.order);
}
@@ -342,7 +342,7 @@ void BookmarkChangeProcessor::BookmarkNodeRemoved(
CHECK(deleted_node);
bookmarks::BookmarkNodeData data(node);
CloneBookmarkNodeForDelete(data.elements, deleted_node,
deleted_node->child_count());
deleted_node->children().size());
}

void BookmarkChangeProcessor::BookmarkAllUserNodesRemoved(
@@ -383,19 +383,19 @@ void BookmarkChangeProcessor::BookmarkNodeMoved(BookmarkModel* model,
size_t old_index,
const BookmarkNode* new_parent,
size_t new_index) {
auto* node = new_parent->GetChild(new_index);
auto* node = new_parent->children()[new_index].get();
model->DeleteNodeMetaInfo(node, "order");
BookmarkNodeChanged(model, node);
// TODO(darkdh): handle old_parent == new_parent to avoid duplicate order
// clearing. Also https://github.com/brave/sync/issues/231 blocks update to
// another devices
for (int i = old_index; i < old_parent->child_count(); ++i) {
auto* shifted_node = old_parent->GetChild(i);
for (size_t i = old_index; i < old_parent->children().size(); ++i) {
auto* shifted_node = old_parent->children()[i].get();
model->DeleteNodeMetaInfo(shifted_node, "order");
BookmarkNodeChanged(model, shifted_node);
}
for (int i = new_index; i < new_parent->child_count(); ++i) {
auto* shifted_node = new_parent->GetChild(i);
for (size_t i = new_index; i < new_parent->children().size(); ++i) {
auto* shifted_node = new_parent->children()[i].get();
model->DeleteNodeMetaInfo(shifted_node, "order");
BookmarkNodeChanged(model, shifted_node);
}
@@ -444,11 +444,11 @@ void BookmarkChangeProcessor::Reset(bool clear_meta_info) {
void BookmarkChangeProcessor::DeleteSelfAndChildren(
const bookmarks::BookmarkNode* node) {
DCHECK(node->is_folder());
for (int i = 0; i < node->child_count(); ++i) {
if (node->GetChild(i)->is_folder()) {
DeleteSelfAndChildren(node->GetChild(i));
for (size_t i = 0; i < node->children().size(); ++i) {
if (node->children()[i].get()->is_folder()) {
DeleteSelfAndChildren(node->children()[i].get());
} else {
bookmark_model_->Remove(node->GetChild(i));
bookmark_model_->Remove(node->children()[i].get());
}
}
bookmark_model_->Remove(node);
@@ -460,8 +460,8 @@ void ValidateFolderOrders(const bookmarks::BookmarkNode* folder_node) {
// Validate direct children order
std::string left_order;
std::string right_order;
for (auto i = 0; i < folder_node->child_count(); ++i) {
const auto* node = folder_node->GetChild(i);
for (size_t i = 0; i < folder_node->children().size(); ++i) {
const auto* node = folder_node->children()[i].get();
std::string order;
node->GetMetaInfo("order", &order);
if (order.empty()) {
@@ -487,8 +487,8 @@ void ValidateFolderOrders(const bookmarks::BookmarkNode* folder_node) {
if (!compare_result) {
DLOG(ERROR) << "ValidateFolderOrders failed";
DLOG(ERROR) << "folder_node=" << folder_node->GetTitle();
DLOG(ERROR) << "folder_node->child_count()="
<< folder_node->child_count();
DLOG(ERROR) << "folder_node->children().size()="
<< folder_node->children().size();
DLOG(ERROR) << "i=" << i;
DLOG(ERROR) << "left_order=" << left_order;
DLOG(ERROR) << "right_order=" << right_order;
@@ -527,14 +527,14 @@ void BookmarkChangeProcessor::ApplyChangesFromSyncModel(

if (new_parent_node) {
DCHECK(!bookmark_record.order.empty());
int64_t index = GetIndex(new_parent_node, bookmark_record);
size_t index = GetIndex(new_parent_node, bookmark_record);
bookmark_model_->Move(node, new_parent_node, index);
} else if (!bookmark_record.order.empty()) {
std::string order;
node->GetMetaInfo("order", &order);
DCHECK(!order.empty());
if (bookmark_record.order != order) {
int64_t index = GetIndex(node->parent(), bookmark_record);
size_t index = GetIndex(node->parent(), bookmark_record);
bookmark_model_->Move(node, node->parent(), index);
}
}
@@ -606,8 +606,8 @@ void BookmarkChangeProcessor::CompletePendingNodesMove(
std::vector<MoveInfo> move_infos;

bookmarks::BookmarkNode* pending_node_root = GetPendingNodeRoot();
for (int i = 0; i < pending_node_root->child_count(); ++i) {
bookmarks::BookmarkNode* node = pending_node_root->GetChild(i);
for (size_t i = 0; i < pending_node_root->children().size(); ++i) {
bookmarks::BookmarkNode* node = pending_node_root->children()[i].get();

std::string parent_object_id;
node->GetMetaInfo("parent_object_id", &parent_object_id);
@@ -631,7 +631,7 @@ void BookmarkChangeProcessor::CompletePendingNodesMove(
for (auto& move_info : move_infos) {
auto* node = std::get<0>(move_info);
const auto& order = std::get<1>(move_info);
int64_t index = GetIndexByOrder(created_folder_node, order);
size_t index = GetIndexByOrder(created_folder_node, order);

bookmark_model_->Move(node, created_folder_node, index);
// Now we dont need "parent_object_id" metainfo on node, because node
@@ -701,12 +701,14 @@ BookmarkChangeProcessor::BookmarkNodeToSyncBookmark(
bookmark->order = order;

int index = node->parent()->GetIndexOf(node);
DCHECK_GE(index, 0);
std::string prev_object_id;
GetPrevObjectId(node->parent(), index, &prev_object_id);
GetPrevObjectId(node->parent(), static_cast<size_t>(index), &prev_object_id);
bookmark->prevObjectId = prev_object_id;

std::string prev_order, next_order, parent_order;
GetOrder(node->parent(), index, &prev_order, &next_order, &parent_order);
GetOrder(node->parent(), static_cast<size_t>(index), &prev_order, &next_order,
&parent_order);
if (parent_order.empty() && node->parent()->is_permanent_node()) {
int permanent_parent_index = GetPermanentNodeIndex(node->parent());
parent_order = sync_prefs_->GetBookmarksBaseOrder() +
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.