| Index: Source/web/WebLocalFrameImpl.cpp
|
| diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
|
| index 7ebb33a7e731cabca0d0df1e763a80dc5b17293f..e43edb3dc787f588a81b0a62b3339d065d203a3c 100644
|
| --- a/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/Source/web/WebLocalFrameImpl.cpp
|
| @@ -131,7 +131,6 @@
|
| #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"
|
| @@ -778,7 +777,7 @@ void WebLocalFrameImpl::collectGarbage()
|
| bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const
|
| {
|
| ASSERT(frame());
|
| - return !MixedContentChecker::shouldBlockFetch(frame(), WebURLRequest::RequestContextIframe, WebURLRequest::FrameTypeNested, url);
|
| + return frame()->loader().mixedContentChecker()->canFrameInsecureContent(frame()->document()->securityOrigin(), url);
|
| }
|
|
|
| v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebScriptSource& source)
|
|
|