| Index: third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp b/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
|
| index 73c1b65eae7e909e3c67d43e77b7aad96d22c5d4..39b4b2807488638d14b09d8ac2d88e9b784e7488 100644
|
| --- a/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/LocalFrameClientImpl.cpp
|
| @@ -525,7 +525,9 @@ NavigationPolicy LocalFrameClientImpl::decidePolicyForNavigation(
|
| NavigationPolicy policy,
|
| bool replacesCurrentHistoryItem,
|
| bool isClientRedirect,
|
| - HTMLFormElement* form) {
|
| + HTMLFormElement* form,
|
| + ContentSecurityPolicyDisposition
|
| + shouldCheckMainWorldContentSecurityPolicy) {
|
| if (!m_webFrame->client())
|
| return NavigationPolicyIgnore;
|
|
|
| @@ -562,6 +564,9 @@ NavigationPolicy LocalFrameClientImpl::decidePolicyForNavigation(
|
| navigationInfo.isHistoryNavigationInNewChildFrame =
|
| isHistoryNavigationInNewChildFrame;
|
| navigationInfo.isClientRedirect = isClientRedirect;
|
| + navigationInfo.shouldBypassMainWorldCSP =
|
| + shouldCheckMainWorldContentSecurityPolicy ==
|
| + DoNotCheckContentSecurityPolicy;
|
| // Caching could be disabled for requests initiated by DevTools.
|
| // TODO(ananta)
|
| // We should extract the network cache state into a global component which
|
|
|