| Index: Source/core/loader/MixedContentChecker.cpp
|
| diff --git a/Source/core/loader/MixedContentChecker.cpp b/Source/core/loader/MixedContentChecker.cpp
|
| index c0b0e6a7b7e6206799fe5c66aeaeda0e9a14342f..5c26f56b6ecc54aa1b70739642c2ebc2ed64cfcd 100644
|
| --- a/Source/core/loader/MixedContentChecker.cpp
|
| +++ b/Source/core/loader/MixedContentChecker.cpp
|
| @@ -112,7 +112,7 @@ MixedContentChecker::ContextType MixedContentChecker::contextTypeFromContext(Web
|
| // Plugins! Oh how dearly we love plugin-loaded content!
|
| case WebURLRequest::RequestContextPlugin: {
|
| Settings* settings = frame->settings();
|
| - return settings || settings->strictMixedContentCheckingForPlugin() ? ContextTypeBlockable : ContextTypeOptionallyBlockable;
|
| + return settings && settings->strictMixedContentCheckingForPlugin() ? ContextTypeBlockable : ContextTypeOptionallyBlockable;
|
| }
|
|
|
| // "Blockable" mixed content
|
|
|