Oilpan: fix WorkerThreadStartupData finalization handling.

Source/core/workers/WorkerThreadStartupData.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 27 matching lines @@
 #include "core/workers/WorkerThread.h"
 #include "platform/network/ContentSecurityPolicyParsers.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/Forward.h"
 #include "wtf/Noncopyable.h"
 
 namespace blink {
 
 class WorkerClients;
 
-class CORE_EXPORT WorkerThreadStartupData final : public NoBaseWillBeGarbageCollectedFinalized<WorkerThreadStartupData> {
+class CORE_EXPORT WorkerThreadStartupData final {
     WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData);
-    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED(WorkerThreadStartupData);
+    WTF_MAKE_FAST_ALLOCATED(WorkerThreadStartupData);
 public:
-    static PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, const SecurityOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault)
+    static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, const SecurityOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault)
     {
-        return adoptPtrWillBeNoop(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicy, contentSecurityPolicyType, starterOrigin, workerClients, v8CacheOptions));
+        return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicy, contentSecurityPolicyType, starterOrigin, workerClients, v8CacheOptions));
     }
 
     ~WorkerThreadStartupData();
 
     KURL m_scriptURL;
     String m_userAgent;
     String m_sourceCode;
     OwnPtr<Vector<char>> m_cachedMetaData;
     WorkerThreadStartMode m_startMode;
     String m_contentSecurityPolicy;
     ContentSecurityPolicyHeaderType m_contentSecurityPolicyType;
 
     // The SecurityOrigin of the Document creating a Worker may have
     // been configured with extra policy privileges when it was created
     // (e.g., enforce path-based file:// origins.)
     // To ensure that these are transferred to the origin of a new worker
     // global scope, supply the Document's SecurityOrigin as the
     // 'starter origin'.
     //
     // Ownership of this optional starter origin remain with the caller,
     // and is assumed to stay alive until the new Worker thread has been
     // initialized.
     //
     // See SecurityOrigin::transferPrivilegesFrom() for details on what
     // privileges are transferred.
     const SecurityOrigin* m_starterOrigin;
-    OwnPtrWillBeMember<WorkerClients> m_workerClients;
+
+    // This object is created and initialized on the thread creating
+    // a new worker context, but ownership of it and this WorkerThreadStartupData
+    // structure is passed along to the new worker thread, where it is finalized.
+    //
+    // Hence, CrossThreadPersistent<> is required to allow finalization
+    // to happen on a thread different than the thread creating the
+    // persistent reference.
+    OwnPtrWillBeCrossThreadPersistent<WorkerClients> m_workerClients;
 
     V8CacheOptions m_v8CacheOptions;
 
-    DECLARE_TRACE();
-
 private:
     WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicyHeaderType contentSecurityPolicyType, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>, V8CacheOptions);
 };
 
 } // namespace blink
 
 #endif // WorkerThreadStartupData_h