Merge branch 'issue-6526-get-frame-and-show-warnings' into 'master'

Issue 6526 - get rid of the usage of deprecated V8 API and show warnings if it happens again

See merge request eyeo/adblockplus/libadblockplus!9

Author: xxxz

src/ConsoleJsObject.cpp

@@ -23,6 +23,9 @@
 #include "JsContext.h"
 #include "Utils.h"
 #include <AdblockPlus/Platform.h>
+#include "v8-compat-api.h"
+
+using namespace AdblockPlus::V8CompatApi;
 
 namespace
 {
@@ -42,8 +45,9 @@ namespace
     }
 
     std::stringstream source;
-    v8::Local<v8::StackFrame> frame = v8::StackTrace::CurrentStackTrace(arguments.GetIsolate(), 1)->GetFrame(0);
-    source << AdblockPlus::Utils::FromV8String(arguments.GetIsolate(), frame->GetScriptName());
+    auto isolate = arguments.GetIsolate();
+    v8::Local<v8::StackFrame> frame = StackTrace_GetFrame(isolate, v8::StackTrace::CurrentStackTrace(isolate, 1), 0);
+    source << AdblockPlus::Utils::FromV8String(isolate, frame->GetScriptName());
     source << ":" << frame->GetLineNumber();
 
     jsEngine->GetPlatform().WithLogSystem(
@@ -84,19 +88,20 @@ namespace
     const AdblockPlus::JsContext context(*jsEngine);
     AdblockPlus::JsValueList converted = jsEngine->ConvertArguments(arguments);
 
+    auto isolate = arguments.GetIsolate();
     std::stringstream traceback;
-    v8::Local<v8::StackTrace> frames = v8::StackTrace::CurrentStackTrace(arguments.GetIsolate(), 100);
+    v8::Local<v8::StackTrace> frames = v8::StackTrace::CurrentStackTrace(isolate, 100);
     for (int i = 0, l = frames->GetFrameCount(); i < l; i++)
     {
-      v8::Local<v8::StackFrame> frame = frames->GetFrame(i);
+      v8::Local<v8::StackFrame> frame = StackTrace_GetFrame(isolate, frames, i);
       traceback << (i + 1) << ": ";
-      std::string name = AdblockPlus::Utils::FromV8String(arguments.GetIsolate(), frame->GetFunctionName());
+      std::string name = AdblockPlus::Utils::FromV8String(isolate, frame->GetFunctionName());
       if (name.size())
         traceback << name;
       else
         traceback << "/* anonymous */";
       traceback << "() at ";
-      traceback << AdblockPlus::Utils::FromV8String(arguments.GetIsolate(), frame->GetScriptName());
+      traceback << AdblockPlus::Utils::FromV8String(isolate, frame->GetScriptName());
       traceback << ":" << frame->GetLineNumber();
       traceback << std::endl;
     }

src/v8-compat-api.h

@@ -0,0 +1,35 @@
+/*
+* 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
+* 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/>.
+*/
+
+#pragma once
+
+#include <v8.h>
+
+namespace AdblockPlus
+{
+  namespace V8CompatApi
+  {
+    v8::Local<v8::StackFrame> StackTrace_GetFrame(v8::Isolate* isolate, const v8::Local<v8::StackTrace>& stackTrace, uint32_t index)
+    {
+#if V8_MAJOR_VERSION == 6 && V8_MINOR_VERSION <= 7
+      return stackTrace->GetFrame(index);
+#else
+      return stackTrace->GetFrame(isolate, index);
+#endif
+    }
+  }
+}