| Index: Source/web/WebLocalFrameImpl.cpp
|
| diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
|
| index 51dbda1174f57616c369647799959cdc8a7106d3..a4ef3ca69934b7c524ef56777bdbae44b3460cab 100644
|
| --- a/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/Source/web/WebLocalFrameImpl.cpp
|
| @@ -118,6 +118,7 @@
|
| #include "core/loader/FrameLoadRequest.h"
|
| #include "core/loader/FrameLoader.h"
|
| #include "core/loader/HistoryItem.h"
|
| +#include "core/loader/MixedContentChecker.h"
|
| #include "core/loader/SubstituteData.h"
|
| #include "core/page/Chrome.h"
|
| #include "core/page/EventHandler.h"
|
| @@ -753,7 +754,7 @@ void WebLocalFrameImpl::collectGarbage()
|
| bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const
|
| {
|
| ASSERT(frame());
|
| - return frame()->loader().mixedContentChecker()->canFrameInsecureContent(frame()->document()->securityOrigin(), url);
|
| + return !MixedContentChecker::shouldBlockFetch(frame(), WebURLRequest::RequestContextIframe, WebURLRequest::FrameTypeNested, url);
|
| }
|
|
|
| v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebScriptSource& source)
|
|
|