Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/web/WebSharedWorkerImpl.h

 /*
  * 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 24 matching lines @@
 
 #include "core/dom/ExecutionContext.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThread.h"
 #include "public/platform/WebAddressSpace.h"
 #include "public/web/WebContentSecurityPolicy.h"
 #include "public/web/WebDevToolsAgentClient.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebSharedWorkerClient.h"
+#include "public/web/WebWidgetClient.h"
 #include "wtf/RefPtr.h"
 #include <memory>
 
 namespace blink {
 
 class ConsoleMessage;
 class ParentFrameTaskRunners;
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
+class WebFrameWidget;
 class WebLocalFrameImpl;
 class WebServiceWorkerNetworkProvider;
 class WebSharedWorkerClient;
 class WebString;
 class WebURL;
 class WebView;
 class WorkerInspectorProxy;
 class WorkerScriptLoader;
 
 // This class is used by the worker process code to talk to the SharedWorker
 // implementation.
 // It can't use it directly since it uses WebKit types, so this class converts
 // the data types.  When the SharedWorker object wants to call
 // WorkerReportingProxy, this class will convert to Chrome data types first and
 // then call the supplied WebCommonWorkerClient.
 class WebSharedWorkerImpl final
     : public WorkerReportingProxy
     , public WebFrameClient
     , public WebSharedWorker
     , public WebDevToolsAgentClient
-    , private WorkerLoaderProxyProvider {
+    , private WorkerLoaderProxyProvider
+    // TODO(falken): Remove once worker doesn't do layout anymore. See https://crbug/538751.
+    , private WebWidgetClient {
 public:
     explicit WebSharedWorkerImpl(WebSharedWorkerClient*);
 
     // WorkerReportingProxy methods:
     void reportException(const WTF::String&, std::unique_ptr<SourceLocation>, int exceptionId) override;
     void reportConsoleMessage(MessageSource, MessageLevel, const String& message, SourceLocation*) override;
     void postMessageToPageInspector(const WTF::String&) override;
     void didEvaluateWorkerScript(bool success) override { }
     void didCloseWorkerGlobalScope() override;
     void willDestroyWorkerGlobalScope() override { }
@@ skipping 46 matching lines @@
 
     void postMessageToPageInspectorOnMainThread(const String& message);
 
     // WorkerLoaderProxyProvider
     void postTaskToLoader(const WebTraceLocation&, std::unique_ptr<ExecutionContextTask>) override;
     void postTaskToWorkerGlobalScope(const WebTraceLocation&, std::unique_ptr<ExecutionContextTask>) override;
 
     // 'shadow page' - created to proxy loading requests from the worker.
     Persistent<ExecutionContext> m_loadingDocument;
     WebView* m_webView;
+    WebFrameWidget* m_webFrameWidget;
     Persistent<WebLocalFrameImpl> m_mainFrame;
     bool m_askedToTerminate;
 
     // This one is bound to and used only on the main thread.
     std::unique_ptr<WebServiceWorkerNetworkProvider> m_networkProvider;
 
     Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
 
     Persistent<ParentFrameTaskRunners> m_mainThreadTaskRunners;
 
@@ skipping 10 matching lines @@
     RefPtr<WorkerLoaderProxy> m_loaderProxy;
 
     WebURL m_url;
     WebString m_name;
     WebAddressSpace m_creationAddressSpace;
 };
 
 } // namespace blink
 
 #endif // WebSharedWorkerImpl_h