Issue 3594 - remove circular references JsEngine-JsValue-JsEngine

src/Notification.cpp

 /*
  * 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
  * 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 <AdblockPlus/JsValue.h>
 #include <AdblockPlus/JsEngine.h>
+#include "JsContext.h"
 #include <AdblockPlus/Notification.h>
 #include <algorithm>
 
 using namespace AdblockPlus;
 
 namespace
 {
   typedef std::pair<NotificationType, std::string> NotificationTypeString;
   typedef std::vector<NotificationTypeString> NotificationTypes;
   NotificationTypes InitNotificationTypes()
@@ skipping 32 matching lines @@
 {
 }
 
 NotificationType Notification::GetType() const
 {
   return StringToNotificationType(GetProperty("type")->AsString());
 }
 
 NotificationTexts Notification::GetTexts() const
 {
-  JsValuePtr jsTexts = jsEngine->Evaluate("API.getNotificationTexts")->Call(*this);
+  JsContext context(jsEngine);
+  JsValuePtr jsTexts = context.GetJsEngine().Evaluate("API.getNotificationTexts")->Call(*this);
   NotificationTexts notificationTexts;
   JsValuePtr jsTitle = jsTexts->GetProperty("title");
   if (jsTitle->IsString())
   {
     notificationTexts.title = jsTitle->AsString();
   }
   JsValuePtr jsMessage = jsTexts->GetProperty("message");
   if (jsMessage->IsString())
   {
     notificationTexts.message = jsMessage->AsString();
@@ skipping 13 matching lines @@
   for (JsValueList::const_iterator linkIterator = urlLinksList.begin();
     linkIterator != urlLinksList.end(); ++linkIterator)
   {
     retValue.push_back((*linkIterator)->AsString());
   }
   return retValue;
 }
 
 void Notification::MarkAsShown()
 {
-  jsEngine->Evaluate("API.markNotificationAsShown")->Call(*GetProperty("id"));
+  JsContext context(jsEngine);
+  context.GetJsEngine().Evaluate("API.markNotificationAsShown")->Call(*GetProperty("id"));
 }