Chromium Code Reviews| Index: Source/core/loader/MixedContentChecker.cpp |
| diff --git a/Source/core/loader/MixedContentChecker.cpp b/Source/core/loader/MixedContentChecker.cpp |
| index ea0c172a059dc2be2d59240bafc1023be6195208..6ff2f61a86a7248abff63bb19d800b67c3ff1558 100644 |
| --- a/Source/core/loader/MixedContentChecker.cpp |
| +++ b/Source/core/loader/MixedContentChecker.cpp |
| @@ -213,7 +213,7 @@ void MixedContentChecker::logToConsole(LocalFrame* frame, const KURL& url, WebUR |
| } |
| // static |
| -bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, const ResourceRequest& resourceRequest, const KURL& url) |
| +bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, const ResourceRequest& resourceRequest, const KURL& url, MixedContentChecker::SuppressLogType suppressLog) |
| { |
| // No frame, no mixed content: |
| if (!frame) |
| @@ -228,7 +228,7 @@ bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, const ResourceRequ |
| return false; |
| LocalFrame* localTop = toLocalFrame(top); |
| - if (frame != localTop && shouldBlockFetch(localTop, resourceRequest, url)) |
| + if (frame != localTop && shouldBlockFetch(localTop, resourceRequest, url, suppressLog)) |
| return true; |
| } |
| @@ -280,7 +280,8 @@ bool MixedContentChecker::shouldBlockFetch(LocalFrame* frame, const ResourceRequ |
| return true; |
| }; |
| - logToConsole(frame, url, resourceRequest.requestContext(), allowed); |
| + if (suppressLog != SuppressLog) |
|
Mike West
2014/11/14 08:08:17
Nit: I find `== LogIfBlocked` clearer than the dou
kouhei (in TOK)
2014/11/14 09:19:31
Done.
|
| + logToConsole(frame, url, resourceRequest.requestContext(), allowed); |
| return !allowed; |
| } |