WorkerLoaderProxy: stop accessing cross-thread execution context

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 84 matching lines @@
                            const WebString&) override;
   void resumeStartup() override;
   WebDevToolsAgentClient::WebKitClientMessageLoop* createClientMessageLoop()
       override;
 
   void onScriptLoaderFinished();
   void startWorkerThread();
 
   // WorkerLoaderProxyProvider
   void postTaskToLoader(const WebTraceLocation&,
-                        std::unique_ptr<ExecutionContextTask>) override;
+                        std::unique_ptr<WTF::CrossThreadClosure>) override;
   void postTaskToWorkerGlobalScope(
       const WebTraceLocation&,
       std::unique_ptr<WTF::CrossThreadClosure>) override;
+  ExecutionContext* getLoaderExecutionContext() override;
 
   WebEmbeddedWorkerStartData m_workerStartData;
 
   std::unique_ptr<WebServiceWorkerContextClient> m_workerContextClient;
 
   // This is kept until startWorkerContext is called, and then passed on
   // to WorkerContext.
   std::unique_ptr<WebWorkerContentSettingsClientProxy> m_contentSettingsClient;
 
   // We retain ownership of this one which is for use on the
@@ skipping 11 matching lines @@
   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* m_webView;
 
-  // Accessed cross-thread when worker thread posts tasks to the parent.
-  //
-  // TODO: avoid reaching into the local frame object when posting.
-  CrossThreadPersistent<WebLocalFrameImpl> m_mainFrame;
+  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