Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(635)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 2099243002: PlzNavigate: properly set the initiator of the navigation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 6107 matching lines...) Expand 10 before | Expand all | Expand 10 after
6118 GetFetchCredentialsModeForWebURLRequest(info.urlRequest)); 6118 GetFetchCredentialsModeForWebURLRequest(info.urlRequest));
6119 DCHECK(GetFetchRedirectModeForWebURLRequest(info.urlRequest) == 6119 DCHECK(GetFetchRedirectModeForWebURLRequest(info.urlRequest) ==
6120 FetchRedirectMode::MANUAL_MODE); 6120 FetchRedirectMode::MANUAL_MODE);
6121 DCHECK(frame_->parent() || 6121 DCHECK(frame_->parent() ||
6122 GetRequestContextFrameTypeForWebURLRequest(info.urlRequest) == 6122 GetRequestContextFrameTypeForWebURLRequest(info.urlRequest) ==
6123 REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL); 6123 REQUEST_CONTEXT_FRAME_TYPE_TOP_LEVEL);
6124 DCHECK(!frame_->parent() || 6124 DCHECK(!frame_->parent() ||
6125 GetRequestContextFrameTypeForWebURLRequest(info.urlRequest) == 6125 GetRequestContextFrameTypeForWebURLRequest(info.urlRequest) ==
6126 REQUEST_CONTEXT_FRAME_TYPE_NESTED); 6126 REQUEST_CONTEXT_FRAME_TYPE_NESTED);
6127 6127
6128 base::Optional<url::Origin> initiator =
nasko 2016/12/16 20:32:42 nit: initiator_origin.
clamy 2016/12/21 14:54:19 Done.
6129 info.urlRequest.requestorOrigin().isNull()
6130 ? base::Optional<url::Origin>()
6131 : base::Optional<url::Origin>(info.urlRequest.requestorOrigin());
6128 BeginNavigationParams begin_navigation_params( 6132 BeginNavigationParams begin_navigation_params(
6129 GetWebURLRequestHeaders(info.urlRequest), 6133 GetWebURLRequestHeaders(info.urlRequest),
6130 GetLoadFlagsForWebURLRequest(info.urlRequest), 6134 GetLoadFlagsForWebURLRequest(info.urlRequest),
6131 info.urlRequest.hasUserGesture(), 6135 info.urlRequest.hasUserGesture(),
6132 info.urlRequest.skipServiceWorker() != 6136 info.urlRequest.skipServiceWorker() !=
6133 blink::WebURLRequest::SkipServiceWorker::None, 6137 blink::WebURLRequest::SkipServiceWorker::None,
6134 GetRequestContextTypeForWebURLRequest(info.urlRequest)); 6138 GetRequestContextTypeForWebURLRequest(info.urlRequest), initiator);
6135 6139
6136 if (!info.form.isNull()) { 6140 if (!info.form.isNull()) {
6137 WebSearchableFormData web_searchable_form_data(info.form); 6141 WebSearchableFormData web_searchable_form_data(info.form);
6138 begin_navigation_params.searchable_form_url = 6142 begin_navigation_params.searchable_form_url =
6139 web_searchable_form_data.url(); 6143 web_searchable_form_data.url();
6140 begin_navigation_params.searchable_form_encoding = 6144 begin_navigation_params.searchable_form_encoding =
6141 web_searchable_form_data.encoding().utf8(); 6145 web_searchable_form_data.encoding().utf8();
6142 } 6146 }
6143 6147
6144 Send(new FrameHostMsg_BeginNavigation( 6148 Send(new FrameHostMsg_BeginNavigation(
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
6679 // event target. Potentially a Pepper plugin will receive the event. 6683 // event target. Potentially a Pepper plugin will receive the event.
6680 // In order to tell whether a plugin gets the last mouse event and which it 6684 // In order to tell whether a plugin gets the last mouse event and which it
6681 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6685 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6682 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6686 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6683 // |pepper_last_mouse_event_target_|. 6687 // |pepper_last_mouse_event_target_|.
6684 pepper_last_mouse_event_target_ = nullptr; 6688 pepper_last_mouse_event_target_ = nullptr;
6685 #endif 6689 #endif
6686 } 6690 }
6687 6691
6688 } // namespace content 6692 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698