Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h

 /*
  * 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 21 matching lines @@
 #define WebEmbeddedWorkerImpl_h
 
 #include "core/workers/WorkerLoaderProxy.h"
 
 #include "platform/heap/Handle.h"
 #include "public/web/WebContentSecurityPolicy.h"
 #include "public/web/WebDevToolsAgentClient.h"
 #include "public/web/WebEmbeddedWorker.h"
 #include "public/web/WebEmbeddedWorkerStartData.h"
 #include "public/web/WebFrameClient.h"
+#include "public/web/WebWidgetClient.h"
 #include <memory>
 
 namespace blink {
 
 class ParentFrameTaskRunners;
 class ServiceWorkerGlobalScopeProxy;
 class WebLocalFrameImpl;
+class WebFrameWidget;
 class WebServiceWorkerNetworkProvider;
 class WebView;
 class WorkerInspectorProxy;
 class WorkerScriptLoader;
 class WorkerThread;
 
 class WebEmbeddedWorkerImpl final
     : public WebEmbeddedWorker
     , public WebFrameClient
     , public WebDevToolsAgentClient
-    , private WorkerLoaderProxyProvider {
+    , private WorkerLoaderProxyProvider
+    // TODO(falken): Remove once worker doesn't do layout anymore. See https://crbug/538751.
+    , private WebWidgetClient {
     WTF_MAKE_NONCOPYABLE(WebEmbeddedWorkerImpl);
 public:
     WebEmbeddedWorkerImpl(std::unique_ptr<WebServiceWorkerContextClient>, std::unique_ptr<WebWorkerContentSettingsClientProxy>);
     ~WebEmbeddedWorkerImpl() override;
 
     // WebEmbeddedWorker overrides.
     void startWorkerContext(const WebEmbeddedWorkerStartData&) override;
     void terminateWorkerContext() override;
     void resumeAfterDownload() override;
     void attachDevTools(const WebString& hostId, int sessionId) override;
@@ skipping 40 matching lines @@
     RefPtr<WorkerScriptLoader> m_mainScriptLoader;
 
     Persistent<ParentFrameTaskRunners> m_mainThreadTaskRunners;
 
     std::unique_ptr<WorkerThread> m_workerThread;
     RefPtr<WorkerLoaderProxy> m_loaderProxy;
     Persistent<ServiceWorkerGlobalScopeProxy> m_workerGlobalScopeProxy;
     Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
 
     // 'shadow page' - created to proxy loading requests from the worker.
-    // Both WebView and WebFrame objects are close()'ed (where they're
-    // deref'ed) when this EmbeddedWorkerImpl is destructed, therefore they
-    // are guaranteed to exist while this object is around.
+    // WebView, WebFrameWidget and WebFrame objects are close()'ed (where
+    // they're deref'ed) when this EmbeddedWorkerImpl is destructed, therefore
+    // they are guaranteed to exist while this object is around.
     WebView* m_webView;
+    WebFrameWidget* m_webFrameWidget;
     Persistent<WebLocalFrameImpl> m_mainFrame;
 
     bool m_loadingShadowPage;
     bool m_askedToTerminate;
 
     enum WaitingForDebuggerState {
         WaitingForDebugger,
         NotWaitingForDebugger
     };
 
     enum {
         DontPauseAfterDownload,
         DoPauseAfterDownload,
         IsPausedAfterDownload
     } m_pauseAfterDownloadState;
 
     WaitingForDebuggerState m_waitingForDebuggerState;
 };
 
 } // namespace blink
 
 #endif // WebEmbeddedWorkerImpl_h