Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
index 30d22655ac34043a79a7b0e020b46aef1e801c76..dd64c4b7368ff65c871f23b596fbf76a0a0b5889 100644 |
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
@@ -594,6 +594,10 @@ ResourceRequestBlockedReason FrameFetchContext::canRequestInternal(Resource::Typ |
bool FrameFetchContext::isControlledByServiceWorker() const |
{ |
ASSERT(m_documentLoader || frame()->loader().documentLoader()); |
+ |
+ if (getSecurityOrigin() && getSecurityOrigin()->hasSuborigin()) |
+ return false; |
falken
2016/09/20 03:48:57
Why is this needed?
I'm a little concerned that t
jww
2016/09/20 04:27:47
No, and in fact in a previous CL, we disabled the
falken
2016/09/20 04:52:52
Makes sense to me. Let's go with this and see.
BT
|
+ |
if (m_documentLoader) |
return frame()->loader().client()->isControlledByServiceWorker(*m_documentLoader); |
// m_documentLoader is null while loading resources from an HTML import. |