Skip to content

Commit aa4c49f

Browse files
committed
Fixed.
1 parent d772239 commit aa4c49f

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed

Source/JavascriptGraphEditor/JavascriptGraphEditor.Build.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ namespace UnrealBuildTool.Rules
44
{
55
public class JavascriptGraphEditor : ModuleRules
66
{
7-
public JavascriptGraphEditor(ReadOnlyTargetRules Target)
7+
public JavascriptGraphEditor(ReadOnlyTargetRules Target)
8+
: base(Target)
89
{
910
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
1011
PrivateIncludePaths.AddRange(

Source/V8/Private/Debugger.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ PRAGMA_DISABLE_SHADOW_VARIABLE_WARNINGS
2424
#include "Translator.h"
2525
#endif
2626

27-
#if V8_MINOR_VERSION >= 5
28-
# define V8_Debug_ProcessDebugMessages(isolate) Debug::ProcessDebugMessages(isolate)
29-
# define V8_Debug_SetMessageHandler(isolate,fn) Debug::SetMessageHandler(isolate,fn)
30-
#else
27+
#if V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 5
3128
# define V8_Debug_ProcessDebugMessages(isolate) Debug::ProcessDebugMessages()
3229
# define V8_Debug_SetMessageHandler(isolate,fn) Debug::SetMessageHandler(fn)
30+
#else
31+
# define V8_Debug_ProcessDebugMessages(isolate) Debug::ProcessDebugMessages(isolate)
32+
# define V8_Debug_SetMessageHandler(isolate,fn) Debug::SetMessageHandler(isolate,fn)
3333
#endif
3434

3535
using namespace v8;

Source/V8/Private/JavascriptIsolate_Private.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
367367
GetSelf(isolate)->OnGCEvent(true, type, flags);
368368
});
369369

370-
#if V8_MINOR_VERSION < 3
370+
#if V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 3
371371
isolate_->AddMemoryAllocationCallback([](ObjectSpace space, AllocationAction action,int size) {
372372
OnMemoryAllocationEvent(space, action, size);
373373
}, kObjectSpaceAll, kAllocationActionAll);
@@ -2545,7 +2545,7 @@ class FJavascriptIsolateImplementation : public FJavascriptIsolate
25452545
typedef typename WeakData::ValueType WeakDataValueInitType;
25462546
typedef TPairInitializer<WeakDataKeyInitType, WeakDataValueInitType> InitializerType;
25472547

2548-
#if V8_MINOR_VERSION < 3
2548+
#if V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 3
25492549
Handle.template SetWeak<WeakData>(new WeakData(InitializerType(GetContext(), GarbageCollectedObject)), [](const WeakCallbackData<U, WeakData>& data) {
25502550
auto Parameter = data.GetParameter();
25512551

Source/V8/Private/V8Module.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class FUnrealJSPlatform : public v8::Platform
5858
return platform_;
5959
}
6060
FUnrealJSPlatform()
61-
: platform_(platform::CreateDefaultPlatform())
61+
: platform_(platform::CreateDefaultPlatform(0, platform::IdleTaskSupport::kEnabled))
6262
{
6363
TickDelegate = FTickerDelegate::CreateRaw(this, &FUnrealJSPlatform::HandleTicker);
6464
TickHandle = FTicker::GetCoreTicker().AddTicker(TickDelegate);

Source/V8/V8.Build.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void HackWebSocketIncludeDir(ReadOnlyTargetRules Target)
107107
private bool LoadV8(ReadOnlyTargetRules Target)
108108
{
109109
int[] v8_version = GetV8Version();
110-
bool ShouldLink_libsampler = v8_version[1] >= 3;
110+
bool ShouldLink_libsampler = !(v8_version[0] == 5 && v8_version[1] < 3);
111111

112112
if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Win32))
113113
{

ThirdParty/v8/include/v8-version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
// system so their names cannot be changed without changing the scripts.
1111
#define V8_MAJOR_VERSION 5
1212
#define V8_MINOR_VERSION 9
13-
#define V8_BUILD_NUMBER 221
14-
#define V8_PATCH_LEVEL 0
13+
#define V8_BUILD_NUMBER 211
14+
#define V8_PATCH_LEVEL 31
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

ThirdParty/v8/include/v8.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8350,14 +8350,16 @@ class V8_EXPORT Context {
83508350
Isolate* GetIsolate();
83518351

83528352
/**
8353-
* The field at kDebugIdIndex used to be reserved for the inspector.
8354-
* It now serves no purpose.
8353+
* The field at kDebugIdIndex is reserved for V8 debugger implementation.
8354+
* The value is propagated to the scripts compiled in given Context and
8355+
* can be used for filtering scripts.
83558356
*/
83568357
enum EmbedderDataFields { kDebugIdIndex = 0 };
83578358

83588359
/**
83598360
* Gets the embedder data with the given index, which must have been set by a
8360-
* previous call to SetEmbedderData with the same index.
8361+
* previous call to SetEmbedderData with the same index. Note that index 0
8362+
* currently has a special meaning for Chrome's debugger.
83618363
*/
83628364
V8_INLINE Local<Value> GetEmbedderData(int index);
83638365

0 commit comments

Comments
 (0)