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

Unified Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2745363004: PlzNavigate: send SourceLocation when mixed content is found (Closed)
Patch Set: Rebase Created 3 years, 9 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/public/web/WebLocalFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index 3fa8a3f555a870bc50c7390dd53538b0398635b4..84646ff8826a6c1a756ae0b580b3e25571219be7 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
@@ -2160,11 +2160,18 @@ void WebLocalFrameImpl::mixedContentFound(
const WebURL& mixedContentUrl,
WebURLRequest::RequestContext requestContext,
bool wasAllowed,
- bool hadRedirect) {
+ bool hadRedirect,
+ const WebSourceLocation& sourceLocation) {
DCHECK(frame());
- MixedContentChecker::mixedContentFound(frame(), mainResourceUrl,
- mixedContentUrl, requestContext,
- wasAllowed, hadRedirect);
+ std::unique_ptr<SourceLocation> source;
+ if (!sourceLocation.url.isNull()) {
+ source =
+ SourceLocation::create(sourceLocation.url, sourceLocation.lineNumber,
+ sourceLocation.columnNumber, nullptr);
+ }
+ MixedContentChecker::mixedContentFound(
+ frame(), mainResourceUrl, mixedContentUrl, requestContext, wasAllowed,
+ hadRedirect, std::move(source));
}
void WebLocalFrameImpl::sendOrientationChangeEvent() {
« no previous file with comments | « third_party/WebKit/Source/web/WebLocalFrameImpl.h ('k') | third_party/WebKit/public/web/WebLocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698