Worker: Fix broken GC logic on Dedicated Worker while DOMTimer is set

third_party/WebKit/Source/core/workers/InProcessWorkerMessagingProxy.h

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 52 matching lines @@
     void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>) override;
     bool hasPendingActivity() const final;
     void workerObjectDestroyed() override;
 
     // These methods come from worker context thread via
     // InProcessWorkerObjectProxy and are called on the parent context thread.
     void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, std::unique_ptr<MessagePortChannelArray>);
     void reportException(const String& errorMessage, std::unique_ptr<SourceLocation>, int exceptionId);
     void reportConsoleMessage(MessageSource, MessageLevel, const String& message, std::unique_ptr<SourceLocation>);
     void postMessageToPageInspector(const String&);
-    void confirmMessageFromWorkerObject(bool hasPendingActivity);
-    void reportPendingActivity(bool hasPendingActivity);
-    void workerThreadTerminated();
+    void confirmMessageFromWorkerObject();
+    virtual void reportPendingActivity(bool hasPendingActivity);
+    virtual void workerThreadTerminated();
     void workerThreadCreated();
 
     ExecutionContext* getExecutionContext() const { return m_executionContext.get(); }
 
     // Number of live messaging proxies, used by leak detection.
     static int proxyCount();
 
 protected:
-    InProcessWorkerMessagingProxy(InProcessWorkerBase*, WorkerClients*);
+    InProcessWorkerMessagingProxy(ExecutionContext*, InProcessWorkerBase*, WorkerClients*);

[kinuko, 2016/08/05 14:55:29]

Does this start to take ExecutionContext* separately only for testing? 
Alternatively we could add a test-only private constructor or override
getExecutionContext() instead?

[nhiroki, 2016/08/08 09:19:13]

Yes, this change is only for testing. Some tests create a messaging proxy with
null InProcessWorkerBase* and that results in a crash on the ctor
(|workerObject->getExecutionContext()|), so I made this change.

Instead of the approach, I added a private ctor that can accept a null
WorkerObjectBase, and then made the proper ctor and tests call it.

     ~InProcessWorkerMessagingProxy() override;
 
     virtual std::unique_ptr<WorkerThread> createWorkerThread(double originTime) = 0;
 
     PassRefPtr<WorkerLoaderProxy> loaderProxy() { return m_loaderProxy; }
     InProcessWorkerObjectProxy& workerObjectProxy() { return *m_workerObjectProxy.get(); }
 
+    std::unique_ptr<WorkerThread> m_workerThread;
+
+    // The latest confirmation from worker thread reported that it was still
+    // active.
+    bool m_workerThreadHadPendingActivity = false;

[kinuko, 2016/08/05 14:55:29]

nit: not a huge fan of exposing field members to subclasses, esp. if it's only
for testing class

[nhiroki, 2016/08/08 09:19:14]

Moved these fields back to the private section.

+
 private:
     void workerObjectDestroyedInternal();
 
     // WorkerLoaderProxyProvider
     // These methods are called on different threads to schedule loading
     // requests and to send callbacks back to WorkerGlobalScope.
     void postTaskToLoader(const WebTraceLocation&, std::unique_ptr<ExecutionContextTask>) override;
     bool postTaskToWorkerGlobalScope(const WebTraceLocation&, std::unique_ptr<ExecutionContextTask>) override;
 
     // Returns true if this is called on the parent context thread.
     bool isParentContextThread() const;
 
     Persistent<ExecutionContext> m_executionContext;
     std::unique_ptr<InProcessWorkerObjectProxy> m_workerObjectProxy;
     WeakPersistent<InProcessWorkerBase> m_workerObject;
-    bool m_mayBeDestroyed;
-    std::unique_ptr<WorkerThread> m_workerThread;
+    bool m_mayBeDestroyed = false;
 
     // Unconfirmed messages from the parent context thread to the worker thread.
     unsigned m_unconfirmedMessageCount;
 
-    // The latest confirmation from worker thread reported that it was still
-    // active.
-    bool m_workerThreadHadPendingActivity;
-
-    bool m_askedToTerminate;
+    bool m_askedToTerminate = false;
 
     // Tasks are queued here until there's a thread object created.
     Vector<std::unique_ptr<ExecutionContextTask>> m_queuedEarlyTasks;
 
     Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
 
     Persistent<WorkerClients> m_workerClients;
 
     RefPtr<WorkerLoaderProxy> m_loaderProxy;
 };
 
 } // namespace blink
 
 #endif // InProcessWorkerMessagingProxy_h