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.100 to Chromium 77.0.3865.19 #3120

Closed
wants to merge 36 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0c70e73
Update patches from Chromium 76.0.3809.87 to Chromium 77.0.3865.19
mkarolin Jul 24, 2019
7150429
Process version shouldn't create a source set.
mkarolin Jul 24, 2019
136e1fe
Updated chrome_constants override with the changes in the original.
mkarolin Jul 25, 2019
626b41b
OmniboxInputType::INVALID was renamed to EMPTY.
mkarolin Jul 25, 2019
e01a9a4
Updated HandleExternalProtocol signature in BraveContentBrowserClient.
mkarolin Jul 31, 2019
2fc72e6
Updated signature of BraveExtensionsAPIClient::ShouldHideBrowserNetwo…
mkarolin Jul 31, 2019
0cdc1d1
AddRestoredTab now takes a tab group param.
mkarolin Jul 31, 2019
e3aa8cb
content/public interfaces are no longer const.
mkarolin Jul 31, 2019
d2b9de6
.idl files aren't allowed in GN sources.
mkarolin Aug 2, 2019
39124f5
Readded code to get top document GURL in NavigationRequest.
mkarolin Aug 2, 2019
d44f660
Moved start of Brave services to BraveBrowserMainExtraParts::PreMainM…
mkarolin Aug 2, 2019
b4c034f
PrefProvider::is_incognito_ was renamed to off_the_record_.
mkarolin Aug 2, 2019
9b43132
APISignature::ParseArgumentsToJSON signature change.
mkarolin Aug 5, 2019
a5b40a3
ComponentLoader ctor signature change.
mkarolin Aug 5, 2019
4815dfe
SimplifyHttpsIndicator feature is now on by default.
mkarolin Aug 5, 2019
1ae164e
Removed Win10 specific welcome UI flow.
mkarolin Aug 6, 2019
0029eb0
Signin restructure.
mkarolin Aug 6, 2019
bd8a2d1
Use base::Contains instead of ContainsKey.
mkarolin Aug 6, 2019
e1b3b7c
IOThread class has been removed.
mkarolin Aug 6, 2019
6b73802
Fixes compilation of brave_actions_container.h
mkarolin Aug 6, 2019
bb83a37
views::BoxLayout orientation is now a class enum.
mkarolin Aug 6, 2019
3c16cc8
BookmarkNode::set_type was removed.
mkarolin Aug 5, 2019
31d0175
Fixes RenderViewContextMenu override compilation.
mkarolin Aug 6, 2019
0e0f4c8
BookmarkChangeProcessor overrides now use size_t.
mkarolin Aug 6, 2019
a2c56a3
TreeNode::GetChild and child_count were removed.
mkarolin Aug 7, 2019
5fe1e32
Enable networking service.
mkarolin Aug 10, 2019
c7653af
Fixes location change of md_select_css.html.
mkarolin Aug 13, 2019
3cc1f42
Unit tests: Fixes MCSClient API signature changes.
mkarolin Aug 12, 2019
5898235
GridLayout::AddView now takes unique_ptr.
mkarolin Aug 13, 2019
762a6a3
GridLayout c'tor signature change.
mkarolin Aug 13, 2019
96a4bf5
Update strings for 77.0.3865.19.
mkarolin Jul 25, 2019
6ce7fa0
Unit tests: fixes GCMDriver c'tor signature change.
mkarolin Aug 12, 2019
eb8c743
Unit tests: Fixes CreateProfileAsyncHelper signature.
mkarolin Aug 12, 2019
9185b40
TEMPORARY: bookmarks workaround. #2010 Pending.
mkarolin Aug 9, 2019
f3a7ed8
TEMPORARY: network delegate workaround. #2988 Pending.
mkarolin Aug 9, 2019
0bf3cec
TEMPORARY: cookies workaround. #3130 Pending.
mkarolin Aug 10, 2019
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Readded code to get top document GURL in NavigationRequest.

We patch NavigationRequest::OnStartChecksComplete to call
MaybeHideReferrer. One of the params to MaybeHideReferrer is top
document GURL which was available in OnStartCheckComplete. The Chromium
change below removed it. Added a chromium_src override that includes
GetTopDocumentGURL function that containes the deleted functionality.

Chromium change:

https://chromium.googlesource.com/chromium/src/+/435bcb58bb2c75be8276f1dde69fc6c9891c45ba

commit 435bcb58bb2c75be8276f1dde69fc6c9891c45ba
Author: Lukasz Anforowicz <lukasza@chromium.org>
Date:   Fri Jul 12 20:50:06 2019 +0000

    Store |initiator_origin| in FrameNavigationEntry.

    Changes in this CL
    ==================

    This CL:

    1. Updates FrameNavigationEntry::UpdateEntry and
       FrameNavigationEntry's constructor so that they both take
       |const base::Optional<url::Origin>& initiator_origin| which
       gets stored in a new FrameNavigationEntry::initiator_origin_ field.

    2. Updates callers of FNE::UpdateEntry and FNE's constructor to
       provide/propagate the initiator as needed.  This includes
       adding an |initiator_origin| parameter to
       - NavigationEntryImpl's constructor
       - NavigationEntryImpl::AddOrUpdateFrameEntry
       - NavigationController::CreateNavigationEntry
       (the list above is not necessarily exhaustive/complete)

    3. Uses the new |FrameNavigationEntry::initiator_origin()| from
       NavigationEntryImpl::ConstructCommonNavigationParams (which
       used to always provide |base::nullopt| initiator for history
       navigations - always treating them as browser-initiated, rather
       than replaying the original initiator).

    The changes above makes sure that the right Sec-Fetch-Site http request header is
    "replayed" during history navigations.  The CL adds browser tests and
    WPT tests to cover the new, desired behavior.

    Follow-up changes
    =================

    This CL does not:

    - Use |FrameNavigationEntry::initiator_origin()| in GetOriginForURLLoaderFactory
      in render_frame_host_impl.cc (this will be done in a follow-up CL at
      https://crrev.com/c/1672176)

    - Handle persisting |FrameNavigationEntry::initiator_origin()| for
      session restore (this is tracked in a separate https://crbug.com/976055).

    Bug: 946503
  • Loading branch information
mkarolin committed Aug 2, 2019
commit 39124f5a09d24734bb4d92fa584e5b3a1e1896bf
@@ -0,0 +1,41 @@
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "content/browser/frame_host/frame_tree.h"
#include "content/browser/frame_host/frame_tree_node.h"
#include "url/gurl.h"

#if defined(OS_ANDROID)
#include "content/browser/frame_host/navigator.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
#endif

namespace {

GURL GetTopDocumentGURL(const content::FrameTreeNode* frame_tree_node) {
GURL gurl;
#if defined(OS_ANDROID)
// On Android, a base URL can be set for the frame. If this the case, it is
// the URL to use for cookies.
content::NavigationEntry* last_committed_entry =
frame_tree_node_->navigator()->GetController()->GetLastCommittedEntry();
if (last_committed_entry)
gurl = last_committed_entry->GetBaseURLForDataURL();
#endif
if (gurl.is_empty())
gurl = frame_tree_node->frame_tree()->root()->current_url();
return gurl;
}

} // namespace

#define BRAVE_ONSTARTCHECKSCOMPLETE_MAYBEHIDEREFERRER \
GetContentClient()->browser()->MaybeHideReferrer( \
browser_context, common_params_.url, \
GetTopDocumentGURL(frame_tree_node_), frame_tree_node_->IsMainFrame(), \
&common_params_.referrer);

#include "../../../../../content/browser/frame_host/navigation_request.cc"
@@ -1,21 +1,12 @@
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
index f8d5c526f2f7074130823267d6615a6bd6298112..3be1a1a13b3ded4d54ac7699b56e8e8f904f8afb 100644
index f8d5c526f2f7074130823267d6615a6bd6298112..848d39fd5dd746644bdc0f80dfa8dd7dda4965d6 100644
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
@@ -1747,9 +1747,16 @@ void NavigationRequest::OnStartChecksComplete(
@@ -1747,6 +1747,7 @@ void NavigationRequest::OnStartChecksComplete(
headers.MergeFrom(navigation_handle_->TakeModifiedRequestHeaders());
begin_params_->headers = headers.ToString();

+ GetContentClient()->browser()->MaybeHideReferrer(browser_context,
+ common_params_.url,
+ top_document_url,
+ frame_tree_node_->IsMainFrame(),
+ &common_params_.referrer);
+
+ BRAVE_ONSTARTCHECKSCOMPLETE_MAYBEHIDEREFERRER
std::vector<std::unique_ptr<NavigationLoaderInterceptor>> interceptor;
if (bundled_exchanges_factory_)
interceptor.push_back(bundled_exchanges_factory_->CreateInterceptor());
+
loader_ = NavigationURLLoader::Create(
browser_context, browser_context->GetResourceContext(), partition,
std::make_unique<NavigationRequestInfo>(
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.