Move convertViewportToWindow and convertWindowToViewport from

third_party/WebKit/Source/web/WebSharedWorkerImpl.h

Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.h
diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.h b/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
index 4d810de8b2601b3e50eb9c0c8631626326829b28..eca6b1d648c8405559312b613a95c5014b5cd5fe 100644
--- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
+++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.h
@@ -42,6 +42,7 @@
 #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>
 
@@ -51,6 +52,7 @@ class ConsoleMessage;
 class ParentFrameTaskRunners;
 class WebApplicationCacheHost;
 class WebApplicationCacheHostClient;
+class WebFrameWidget;
 class WebLocalFrameImpl;
 class WebServiceWorkerNetworkProvider;
 class WebSharedWorkerClient;
@@ -71,7 +73,9 @@ class WebSharedWorkerImpl final
     , 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*);
 
@@ -138,6 +142,7 @@ private:
     // '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;