Expose WebServiceWorkerNetworkProvider on DataSource

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 64 matching lines @@
 #include "platform/mhtml/MHTMLArchive.h"
 #include "platform/network/NetworkStateNotifier.h"
 #include "platform/network/NetworkUtils.h"
 #include "platform/network/ResourceLoadPriority.h"
 #include "platform/network/ResourceTimingInfo.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebInsecureRequestPolicy.h"
 #include "public/platform/WebViewScheduler.h"
+#include "public/platform/modules/serviceworker/WebServiceWorkerNetworkProvider.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 namespace {
 
 void emitWarningForDocWriteScripts(const String& url, Document& document) {
   String message =
       "A Parser-blocking, cross site (i.e. different eTLD+1) script, " + url +
       ", is invoked via document.write. The network request for this script "
@@ skipping 721 matching lines @@
   // service workers on a per-request basis. Additionally, it is necessary to
   // explicitly return |false| here so that it is clear that the SW will be
   // bypassed. In particular, this is important for
   // ResourceFetcher::getCacheIdentifier(), which will return the SW's cache if
   // the context's isControlledByServiceWorker() returns |true|, and thus will
   // returned cached resources from the service worker. That would have the
   // effect of not bypassing the SW.
   if (getSecurityOrigin() && getSecurityOrigin()->hasSuborigin())
     return false;
 
-  return localFrameClient()->isControlledByServiceWorker(
-      *masterDocumentLoader());
+  auto service_worker_network_provider =

[dcheng, 2017/03/10 04:48:38]

auto* here and below as well

[kinuko, 2017/03/10 05:52:29]

Done.

+      masterDocumentLoader()->getServiceWorkerNetworkProvider();
+  return service_worker_network_provider &&
+         service_worker_network_provider->isControlledByServiceWorker();
 }
 
 int64_t FrameFetchContext::serviceWorkerID() const {
   DCHECK(masterDocumentLoader());
-  return localFrameClient()->serviceWorkerID(*masterDocumentLoader());
+  auto service_worker_network_provider =
+      masterDocumentLoader()->getServiceWorkerNetworkProvider();
+  return service_worker_network_provider &&
+         service_worker_network_provider->serviceWorkerID();
 }
 
 bool FrameFetchContext::isMainFrame() const {
   return frame()->isMainFrame();
 }
 
 bool FrameFetchContext::defersLoading() const {
   return frame()->page()->suspended();
 }
 
@@ skipping 205 matching lines @@
                                                     response);
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink