| 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 01a75f363df75ebeea35aad8f01c48a7bccd0706..6c18d8d3f8e60d8ebbad2ff4e063e9ad067f5f48 100644
|
| --- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| @@ -2115,11 +2115,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() {
|
|
|