Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.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 42 matching lines @@
 #include "platform/heap/Handle.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/network/ContentSecurityPolicyResponseHeaders.h"
 #include "platform/network/NetworkUtils.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 #include "public/web/WebConsoleMessage.h"
 #include "public/web/WebDevToolsAgent.h"
+#include "public/web/WebFrameWidget.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebView.h"
 #include "public/web/WebWorkerContentSettingsClientProxy.h"
 #include "public/web/modules/serviceworker/WebServiceWorkerContextClient.h"
 #include "public/web/modules/serviceworker/WebServiceWorkerNetworkProvider.h"
 #include "web/IndexedDBClientImpl.h"
 #include "web/ServiceWorkerGlobalScopeClientImpl.h"
 #include "web/ServiceWorkerGlobalScopeProxy.h"
 #include "web/WebDataSourceImpl.h"
 #include "web/WebLocalFrameImpl.h"
@@ skipping 13 matching lines @@
 {
     DEFINE_STATIC_LOCAL(HashSet<WebEmbeddedWorkerImpl*>, set, ());
     return set;
 }
 
 WebEmbeddedWorkerImpl::WebEmbeddedWorkerImpl(std::unique_ptr<WebServiceWorkerContextClient> client, std::unique_ptr<WebWorkerContentSettingsClientProxy> contentSettingsClient)
     : m_workerContextClient(std::move(client))
     , m_contentSettingsClient(std::move(contentSettingsClient))
     , m_workerInspectorProxy(WorkerInspectorProxy::create())
     , m_webView(nullptr)
+    , m_webFrameWidget(nullptr)
     , m_mainFrame(nullptr)
     , m_loadingShadowPage(false)
     , m_askedToTerminate(false)
     , m_pauseAfterDownloadState(DontPauseAfterDownload)
     , m_waitingForDebuggerState(NotWaitingForDebugger)
 {
     runningWorkerInstances().add(this);
 }
 
 WebEmbeddedWorkerImpl::~WebEmbeddedWorkerImpl()
 {
     // Prevent onScriptLoaderFinished from deleting 'this'.
     m_askedToTerminate = true;
 
     if (m_workerThread)
         m_workerThread->terminateAndWait();
 
     DCHECK(runningWorkerInstances().contains(this));
     runningWorkerInstances().remove(this);
     DCHECK(m_webView);
 
     // Detach the client before closing the view to avoid getting called back.
     m_mainFrame->setClient(0);
 
     if (m_workerGlobalScopeProxy) {
         m_workerGlobalScopeProxy->detach();
         m_workerGlobalScopeProxy.clear();
     }
 
+    m_webFrameWidget->close();
     m_webView->close();
     m_mainFrame->close();
     if (m_loaderProxy)
         m_loaderProxy->detachProvider(this);
 }
 
 void WebEmbeddedWorkerImpl::startWorkerContext(
     const WebEmbeddedWorkerStartData& data)
 {
     DCHECK(!m_askedToTerminate);
@@ skipping 151 matching lines @@
     // Currently we block all mixed-content requests from a ServiceWorker.
     // FIXME: When we support FetchEvent.default(), we should relax this
     // restriction.
     settings->setStrictMixedContentChecking(true);
     settings->setAllowDisplayOfInsecureContent(false);
     settings->setAllowRunningOfInsecureContent(false);
     settings->setDataSaverEnabled(m_workerStartData.dataSaverEnabled);
     m_mainFrame = toWebLocalFrameImpl(WebLocalFrame::create(WebTreeScopeType::Document, this));
     m_webView->setMainFrame(m_mainFrame.get());
     m_mainFrame->setDevToolsAgentClient(this);
+    m_webFrameWidget = WebFrameWidget::create(nullptr, m_webView, m_mainFrame);

[dcheng, 2016/09/08 05:25:47]

I would /really/ like to disallow null clients, because that just means
complexity. +falken, are you OK with just making WebEmbeddedWorkerImpl a no-op
WebWidgetClient?

[falken, 2016/09/08 05:50:39]

I don't totally understand why webFrameWidget is needed for service or shared
worker, they shouldn't need to be "doing layout" as commented above. But maybe
that's what's happening today as a result of the shadow page hack, and it means
we need webFrameWidget to keep making it work (eventually it should be removed
altogether: https://bugs.chromium.org/p/chromium/issues/detail?id=538751).

If we need a webFrameWidget, I don't have an objection with making
WebEmbeddedWorkerImpl a no-op WebWidgetClient to support it.

[lfg, 2016/09/08 21:40:43]

I think for now we can use a WebViewFrameWidget, but that's obviously not an
option long term as we continue to remove widget functionality from WebView. I
think we can reevaluate this as we move along to remove WebViewFrameWidget,
perhaps issue 538751 would be fixed by then.

 
     // If we were asked to wait for debugger then it is the good time to do that.
     m_workerContextClient->workerReadyForInspection();
     if (m_workerStartData.waitForDebuggerMode == WebEmbeddedWorkerStartData::WaitForDebugger) {
         m_waitingForDebuggerState = WaitingForDebugger;
         return;
     }
 
     loadShadowPage();
 }
@@ skipping 138 matching lines @@
     m_mainThreadTaskRunners = ParentFrameTaskRunners::create(nullptr);
 
     m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *document, *m_workerContextClient);
     m_loaderProxy = WorkerLoaderProxy::create(this);
     m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalScopeProxy);
     m_workerThread->start(std::move(startupData));
     m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(), scriptURL);
 }
 
 } // namespace blink