Move WebSharedWorkerImpl to core/exported

Move WebSharedWorkerImpl to core/exported, which requires adding a
callback inside ModulesInitializer to create objects for various
classes in modules/ (LocalFileSystemClient and IndexedDBClient, and
moving both Impl files to modules/ as well). Also added a Create()
method for WebLocalFrame to WebFactory, and minor other required
changes.

This change moves the following classes out of web/:
- WebSharedWorkerImpl -> core/exported
- WebSharedWorkerReportingProxyImpl -> core/workers
- LocalFileSystemClient -> modules/filesystem
- IndexedDBClientImpl -> modules/indexeddb

Bug: 712963
Change-Id: I44b83f02342f179a71fdb15c0f889a0ab41dc878
Reviewed-on: https://chromium-review.googlesource.com/522503
Commit-Queue: Sasha Morrissey <sashab@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Stuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#477575}

third_party/WebKit/Source/core/exported/BUILD.gn

@@ -60,6 +60,8 @@ blink_core_sources("exported") {
     "WebSerializedScriptValue.cpp",
     "WebSettingsImpl.cpp",
     "WebSettingsImpl.h",
+    "WebSharedWorkerImpl.cpp",
+    "WebSharedWorkerImpl.h",
     "WebTextCheckingCompletionImpl.cpp",
     "WebTextCheckingCompletionImpl.h",
     "WebTextCheckingResult.cpp",

third_party/WebKit/Source/core/exported/WebFactory.h

@@ -12,7 +12,13 @@ namespace blink {
 
 class ChromeClient;
 class WebViewBase;
+class WebLocalFrameBase;
 class WebViewClient;
+class WebFrameClient;
+class InterfaceProvider;
+class InterfaceRegistry;
+class WebFrame;
+enum class WebTreeScopeType;
 
 // WebFactory is a temporary class implemented in web/ that allows classes to
 // construct interfaces that are being moved out of web/.
@@ -24,6 +30,12 @@ class CORE_EXPORT WebFactory {
   virtual ChromeClient* CreateChromeClient(WebViewBase*) const = 0;
   virtual WebViewBase* CreateWebViewBase(WebViewClient*,
                                          WebPageVisibilityState) const = 0;
+  virtual WebLocalFrameBase* CreateWebLocalFrameBase(
+      WebTreeScopeType,
+      WebFrameClient*,
+      blink::InterfaceProvider*,
+      blink::InterfaceRegistry*,
+      WebFrame* opener = nullptr) const = 0;
 
  protected:
   // Takes ownership of |factory|.

third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp → third_party/WebKit/Source/core/exported/WebSharedWorkerImpl.cpp

@@ -28,13 +28,15 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "web/WebSharedWorkerImpl.h"
+#include "core/exported/WebSharedWorkerImpl.h"
 
 #include <memory>
 #include "core/dom/Document.h"
 #include "core/dom/TaskRunnerHelper.h"
 #include "core/events/MessageEvent.h"
 #include "core/exported/WebDataSourceImpl.h"
+#include "core/exported/WebFactory.h"
+#include "core/exported/WebViewBase.h"
 #include "core/frame/WebLocalFrameBase.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/loader/FrameLoadRequest.h"
@@ -73,11 +75,21 @@
 #include "public/web/WebSettings.h"
 #include "public/web/WebView.h"
 #include "public/web/WebWorkerContentSettingsClientProxy.h"
-#include "web/IndexedDBClientImpl.h"
-#include "web/LocalFileSystemClient.h"
 
 namespace blink {
 
+namespace {
+
+// Vector of callbacks for the OnScriptLoaderFinished method.
+using WorkerClientsCreatedCallbackVector =
+    WTF::Vector<WebSharedWorkerImpl::WorkerClientsCreatedCallback>;
+WorkerClientsCreatedCallbackVector& GetWorkerClientsCreatedCallbackVector() {
+  DEFINE_STATIC_LOCAL(WorkerClientsCreatedCallbackVector, callback_vector, ());
+  return callback_vector;
+}
+
+}  // namespace
+
 // TODO(toyoshim): Share implementation with WebEmbeddedWorkerImpl as much as
 // possible.
 
@@ -127,7 +139,8 @@ void WebSharedWorkerImpl::InitializeLoader(bool data_saver_enabled) {
   // loading requests from the worker context to the rest of WebKit and Chromium
   // infrastructure.
   DCHECK(!web_view_);
-  web_view_ = WebView::Create(nullptr, kWebPageVisibilityStateVisible);
+  web_view_ = WebFactory::GetInstance().CreateWebViewBase(
+      nullptr, kWebPageVisibilityStateVisible);
   // FIXME: http://crbug.com/363843. This needs to find a better way to
   // not create graphics layers.
   web_view_->GetSettings()->SetAcceleratedCompositingEnabled(false);
@@ -135,9 +148,9 @@ void WebSharedWorkerImpl::InitializeLoader(bool data_saver_enabled) {
   // FIXME: Settings information should be passed to the Worker process from
   // Browser process when the worker is created (similar to
   // RenderThread::OnCreateNewView).
-  main_frame_ = ToWebLocalFrameBase(WebLocalFrame::Create(
+  main_frame_ = WebFactory::GetInstance().CreateWebLocalFrameBase(
       WebTreeScopeType::kDocument, this,
-      Platform::Current()->GetInterfaceProvider(), nullptr));
+      Platform::Current()->GetInterfaceProvider(), nullptr);
   web_view_->SetMainFrame(main_frame_.Get());
   main_frame_->SetDevToolsAgentClient(this);
 
@@ -250,6 +263,11 @@ void WebSharedWorkerImpl::DidTerminateWorkerThread() {
   delete this;
 }
 
+void WebSharedWorkerImpl::RegisterWorkerClientsCreatedCallback(
+    WorkerClientsCreatedCallback callback) {
+  GetWorkerClientsCreatedCallbackVector().push_back(callback);
+}
+
 void WebSharedWorkerImpl::Connect(
     std::unique_ptr<WebMessagePortChannel> web_channel) {
   DCHECK(IsMainThread());
@@ -320,15 +338,16 @@ void WebSharedWorkerImpl::OnScriptLoaderFinished() {
   SecurityOrigin* starter_origin = loading_document_->GetSecurityOrigin();
 
   WorkerClients* worker_clients = WorkerClients::Create();
-  ProvideLocalFileSystemToWorker(worker_clients,
-                                 LocalFileSystemClient::Create());
+  DCHECK(!GetWorkerClientsCreatedCallbackVector().IsEmpty());
+  for (auto& callback : GetWorkerClientsCreatedCallbackVector()) {
+    callback(worker_clients);
+  }
+
   WebSecurityOrigin web_security_origin(loading_document_->GetSecurityOrigin());
   ProvideContentSettingsClientToWorker(
       worker_clients,
       WTF::WrapUnique(client_->CreateWorkerContentSettingsClientProxy(
           web_security_origin)));
-  ProvideIndexedDBClientToWorker(worker_clients,
-                                 IndexedDBClientImpl::Create(*worker_clients));
 
   if (RuntimeEnabledFeatures::OffMainThreadFetchEnabled()) {
     std::unique_ptr<WebWorkerFetchContext> web_worker_fetch_context =
@@ -427,9 +446,10 @@ void WebSharedWorkerImpl::DispatchDevToolsMessage(int session_id,
   if (asked_to_terminate_)
     return;
   WebDevToolsAgent* devtools_agent = main_frame_->DevToolsAgent();
-  if (devtools_agent)
+  if (devtools_agent) {
     devtools_agent->DispatchOnInspectorBackend(session_id, call_id, method,
                                                message);
+  }
 }
 
 WebSharedWorker* WebSharedWorker::Create(WebSharedWorkerClient* client) {

third_party/WebKit/Source/web/WebSharedWorkerImpl.h → third_party/WebKit/Source/core/exported/WebSharedWorkerImpl.h

@@ -34,7 +34,9 @@
 #include "public/web/WebSharedWorker.h"
 
 #include <memory>
+#include "core/CoreExport.h"
 #include "core/dom/ExecutionContext.h"
+#include "core/workers/WebSharedWorkerReportingProxyImpl.h"
 #include "core/workers/WorkerThread.h"
 #include "platform/wtf/RefPtr.h"
 #include "public/platform/Platform.h"
@@ -43,7 +45,6 @@
 #include "public/web/WebDevToolsAgentClient.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebSharedWorkerClient.h"
-#include "web/WebSharedWorkerReportingProxyImpl.h"
 
 namespace blink {
 
@@ -55,6 +56,7 @@ class WebSharedWorkerClient;
 class WebString;
 class WebURL;
 class WebView;
+class WorkerClients;
 class WorkerInspectorProxy;
 class WorkerScriptLoader;
 
@@ -115,6 +117,14 @@ class WebSharedWorkerImpl final : public WebFrameClient,
   void DidCloseWorkerGlobalScope();
   void DidTerminateWorkerThread();
 
+  using WorkerClientsCreatedCallback = void (*)(WorkerClients*);
+  // Allows for the registration of a callback that is invoked whenever a new
+  // OnScriptLoaderFinished is called. Callbacks are executed in the order that
+  // they were added using RegisterWorkerClientsCreatedCallback, and there are
+  // no checks for adding a callback multiple times.
+  CORE_EXPORT static void RegisterWorkerClientsCreatedCallback(
+      WorkerClientsCreatedCallback);
+
  private:
   ~WebSharedWorkerImpl() override;
 

third_party/WebKit/Source/core/workers/BUILD.gn

@@ -45,6 +45,8 @@ blink_core_sources("workers") {
     "ThreadedWorkletMessagingProxy.h",
     "ThreadedWorkletObjectProxy.cpp",
     "ThreadedWorkletObjectProxy.h",
+    "WebSharedWorkerReportingProxyImpl.cpp",
+    "WebSharedWorkerReportingProxyImpl.h",
     "Worker.cpp",
     "Worker.h",
     "WorkerBackingThread.cpp",

third_party/WebKit/Source/web/WebSharedWorkerReportingProxyImpl.cpp → third_party/WebKit/Source/core/workers/WebSharedWorkerReportingProxyImpl.cpp

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "web/WebSharedWorkerReportingProxyImpl.h"
+#include "core/workers/WebSharedWorkerReportingProxyImpl.h"
 
 #include "bindings/core/v8/SourceLocation.h"
+#include "core/exported/WebSharedWorkerImpl.h"
 #include "platform/CrossThreadFunctional.h"
 #include "platform/wtf/WTF.h"
 #include "public/platform/WebTraceLocation.h"
-#include "web/WebSharedWorkerImpl.h"
 
 namespace blink {
 

third_party/WebKit/Source/modules/ModulesInitializer.cpp

@@ -8,10 +8,12 @@
 #include "core/EventTypeNames.h"
 #include "core/css/CSSPaintImageGenerator.h"
 #include "core/dom/Document.h"
+#include "core/exported/WebSharedWorkerImpl.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/offscreencanvas/OffscreenCanvas.h"
+#include "core/workers/WorkerContentSettingsClient.h"
 #include "modules/EventModulesFactory.h"
 #include "modules/EventModulesNames.h"
 #include "modules/EventTargetModulesNames.h"
@@ -23,7 +25,9 @@
 #include "modules/csspaint/CSSPaintImageGeneratorImpl.h"
 #include "modules/document_metadata/CopylessPasteServer.h"
 #include "modules/filesystem/DraggedIsolatedFileSystemImpl.h"
+#include "modules/filesystem/LocalFileSystemClient.h"
 #include "modules/imagebitmap/ImageBitmapRenderingContext.h"
+#include "modules/indexeddb/IndexedDBClientImpl.h"
 #include "modules/installation/InstallationServiceImpl.h"
 #include "modules/media_controls/MediaControlsImpl.h"
 #include "modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.h"
@@ -34,6 +38,8 @@
 #include "platform/mojo/MojoHelper.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/InterfaceRegistry.h"
+#include "public/platform/WebSecurityOrigin.h"
+#include "public/web/WebWorkerContentSettingsClientProxy.h"
 
 namespace blink {
 
@@ -97,6 +103,17 @@ void ModulesInitializer::Initialize() {
         &AppBannerController::BindMojoRequest, WrapWeakPersistent(frame)));
   });
 
+  // WebSharedWorkerImpl callbacks for modules initialization.
+  // TODO(nhiroki): Implement a common mechanism to set up WorkerClients
+  // (https://crbug.com/729500).
+  WebSharedWorkerImpl::RegisterWorkerClientsCreatedCallback(
+      [](WorkerClients* worker_clients) {
+        ProvideLocalFileSystemToWorker(worker_clients,
+                                       LocalFileSystemClient::Create());
+        ProvideIndexedDBClientToWorker(
+            worker_clients, IndexedDBClientImpl::Create(*worker_clients));
+      });
+
   HTMLMediaElement::RegisterMediaControlsFactory(
       WTF::MakeUnique<MediaControlsImpl::Factory>());
 

third_party/WebKit/Source/modules/filesystem/BUILD.gn

@@ -60,6 +60,8 @@ blink_modules_sources("filesystem") {
     "HTMLInputElementFileSystem.h",
     "LocalFileSystem.cpp",
     "LocalFileSystem.h",
+    "LocalFileSystemClient.cpp",
+    "LocalFileSystemClient.h",
     "Metadata.h",
     "MetadataCallback.h",
     "SyncCallbackHelper.h",

third_party/WebKit/Source/web/LocalFileSystemClient.cpp → third_party/WebKit/Source/modules/filesystem/LocalFileSystemClient.cpp

@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "web/LocalFileSystemClient.h"
+#include "modules/filesystem/LocalFileSystemClient.h"
 
 #include <memory>
 #include "core/dom/Document.h"

third_party/WebKit/Source/web/LocalFileSystemClient.h → third_party/WebKit/Source/modules/filesystem/LocalFileSystemClient.h

@@ -32,6 +32,7 @@
 #define LocalFileSystemClient_h
 
 #include <memory>
+#include "modules/ModulesExport.h"
 #include "modules/filesystem/FileSystemClient.h"
 #include "platform/wtf/Forward.h"
 
@@ -39,7 +40,7 @@ namespace blink {
 
 class LocalFileSystemClient final : public FileSystemClient {
  public:
-  static std::unique_ptr<FileSystemClient> Create();
+  MODULES_EXPORT static std::unique_ptr<FileSystemClient> Create();
 
   ~LocalFileSystemClient() override;
 

third_party/WebKit/Source/modules/indexeddb/BUILD.gn

@@ -61,6 +61,8 @@ blink_modules_sources("indexeddb") {
     "IndexedDB.h",
     "IndexedDBClient.cpp",
     "IndexedDBClient.h",
+    "IndexedDBClientImpl.cpp",
+    "IndexedDBClientImpl.h",
     "InspectorIndexedDBAgent.cpp",
     "InspectorIndexedDBAgent.h",
     "WebIDBCallbacksImpl.cpp",

third_party/WebKit/Source/web/IndexedDBClientImpl.cpp → third_party/WebKit/Source/modules/indexeddb/IndexedDBClientImpl.cpp

@@ -26,7 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "web/IndexedDBClientImpl.h"
+#include "modules/indexeddb/IndexedDBClientImpl.h"
 
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/Document.h"

third_party/WebKit/Source/web/IndexedDBClientImpl.h → third_party/WebKit/Source/modules/indexeddb/IndexedDBClientImpl.h

@@ -29,6 +29,7 @@
 #ifndef IndexedDBClientImpl_h
 #define IndexedDBClientImpl_h
 
+#include "modules/ModulesExport.h"
 #include "modules/indexeddb/IndexedDBClient.h"
 
 namespace blink {
@@ -42,8 +43,8 @@ class ExecutionContext;
 // for the main thread.
 class IndexedDBClientImpl final : public IndexedDBClient {
  public:
-  static IndexedDBClient* Create(LocalFrame&);
-  static IndexedDBClient* Create(WorkerClients&);
+  MODULES_EXPORT static IndexedDBClient* Create(LocalFrame&);
+  MODULES_EXPORT static IndexedDBClient* Create(WorkerClients&);
 
   bool AllowIndexedDB(ExecutionContext*, const String& name) override;
 

third_party/WebKit/Source/web/BUILD.gn

@@ -55,14 +55,10 @@ component("web") {
     "ExternalPopupMenu.h",
     "FullscreenController.cpp",
     "FullscreenController.h",
-    "IndexedDBClientImpl.cpp",
-    "IndexedDBClientImpl.h",
     "InspectorOverlayAgent.cpp",
     "InspectorOverlayAgent.h",
     "LinkHighlightImpl.cpp",
     "LinkHighlightImpl.h",
-    "LocalFileSystemClient.cpp",
-    "LocalFileSystemClient.h",
     "LocalFrameClientImpl.cpp",
     "LocalFrameClientImpl.h",
     "MediaKeysClientImpl.cpp",
@@ -134,10 +130,6 @@ component("web") {
     "WebRemoteFrameImpl.h",
     "WebScopedWindowFocusAllowedIndicator.cpp",
     "WebSearchableFormData.cpp",
-    "WebSharedWorkerImpl.cpp",
-    "WebSharedWorkerImpl.h",
-    "WebSharedWorkerReportingProxyImpl.cpp",
-    "WebSharedWorkerReportingProxyImpl.h",
     "WebSurroundingText.cpp",
     "WebViewImpl.cpp",
     "WebViewImpl.h",

third_party/WebKit/Source/web/ChromeClientImpl.cpp

@@ -65,6 +65,8 @@
 #include "modules/accessibility/AXObjectImpl.h"
 #include "modules/audio_output_devices/AudioOutputDeviceClient.h"
 #include "modules/audio_output_devices/AudioOutputDeviceClientImpl.h"
+#include "modules/filesystem/LocalFileSystemClient.h"
+#include "modules/indexeddb/IndexedDBClientImpl.h"
 #include "modules/installedapp/InstalledAppController.h"
 #include "modules/mediastream/UserMediaController.h"
 #include "modules/navigatorcontentutils/NavigatorContentUtils.h"
@@ -117,8 +119,6 @@
 #include "web/ColorChooserUIController.h"
 #include "web/ExternalDateTimeChooser.h"
 #include "web/ExternalPopupMenu.h"
-#include "web/IndexedDBClientImpl.h"
-#include "web/LocalFileSystemClient.h"
 #include "web/NavigatorContentUtilsClientImpl.h"
 #include "web/PopupMenuImpl.h"
 #include "web/WebFrameWidgetImpl.h"

third_party/WebKit/Source/web/DedicatedWorkerMessagingProxyProviderImpl.cpp

@@ -38,14 +38,14 @@
 #include "core/workers/Worker.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerContentSettingsClient.h"
+#include "modules/filesystem/LocalFileSystemClient.h"
+#include "modules/indexeddb/IndexedDBClientImpl.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebContentSettingsClient.h"
 #include "public/platform/WebString.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebWorkerContentSettingsClientProxy.h"
-#include "web/IndexedDBClientImpl.h"
-#include "web/LocalFileSystemClient.h"
 
 namespace blink {
 

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

@@ -50,6 +50,7 @@
 #include "core/workers/WorkerInspectorProxy.h"
 #include "core/workers/WorkerScriptLoader.h"
 #include "core/workers/WorkerThreadStartupData.h"
+#include "modules/indexeddb/IndexedDBClientImpl.h"
 #include "modules/serviceworkers/ServiceWorkerContainerClient.h"
 #include "modules/serviceworkers/ServiceWorkerThread.h"
 #include "platform/Histogram.h"
@@ -74,7 +75,6 @@
 #include "public/web/WebView.h"
 #include "public/web/WebWorkerContentSettingsClientProxy.h"
 #include "public/web/modules/serviceworker/WebServiceWorkerContextClient.h"
-#include "web/IndexedDBClientImpl.h"
 #include "web/ServiceWorkerGlobalScopeClientImpl.h"
 #include "web/ServiceWorkerGlobalScopeProxy.h"
 

third_party/WebKit/Source/web/WebFactoryImpl.cpp

@@ -4,6 +4,7 @@
 
 #include "web/WebFactoryImpl.h"
 #include "web/ChromeClientImpl.h"
+#include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
@@ -21,4 +22,13 @@ WebViewBase* WebFactoryImpl::CreateWebViewBase(
     WebPageVisibilityState state) const {
   return WebViewImpl::Create(client, state);
 }
+
+WebLocalFrameBase* WebFactoryImpl::CreateWebLocalFrameBase(
+    WebTreeScopeType type,
+    WebFrameClient* client,
+    blink::InterfaceProvider* provider,
+    blink::InterfaceRegistry* registry,
+    WebFrame* opener) const {
+  return WebLocalFrameImpl::Create(type, client, provider, registry, opener);
+}
 }

third_party/WebKit/Source/web/WebFactoryImpl.h

@@ -20,6 +20,12 @@ class WebFactoryImpl : public WebFactory {
   ChromeClient* CreateChromeClient(WebViewBase*) const override;
   WebViewBase* CreateWebViewBase(WebViewClient*,
                                  WebPageVisibilityState) const override;
+  WebLocalFrameBase* CreateWebLocalFrameBase(
+      WebTreeScopeType,
+      WebFrameClient*,
+      blink::InterfaceProvider*,
+      blink::InterfaceRegistry*,
+      WebFrame* opener = nullptr) const override;
 };
 
 }  // namespace blink

third_party/WebKit/public/web/WebFrame.h

@@ -195,7 +195,10 @@ class WebFrame {
   void ClearOpener() { SetOpener(0); }
 
   // Returns the parent frame or 0 if this is a top-most frame.
-  BLINK_EXPORT WebFrame* Parent() const;
+  // TODO(sashab): "Virtual" is needed here temporarily to resolve linker errors
+  // in core/. Remove the "virtual" keyword once WebFrame and WebLocalFrameImpl
+  // have been moved to core/.
+  BLINK_EXPORT virtual WebFrame* Parent() const;
 
   // Returns the top-most frame in the hierarchy containing this frame.
   BLINK_EXPORT WebFrame* Top() const;