Made sure FilterEngine instances are always initialized

src/FilterEngine.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <algorithm>
 #include <cctype>
 #include <functional>
 #include <string>
 
 #include <AdblockPlus.h>
+#include "Thread.h"
 
 using namespace AdblockPlus;
 
 extern std::string jsSources[];
 
 Filter::Filter(JsValuePtr value)
     : JsValue(value)
 {
   if (!IsObject())
     throw std::runtime_error("JavaScript value is not an object");
@@ skipping 91 matching lines @@
   params.push_back(shared_from_this());
   JsValuePtr result = func->Call(params);
   return result->AsBool();
 }
 
 bool Subscription::operator==(const Subscription& subscription) const
 {
   return GetProperty("url")->AsString() == subscription.GetProperty("url")->AsString();
 }
 
-FilterEngine::FilterEngine(JsEnginePtr jsEngine) : jsEngine(jsEngine)
+FilterEngine::FilterEngine(JsEnginePtr jsEngine)
+    : jsEngine(jsEngine), initialized(false)
 {
+  jsEngine->SetEventCallback("init", std::tr1::bind(&FilterEngine::InitDone, this));
   for (int i = 0; !jsSources[i].empty(); i += 2)
     jsEngine->Evaluate(jsSources[i + 1], jsSources[i]);
+
+  // TODO: This should really be implemented via a conditional variable
+  while (!initialized)
+    ::Sleep(10);
 }
 
-bool FilterEngine::IsInitialized() const
+void FilterEngine::InitDone()
 {
-  return jsEngine->Evaluate("_abpInitialized")->AsBool();
+  jsEngine->RemoveEventCallback("init");
+  initialized = true;
 }
 
 FilterPtr FilterEngine::GetFilter(const std::string& text)
 {
   JsValuePtr func = jsEngine->Evaluate("API.getFilterFromText");
   JsValueList params;
   params.push_back(jsEngine->NewValue(text));
   return FilterPtr(new Filter(func->Call(params)));
 }
 
@@ skipping 55 matching lines @@
 {
   JsValuePtr func = jsEngine->Evaluate("API.getElementHidingSelectors");
   JsValueList params;
   params.push_back(jsEngine->NewValue(domain));
   JsValueList result = func->Call(params)->AsList();
   std::vector<std::string> selectors;
   for (JsValueList::iterator it = result.begin(); it != result.end(); ++it)
     selectors.push_back((*it)->AsString());
   return selectors;
 }