Makes WorkerInspectorProxy work with ExecutionContext instead of Document

third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

 /*
  * Copyright (C) 2009 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 297 matching lines @@
   if (main_script_loader_->Failed()) {
     main_script_loader_->Cancel();
     client_->WorkerScriptLoadFailed();
 
     // The SharedWorker was unable to load the initial script, so
     // shut it down right here.
     delete this;
     return;
   }
 
-  Document* document = main_frame_->GetFrame()->GetDocument();
   // FIXME: this document's origin is pristine and without any extra privileges.
   // (crbug.com/254993)
-  SecurityOrigin* starter_origin = document->GetSecurityOrigin();
+  SecurityOrigin* starter_origin = loading_document_->GetSecurityOrigin();

[falken, 2017/05/15 06:09:35]

To be honest I don't understand this FIXME... what is action we are supposed to
take? The shadow document is not supposed to be "pristine"? And did anything
change now that we use loading_document_ instead of main_frame_->getDocument()?

If you know, could you possibly update the comment?

[kinuko, 2017/05/15 07:26:55]

This SecurityOrigin doesn't correctly reflect some of the frame-level settings
(e.g. GrantUniversalAccess) which could be true in some cases (e.g. in android
webview it looks it's possible to turn it true from what I quickly searched)

And no, it shouldn't change anything by this CL.

I updated the comment to make it slightly clearer.

 
   WorkerClients* worker_clients = WorkerClients::Create();
   ProvideLocalFileSystemToWorker(worker_clients,
                                  LocalFileSystemClient::Create());
   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 =
         client_->CreateWorkerFetchContext(
             WebLocalFrameImpl::FromFrame(main_frame_->GetFrame())
                 ->DataSource()
                 ->GetServiceWorkerNetworkProvider());
     DCHECK(web_worker_fetch_context);
     // TODO(horo): Set more information about the context (ex: DataSaverEnabled)
     // to |web_worker_fetch_context|.
     ProvideWorkerFetchContextToWorker(worker_clients,
                                       std::move(web_worker_fetch_context));
   }
 
   ContentSecurityPolicy* content_security_policy =
       main_script_loader_->ReleaseContentSecurityPolicy();
   WorkerThreadStartMode start_mode =
-      worker_inspector_proxy_->WorkerStartMode(document);
-  std::unique_ptr<WorkerSettings> worker_settings =
-      WTF::WrapUnique(new WorkerSettings(document->GetSettings()));
+      worker_inspector_proxy_->WorkerStartMode(loading_document_);
+  std::unique_ptr<WorkerSettings> worker_settings = WTF::WrapUnique(
+      new WorkerSettings(main_frame_->GetFrame()->GetSettings()));
   WorkerV8Settings worker_v8_settings = WorkerV8Settings::Default();
   worker_v8_settings.atomics_wait_mode_ =
       WorkerV8Settings::AtomicsWaitMode::kAllow;
   std::unique_ptr<WorkerThreadStartupData> startup_data =
       WorkerThreadStartupData::Create(
           url_, loading_document_->UserAgent(),
           main_script_loader_->SourceText(), nullptr, start_mode,
           content_security_policy ? content_security_policy->Headers().get()
                                   : nullptr,
           main_script_loader_->GetReferrerPolicy(), starter_origin,
@@ skipping 65 matching lines @@
   if (devtools_agent)
     devtools_agent->DispatchOnInspectorBackend(session_id, call_id, method,
                                                message);
 }
 
 WebSharedWorker* WebSharedWorker::Create(WebSharedWorkerClient* client) {
   return new WebSharedWorkerImpl(client);
 }
 
 }  // namespace blink