Issue #4692 - Move responsibility for engine reference from tasks to scheduler

include/AdblockPlus/JsEngine.h

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 56 matching lines @@
     ScopedV8Isolate& operator=(const ScopedV8Isolate&);
 
     v8::Isolate* isolate;
   };
 
   /**
    * Shared smart pointer to ScopedV8Isolate instance;
    */
   typedef std::shared_ptr<ScopedV8Isolate> ScopedV8IsolatePtr;
 
-  struct ImmediateSingleUseThreadType {}; ///< Marker class for scheduling policy
-  extern const ImmediateSingleUseThreadType ImmediateSingleUseThread; ///< Dummy constant for scheduling policy
-
   /**
    * JavaScript engine used by `FilterEngine`, wraps v8.
    */
   class JsEngine : public std::enable_shared_from_this<JsEngine>
   {
   public:
     /**
      * Event callback function.
      */
     typedef std::function<void(JsValueList& params)> EventCallback;
@@ skipping 37 matching lines @@
      * Evaluates a JavaScript expression.
      * @param source JavaScript expression to evaluate.
      * @param filename Optional file name for the expression, used in error
      *        messages.
      * @return Result of the evaluated expression.
      */
     JsValuePtr Evaluate(const std::string& source,
         const std::string& filename = "");
 
     /**
-     * Schedule a task with these policies:
-     * - timing policy: start execution immediately.
-     * - threading policy: run the task in a single-use thread.
-     *
-     * @param task
-     *   Task to execute. All v8 handles should refer to the present engine.
-     * @param ImmediateSingleUseThreadType
-     *   The schedule policy--create a new thread and discard it afterwards.
-     */
-    void Schedule(std::function<void()> task, ImmediateSingleUseThreadType);
-
-    /**
-     * Block until there are no more tasks running in the scheduler.
-     *
-     * Note: this function does not prevent new tasks from being scheduled.
-     */
-    void WaitForQuietScheduler();
-
-    /**
      * Initiates a garbage collection.
      */
     void Gc();
 
     //@{
     /**
      * Creates a new JavaScript value.
      * @param val Value to convert.
      * @return New `JsValue` instance.
      */
@@ skipping 116 matching lines @@
     JsValuePtr GetGlobalObject();
 
     /// Isolate must be disposed only after disposing of all objects which are
     /// using it.
     ScopedV8IsolatePtr isolate;
 
     FileSystemPtr fileSystem;
     WebRequestPtr webRequest;
     LogSystemPtr logSystem;
     EventMap eventCallbacks;
-
-    // Forward declaration for PImpl idiom
-    class SchedulerImpl;
-    /**
-     * Scheduler for tasks executed under the current engine.
-     *
-     * \par Invariant
-     *   `bool(scheduler)` is always true
-     */
-    std::unique_ptr<SchedulerImpl> scheduler;
   };
 }
 
 #endif