Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h

Index: third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
diff --git a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
index 0d38fa2b3fdfe3c2486101fb8b503c8255e4953e..909c6308d2dc5546bdad55b2df917cfb25a2b3b3 100644
--- a/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
+++ b/third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.h
@@ -39,6 +39,7 @@
 #include "public/web/WebEmbeddedWorker.h"
 #include "public/web/WebEmbeddedWorkerStartData.h"
 #include "public/web/WebFrameClient.h"
+#include "public/web/WebWidgetClient.h"
 #include <memory>
 
 namespace blink {
@@ -46,6 +47,7 @@ namespace blink {
 class ParentFrameTaskRunners;
 class ServiceWorkerGlobalScopeProxy;
 class WebLocalFrameImpl;
+class WebFrameWidget;
 class WebServiceWorkerNetworkProvider;
 class WebView;
 class WorkerInspectorProxy;
@@ -56,7 +58,9 @@ 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>);
@@ -117,10 +121,11 @@ private:
     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;