WebSocket: Reduce dependencies on Document

This is a preparation CL for enabling to establish WebSocket connections off the
main thread.

This CL reduces dependencies on Document in DocumentWebSocketChannel as a first
step for making it thread-safe. Specifically, this CL replaces GetDocument()
calls with GetExecutionContext() calls, and makes the channel get
SubresourceFilter not from DocumentLoader buf from BaseFetchContext.

Bug: 825740
Change-Id: Ibe49fa09a613818ec972b40a8141f7eecc5a3861
Reviewed-on: https://chromium-review.googlesource.com/981732
Commit-Queue: Hiroki Nakagawa <nhiroki@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Yutaka Hirano <yhirano@chromium.org>
Reviewed-by: Adam Rice <ricea@chromium.org>
Reviewed-by: Tsuyoshi Horo <horo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#546061}

third_party/WebKit/Source/core/loader/BaseFetchContext.h

@@ -50,6 +50,7 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
   void Trace(blink::Visitor*) override;
 
   virtual KURL GetSiteForCookies() const = 0;
+  virtual SubresourceFilter* GetSubresourceFilter() const = 0;
   virtual void CountUsage(WebFeature) const = 0;
   virtual void CountDeprecation(WebFeature) const = 0;
 
@@ -62,7 +63,6 @@ class CORE_EXPORT BaseFetchContext : public FetchContext {
  protected:
   // Used for security checks.
   virtual bool AllowScriptFromSource(const KURL&) const = 0;
-  virtual SubresourceFilter* GetSubresourceFilter() const = 0;
 
   // Note: subclasses are expected to override following methods.
   // Used in the default implementation for CanRequest, CanFollowRedirect

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

@@ -333,6 +333,13 @@ KURL FrameFetchContext::GetSiteForCookies() const {
   return document->SiteForCookies();
 }
 
+SubresourceFilter* FrameFetchContext::GetSubresourceFilter() const {
+  if (IsDetached())
+    return nullptr;
+  DocumentLoader* document_loader = MasterDocumentLoader();
+  return document_loader ? document_loader->GetSubresourceFilter() : nullptr;
+}
+
 LocalFrame* FrameFetchContext::GetFrame() const {
   DCHECK(!IsDetached());
 
@@ -999,13 +1006,6 @@ bool FrameFetchContext::AllowScriptFromSourceWithoutNotifying(
   return true;
 }
 
-SubresourceFilter* FrameFetchContext::GetSubresourceFilter() const {
-  if (IsDetached())
-    return nullptr;
-  DocumentLoader* document_loader = MasterDocumentLoader();
-  return document_loader ? document_loader->GetSubresourceFilter() : nullptr;
-}
-
 bool FrameFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   if (IsDetached())
     return false;

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

@@ -197,8 +197,8 @@ class CORE_EXPORT FrameFetchContext final : public BaseFetchContext {
 
   // BaseFetchContext overrides:
   KURL GetSiteForCookies() const override;
-  bool AllowScriptFromSource(const KURL&) const override;
   SubresourceFilter* GetSubresourceFilter() const override;
+  bool AllowScriptFromSource(const KURL&) const override;
   bool ShouldBlockRequestByInspector(const KURL&) const override;
   void DispatchDidBlockRequest(const ResourceRequest&,
                                const FetchInitiatorInfo&,

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

@@ -109,6 +109,10 @@ KURL WorkerFetchContext::GetSiteForCookies() const {
   return web_context_->SiteForCookies();
 }
 
+SubresourceFilter* WorkerFetchContext::GetSubresourceFilter() const {
+  return subresource_filter_.Get();
+}
+
 bool WorkerFetchContext::AllowScriptFromSource(const KURL&) const {
   // Currently we don't use WorkerFetchContext for loading scripts. So this
   // method must not be called.
@@ -119,10 +123,6 @@ bool WorkerFetchContext::AllowScriptFromSource(const KURL&) const {
   return false;
 }
 
-SubresourceFilter* WorkerFetchContext::GetSubresourceFilter() const {
-  return subresource_filter_.Get();
-}
-
 bool WorkerFetchContext::ShouldBlockRequestByInspector(const KURL& url) const {
   bool should_block_request = false;
   probe::shouldBlockRequest(global_scope_, url, &should_block_request);

third_party/WebKit/Source/core/loader/WorkerFetchContext.h

@@ -35,8 +35,8 @@ class WorkerFetchContext final : public BaseFetchContext {
 
   // BaseFetchContext implementation:
   KURL GetSiteForCookies() const override;
-  bool AllowScriptFromSource(const KURL&) const override;
   SubresourceFilter* GetSubresourceFilter() const override;
+  bool AllowScriptFromSource(const KURL&) const override;
   bool ShouldBlockRequestByInspector(const KURL&) const override;
   void DispatchDidBlockRequest(const ResourceRequest&,
                                const FetchInitiatorInfo&,

third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.cpp

@@ -41,8 +41,6 @@
 #include "core/frame/WebLocalFrameImpl.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/loader/BaseFetchContext.h"
-#include "core/loader/DocumentLoader.h"
-#include "core/loader/FrameLoader.h"
 #include "core/loader/MixedContentChecker.h"
 #include "core/loader/SubresourceFilter.h"
 #include "core/loader/ThreadableLoadingContext.h"
@@ -208,27 +206,24 @@ bool DocumentWebSocketChannel::Connect(
   if (!handle_)
     return false;
 
-  if (GetDocument()) {
-    if (GetDocument()->GetFrame()) {
-      if (MixedContentChecker::ShouldBlockWebSocket(GetDocument()->GetFrame(),
-                                                    url))
-        return false;
-    }
-    if (MixedContentChecker::IsMixedContent(GetDocument()->GetSecurityOrigin(),
-                                            url)) {
-      String message =
-          "Connecting to a non-secure WebSocket server from a secure origin is "
-          "deprecated.";
-      GetDocument()->AddConsoleMessage(ConsoleMessage::Create(
-          kJSMessageSource, kWarningMessageLevel, message));
+  if (GetDocument() && GetDocument()->GetFrame()) {
+    if (MixedContentChecker::ShouldBlockWebSocket(GetDocument()->GetFrame(),
+                                                  url)) {
+      return false;
     }
+    connection_handle_for_scheduler_ = GetDocument()
+                                           ->GetFrame()
+                                           ->GetFrameScheduler()
+                                           ->OnActiveConnectionCreated();
+  }
 
-    if (GetDocument()->GetFrame()) {
-      connection_handle_for_scheduler_ = GetDocument()
-                                             ->GetFrame()
-                                             ->GetFrameScheduler()
-                                             ->OnActiveConnectionCreated();
-    }
+  if (MixedContentChecker::IsMixedContent(
+          GetExecutionContext()->GetSecurityOrigin(), url)) {
+    String message =
+        "Connecting to a non-secure WebSocket server from a secure origin is "
+        "deprecated.";
+    GetExecutionContext()->AddConsoleMessage(ConsoleMessage::Create(
+        kJSMessageSource, kWarningMessageLevel, message));
   }
 
   url_ = url;
@@ -245,7 +240,7 @@ bool DocumentWebSocketChannel::Connect(
   // failure blocks the worker thread which should be avoided. Note that
   // returning "true" just indicates that this was not a mixed content error.
   if (ShouldDisallowConnection(url)) {
-    GetDocument()
+    GetExecutionContext()
         ->GetTaskRunner(TaskType::kNetworking)
         ->PostTask(
             FROM_HERE,
@@ -387,13 +382,12 @@ void DocumentWebSocketChannel::Fail(const String& reason,
                                     MessageLevel level,
                                     std::unique_ptr<SourceLocation> location) {
   NETWORK_DVLOG(1) << this << " Fail(" << reason << ")";
-  if (GetDocument()) {
+  if (GetDocument())
     probe::didReceiveWebSocketFrameError(GetDocument(), identifier_, reason);
-    const String message = "WebSocket connection to '" + url_.ElidedString() +
-                           "' failed: " + reason;
-    GetDocument()->AddConsoleMessage(ConsoleMessage::Create(
-        kJSMessageSource, level, message, std::move(location)));
-  }
+  const String message =
+      "WebSocket connection to '" + url_.ElidedString() + "' failed: " + reason;
+  GetExecutionContext()->AddConsoleMessage(ConsoleMessage::Create(
+      kJSMessageSource, level, message, std::move(location)));
   // |reason| is only for logging and should not be provided for scripts,
   // hence close reason must be empty in tearDownFailedConnection.
   TearDownFailedConnection();
@@ -560,12 +554,16 @@ void DocumentWebSocketChannel::HandleDidClose(bool was_clean,
 }
 
 Document* DocumentWebSocketChannel::GetDocument() {
-  ExecutionContext* context = loading_context_->GetExecutionContext();
+  ExecutionContext* context = GetExecutionContext();
   if (context->IsDocument())
     return ToDocument(context);
   return nullptr;
 }
 
+ExecutionContext* DocumentWebSocketChannel::GetExecutionContext() {
+  return loading_context_->GetExecutionContext();
+}
+
 void DocumentWebSocketChannel::DidConnect(WebSocketHandle* handle,
                                           const String& selected_protocol,
                                           const String& extensions) {
@@ -821,10 +819,8 @@ void DocumentWebSocketChannel::TearDownFailedConnection() {
 
 bool DocumentWebSocketChannel::ShouldDisallowConnection(const KURL& url) {
   DCHECK(handle_);
-  DocumentLoader* loader = GetDocument()->Loader();
-  if (!loader)
-    return false;
-  SubresourceFilter* subresource_filter = loader->GetSubresourceFilter();
+  BaseFetchContext* fetch_context = loading_context_->GetFetchContext();
+  SubresourceFilter* subresource_filter = fetch_context->GetSubresourceFilter();
   if (!subresource_filter)
     return false;
   return !subresource_filter->AllowWebSocketConnection(url);

third_party/WebKit/Source/modules/websockets/DocumentWebSocketChannel.h

@@ -155,8 +155,9 @@ class MODULES_EXPORT DocumentWebSocketChannel final
                       const String& reason);
 
   // This may return nullptr.
-  // TODO(kinuko): Remove dependency to document.
+  // TODO(nhiroki): Remove dependency to document (https://crbug.com/825740).
   Document* GetDocument();
+  ExecutionContext* GetExecutionContext();
 
   // WebSocketHandleClient functions.
   void DidConnect(WebSocketHandle*,