Service worker bypass for resource requests from suborigins

third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

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 04:52:52]

OK the rationale for allowing .controller makes sense. But it's not obvious to
me why we need this code, I'd naively expect the setSkipServiceWorker() call to
do everything. Was this needed for the mem cache thing? Can you add a brief
comment about that?

[jww, 2016/09/20 17:52:26]

Yes, it was needed for the mem cache bit. Otherwise, when the mem cache ID is
reached for, if this returns true, it will set the mem cache id to be that of
the service worker controller (and thus return any resources cached by the
service worker, which is bad since we want to bypass the service worker for
suborigins). See ResourceFetcher::getCacheIdentifier() to see where this occurs.

Adding a comment to clarify all of this.

+
     if (m_documentLoader)
         return frame()->loader().client()->isControlledByServiceWorker(*m_documentLoader);
     // m_documentLoader is null while loading resources from an HTML import.