Issue #6526 - pass v8::Isolate to more functions because old approach is deprecated

src/FileSystemJsObject.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 161 matching lines @@
               if (!jsEngine)
                 return;
 
               const JsContext context(*jsEngine);
               auto jsValues = jsEngine->GetJsValues(weakData->weakProcessFunc);
               auto processFunc = jsValues[0].UnwrapValue().As<v8::Function>();
               auto globalContext = context.GetV8Context()->Global();
               if (!globalContext->IsObject())
                 throw std::runtime_error("`this` pointer has to be an object");
 
-              const v8::TryCatch tryCatch(jsEngine->GetIsolate());
+              auto isolate = jsEngine->GetIsolate();
+              const v8::TryCatch tryCatch(isolate);
               const auto contentEnd = content.cend();
               auto stringBegin = SkipEndOfLine(content.begin(), contentEnd);
+              auto v8Context = isolate->GetCurrentContext();
               do
               {
                 auto stringEnd = AdvanceToEndOfLine(stringBegin, contentEnd);
-                auto jsLine = Utils::StringBufferToV8String(jsEngine->GetIsolate(), StringBuffer(stringBegin, stringEnd)).As<v8::Value>();
-                processFunc->Call(globalContext, 1, &jsLine);
+                auto jsLine = Utils::StringBufferToV8String(isolate, StringBuffer(stringBegin, stringEnd)).As<v8::Value>();
+                processFunc->Call(v8Context, globalContext, 1, &jsLine);

[hub, 2018/06/18 12:59:02]

I get this warning here:

../src/FileSystemJsObject.cpp:191:17: warning: ignoring return value of function
declared with 'warn_unused_result' attribute [-Wunused-result]
                processFunc->Call(v8Context, globalContext, 1, &jsLine);
                ^~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.

[sergei, 2018/06/18 13:00:19]

Yeah, that's because the impl is not complete yet.

                 if (tryCatch.HasCaught())
-                  throw JsError(tryCatch.Exception(), tryCatch.Message());
+                  throw JsError(isolate, tryCatch.Exception(), tryCatch.Message());
                 stringBegin = SkipEndOfLine(stringEnd, contentEnd);
               } while (stringBegin != contentEnd);
               jsEngine->GetJsValues(weakData->weakResolveCallback)[0].Call();
             }, [weakData](const std::string& error)
             {
               if (error.empty())
                 return;
               auto jsEngine = weakData->weakJsEngine.lock();
               if (!jsEngine)
                 return;
@@ skipping 157 matching lines @@
 JsValue& FileSystemJsObject::Setup(JsEngine& jsEngine, JsValue& obj)
 {
   obj.SetProperty("read", jsEngine.NewCallback(::ReadCallback::V8Callback));
   obj.SetProperty("readFromFile", jsEngine.NewCallback(::ReadFromFileCallback::V8Callback));
   obj.SetProperty("write", jsEngine.NewCallback(::WriteCallback));
   obj.SetProperty("move", jsEngine.NewCallback(::MoveCallback));
   obj.SetProperty("remove", jsEngine.NewCallback(::RemoveCallback));
   obj.SetProperty("stat", jsEngine.NewCallback(::StatCallback));
   return obj;
 }