status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Back out "[JSC] Expose new methods to Custom/System JSC" 

Reviewed By: fkgozali

Differential Revision: D8003558

fbshipit-source-id: 0b90153518f849f66d7c713f99cb44c79b27ca19
This commit is contained in:
Sebastian Markbage 2018-05-22 09:25:52 -07:00 committed by Facebook Github Bot
parent 55724bcc62
commit 91f2ffed37
6 changed files with 4 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
React/React.xcodeproj/project.pbxproj
View File

@ -1198,10 +1198,6 @@
A2440AA21DF8D854006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; }; A2440AA21DF8D854006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; };
A2440AA31DF8D854006E7BFC /* RCTReloadCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */; }; A2440AA31DF8D854006E7BFC /* RCTReloadCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */; };
A2440AA41DF8D865006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; }; A2440AA41DF8D865006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; };
A2C986DF208C7DF700C0D579 /* JSWeak.h in Headers */ = {isa = PBXBuildFile; fileRef = A2E0E69F208AA9EC007044C1 /* JSWeak.h */; };
A2C986E0208C7DF900C0D579 /* JSWeak.h in Headers */ = {isa = PBXBuildFile; fileRef = A2E0E69F208AA9EC007044C1 /* JSWeak.h */; };
A2C986E1208C7E9C00C0D579 /* JSWeak.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = A2E0E69F208AA9EC007044C1 /* JSWeak.h */; };
A2C986E2208C7EA800C0D579 /* JSWeak.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = A2E0E69F208AA9EC007044C1 /* JSWeak.h */; };
AC70D2E91DE489E4002E6351 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; }; AC70D2E91DE489E4002E6351 /* RCTJavaScriptLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */; };
B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B233E6E91D2D845D00BC68BA /* RCTI18nManager.m */; }; B233E6EA1D2D845D00BC68BA /* RCTI18nManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B233E6E91D2D845D00BC68BA /* RCTI18nManager.m */; };
B95154321D1B34B200FE7B80 /* RCTActivityIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */; }; B95154321D1B34B200FE7B80 /* RCTActivityIndicatorView.m in Sources */ = {isa = PBXBuildFile; fileRef = B95154311D1B34B200FE7B80 /* RCTActivityIndicatorView.m */; };
@ -1573,7 +1569,6 @@
dstPath = include/jschelpers; dstPath = include/jschelpers;
dstSubfolderSpec = 16; dstSubfolderSpec = 16;
files = ( files = (
A2C986E2208C7EA800C0D579 /* JSWeak.h in Copy Headers */,
3DA982601E5B1089004F2374 /* JSCHelpers.h in Copy Headers */, 3DA982601E5B1089004F2374 /* JSCHelpers.h in Copy Headers */,
3DA982611E5B1089004F2374 /* noncopyable.h in Copy Headers */, 3DA982611E5B1089004F2374 /* noncopyable.h in Copy Headers */,
3DA982621E5B1089004F2374 /* Unicode.h in Copy Headers */, 3DA982621E5B1089004F2374 /* Unicode.h in Copy Headers */,
@ -1801,7 +1796,6 @@
dstPath = include/jschelpers; dstPath = include/jschelpers;
dstSubfolderSpec = 16; dstSubfolderSpec = 16;
files = ( files = (
A2C986E1208C7E9C00C0D579 /* JSWeak.h in Copy Headers */,
3DA9825A1E5B1079004F2374 /* JavaScriptCore.h in Copy Headers */, 3DA9825A1E5B1079004F2374 /* JavaScriptCore.h in Copy Headers */,
3DA9825B1E5B1079004F2374 /* JSCHelpers.h in Copy Headers */, 3DA9825B1E5B1079004F2374 /* JSCHelpers.h in Copy Headers */,
3DA9825C1E5B1079004F2374 /* JSCWrapper.h in Copy Headers */, 3DA9825C1E5B1079004F2374 /* JSCWrapper.h in Copy Headers */,
@ -2304,7 +2298,6 @@
9936F3361F5F2F480010BF04 /* PrivateDataBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrivateDataBase.h; path = privatedata/PrivateDataBase.h; sourceTree = "<group>"; }; 9936F3361F5F2F480010BF04 /* PrivateDataBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrivateDataBase.h; path = privatedata/PrivateDataBase.h; sourceTree = "<group>"; };
A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadCommand.h; sourceTree = "<group>"; }; A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadCommand.h; sourceTree = "<group>"; };
A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReloadCommand.m; sourceTree = "<group>"; }; A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReloadCommand.m; sourceTree = "<group>"; };
A2E0E69F208AA9EC007044C1 /* JSWeak.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWeak.h; sourceTree = "<group>"; };
AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJavaScriptLoader.mm; sourceTree = "<group>"; }; AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJavaScriptLoader.mm; sourceTree = "<group>"; };
AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBundleType.cpp; sourceTree = "<group>"; }; AC70D2EB1DE48A22002E6351 /* JSBundleType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSBundleType.cpp; sourceTree = "<group>"; };
ACDD3FDA1BC7430D00E7DE33 /* RCTBorderStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBorderStyle.h; sourceTree = "<group>"; }; ACDD3FDA1BC7430D00E7DE33 /* RCTBorderStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTBorderStyle.h; sourceTree = "<group>"; };
@ -2762,7 +2755,6 @@
3D4A621D1DDD3985001F41B4 /* jschelpers */ = { 3D4A621D1DDD3985001F41B4 /* jschelpers */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A2E0E69F208AA9EC007044C1 /* JSWeak.h */,
19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */, 19DED2281E77E29200F089BB /* systemJSCWrapper.cpp */,
3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */, 3D7A27DC1DE32541002E3F95 /* JavaScriptCore.h */,
3D92B1071E0369AD0018521A /* JSCHelpers.cpp */, 3D92B1071E0369AD0018521A /* JSCHelpers.cpp */,
@ -3379,7 +3371,6 @@
files = ( files = (
19F61C041E8495FF00571D81 /* JSCHelpers.h in Headers */, 19F61C041E8495FF00571D81 /* JSCHelpers.h in Headers */,
19F61C051E8495FF00571D81 /* noncopyable.h in Headers */, 19F61C051E8495FF00571D81 /* noncopyable.h in Headers */,
A2C986E0208C7DF900C0D579 /* JSWeak.h in Headers */,
19F61C061E8495FF00571D81 /* Unicode.h in Headers */, 19F61C061E8495FF00571D81 /* Unicode.h in Headers */,
19F61C071E8495FF00571D81 /* Value.h in Headers */, 19F61C071E8495FF00571D81 /* Value.h in Headers */,
3D3030251DF8295E00D6DDAE /* JavaScriptCore.h in Headers */, 3D3030251DF8295E00D6DDAE /* JavaScriptCore.h in Headers */,
@ -3427,7 +3418,6 @@
files = ( files = (
13EBC6821E28733C00880AC5 /* Value.h in Headers */, 13EBC6821E28733C00880AC5 /* Value.h in Headers */,
13EBC6811E28733C00880AC5 /* Unicode.h in Headers */, 13EBC6811E28733C00880AC5 /* Unicode.h in Headers */,
A2C986DF208C7DF700C0D579 /* JSWeak.h in Headers */,
13EBC6801E28733C00880AC5 /* noncopyable.h in Headers */, 13EBC6801E28733C00880AC5 /* noncopyable.h in Headers */,
13EBC67E1E28726000880AC5 /* JSCHelpers.h in Headers */, 13EBC67E1E28726000880AC5 /* JSCHelpers.h in Headers */,
3D3CD93D1DE5FC1400167DC4 /* JavaScriptCore.h in Headers */, 3D3CD93D1DE5FC1400167DC4 /* JavaScriptCore.h in Headers */,

1
ReactCommon/jschelpers/BUCK
View File

@ -4,7 +4,6 @@ EXPORTED_HEADERS = [
"JavaScriptCore.h", "JavaScriptCore.h",
"JSCHelpers.h", "JSCHelpers.h",
"JSCWrapper.h", "JSCWrapper.h",
"JSWeak.h",
"noncopyable.h", "noncopyable.h",
"Unicode.h", "Unicode.h",
"Value.h", "Value.h",

11
ReactCommon/jschelpers/JSCWrapper.h
View File

@ -10,7 +10,6 @@
#include <functional> #include <functional>
#include <string> #include <string>
#include <JavaScriptCore/JavaScript.h> #include <JavaScriptCore/JavaScript.h>
#include <jschelpers/JSWeak.h>
#if defined(JSCINTERNAL) || (!defined(__APPLE__)) #if defined(JSCINTERNAL) || (!defined(__APPLE__))
#define JSC_IMPORT extern "C" #define JSC_IMPORT extern "C"
@ -78,10 +77,6 @@ struct JSCWrapper {
// JSContext // JSContext
JSC_WRAPPER_METHOD(JSContextGetGlobalContext); JSC_WRAPPER_METHOD(JSContextGetGlobalContext);
JSC_WRAPPER_METHOD(JSContextGetGlobalObject); JSC_WRAPPER_METHOD(JSContextGetGlobalObject);
JSC_WRAPPER_METHOD(JSContextGetGroup);
JSC_WRAPPER_METHOD(JSContextGroupRetain);
JSC_WRAPPER_METHOD(JSContextGroupRelease);
JSC_WRAPPER_METHOD(FBJSContextStartGCTimers); JSC_WRAPPER_METHOD(FBJSContextStartGCTimers);
// JSEvaluate // JSEvaluate
@ -147,12 +142,6 @@ struct JSCWrapper {
JSC_WRAPPER_METHOD(JSValueUnprotect); JSC_WRAPPER_METHOD(JSValueUnprotect);
JSC_WRAPPER_METHOD(JSValueIsNull); JSC_WRAPPER_METHOD(JSValueIsNull);
// JSWeak
JSC_WRAPPER_METHOD(JSWeakCreate);
JSC_WRAPPER_METHOD(JSWeakRetain);
JSC_WRAPPER_METHOD(JSWeakRelease);
JSC_WRAPPER_METHOD(JSWeakGetObject);
// Sampling profiler // Sampling profiler
JSC_WRAPPER_METHOD(JSSamplingProfilerEnabled); JSC_WRAPPER_METHOD(JSSamplingProfilerEnabled);
JSC_WRAPPER_METHOD(JSPokeSamplingProfiler); JSC_WRAPPER_METHOD(JSPokeSamplingProfiler);

32
ReactCommon/jschelpers/JSWeak.h
View File

@ -1,32 +0,0 @@
/**
* Copyright (c) 2016-present, Facebook, Inc.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
#include <JavaScriptCore/JSObjectRef.h>
// These Symbols are included in JSC builds but not exported as part of the public headers.
#ifndef JSWeakPrivate_h
#define JSWeakPrivate_h
#ifdef __cplusplus
extern "C" {
#endif
typedef struct OpaqueJSWeak* JSWeakRef;
JSWeakRef JSWeakCreate(JSContextGroupRef, JSObjectRef);
void JSWeakRetain(JSContextGroupRef, JSWeakRef);
void JSWeakRelease(JSContextGroupRef, JSWeakRef);
JSObjectRef JSWeakGetObject(JSWeakRef);
#ifdef __cplusplus
}
#endif
#endif // JSWeakPrivate_h

18
ReactCommon/jschelpers/JavaScriptCore.h
View File

@ -72,20 +72,16 @@
#define JSC_JSGlobalContextRelease(...) __jsc_wrapper(JSGlobalContextRelease, __VA_ARGS__) #define JSC_JSGlobalContextRelease(...) __jsc_wrapper(JSGlobalContextRelease, __VA_ARGS__)
#define JSC_JSGlobalContextSetName(...) __jsc_wrapper(JSGlobalContextSetName, __VA_ARGS__) #define JSC_JSGlobalContextSetName(...) __jsc_wrapper(JSGlobalContextSetName, __VA_ARGS__)
jsc_poison(JSContextGroupCreate JSGlobalContextCreate JSGlobalContextCreateInGroup jsc_poison(JSContextGroupCreate JSContextGroupRelease JSContextGroupRetain
JSGlobalContextCopyName JSGlobalContextRelease JSGlobalContextRetain JSGlobalContextCreate JSGlobalContextCreateInGroup JSGlobalContextCopyName
JSGlobalContextSetName) JSGlobalContextRelease JSGlobalContextRetain JSGlobalContextSetName)
// JSContext // JSContext
#define JSC_JSContextGetGlobalContext(...) __jsc_wrapper(JSContextGetGlobalContext, __VA_ARGS__) #define JSC_JSContextGetGlobalContext(...) __jsc_wrapper(JSContextGetGlobalContext, __VA_ARGS__)
#define JSC_JSContextGetGlobalObject(...) __jsc_wrapper(JSContextGetGlobalObject, __VA_ARGS__) #define JSC_JSContextGetGlobalObject(...) __jsc_wrapper(JSContextGetGlobalObject, __VA_ARGS__)
#define JSC_JSContextGetGroup(ctx) __jsc_wrapper(JSContextGetGroup, ctx)
#define JSC_JSContextGroupRetain(...) __jsc_bool_wrapper(JSContextGroupRetain, __VA_ARGS__)
#define JSC_JSContextGroupRelease(...) __jsc_bool_wrapper(JSContextGroupRelease, __VA_ARGS__)
#define JSC_FBJSContextStartGCTimers(...) __jsc_wrapper(FBJSContextStartGCTimers, __VA_ARGS__) #define JSC_FBJSContextStartGCTimers(...) __jsc_wrapper(FBJSContextStartGCTimers, __VA_ARGS__)
jsc_poison(JSContextGetGlobalContext JSContextGetGlobalObject JSContextGetGroup jsc_poison(JSContextGetGlobalContext JSContextGetGlobalObject JSContextGetGroup FBJSContextStartGCTimers)
JSContextGroupRelease JSContextGroupRetain FBJSContextStartGCTimers)
// JSEvaluate // JSEvaluate
#define JSC_JSEvaluateScript(...) __jsc_wrapper(JSEvaluateScript, __VA_ARGS__) #define JSC_JSEvaluateScript(...) __jsc_wrapper(JSEvaluateScript, __VA_ARGS__)
@ -187,12 +183,6 @@ jsc_poison(JSObjectMakeArrayBufferWithBytesNoCopy JSObjectMakeTypedArray
JSObjectGetTypedArrayBuffer JSObjectGetTypedArrayLength JSObjectGetTypedArrayBuffer JSObjectGetTypedArrayLength
JSObjectGetArrayBufferBytesPtr JSObjectGetArrayBufferByteLength) JSObjectGetArrayBufferBytesPtr JSObjectGetArrayBufferByteLength)
// JSWeak
#define JSC_JSWeakCreate(...) __jsc_bool_wrapper(JSWeakCreate, __VA_ARGS__)
#define JSC_JSWeakRetain(...) __jsc_bool_wrapper(JSWeakRetain, __VA_ARGS__)
#define JSC_JSWeakRelease(...) __jsc_bool_wrapper(JSWeakRelease, __VA_ARGS__)
#define JSC_JSWeakGetObject(...) __jsc_drop_ctx_wrapper(JSWeakGetObject, __VA_ARGS__)
// Sampling profiler // Sampling profiler
#define JSC_JSSamplingProfilerEnabled(...) __jsc_drop_ctx_wrapper(JSSamplingProfilerEnabled, __VA_ARGS__) #define JSC_JSSamplingProfilerEnabled(...) __jsc_drop_ctx_wrapper(JSSamplingProfilerEnabled, __VA_ARGS__)
#define JSC_JSPokeSamplingProfiler(...) __jsc_wrapper(JSPokeSamplingProfiler, __VA_ARGS__) #define JSC_JSPokeSamplingProfiler(...) __jsc_wrapper(JSPokeSamplingProfiler, __VA_ARGS__)

22
ReactCommon/jschelpers/systemJSCWrapper.cpp
View File

@ -34,11 +34,6 @@ UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(configureJSCForIOS)
UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(FBJSContextStartGCTimers) UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(FBJSContextStartGCTimers)
UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSWeakCreate)
UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSWeakRetain)
UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSWeakRelease)
UNIMPLEMENTED_SYSTEM_JSC_FUNCTION(JSWeakGetObject)
bool JSSamplingProfilerEnabled() { bool JSSamplingProfilerEnabled() {
return false; return false;
} }
@ -62,10 +57,6 @@ const JSCWrapper* systemJSCWrapper() {
.JSContextGetGlobalContext = JSContextGetGlobalContext, .JSContextGetGlobalContext = JSContextGetGlobalContext,
.JSContextGetGlobalObject = JSContextGetGlobalObject, .JSContextGetGlobalObject = JSContextGetGlobalObject,
.JSContextGetGroup = JSContextGetGroup,
.JSContextGroupRetain = JSContextGroupRetain,
.JSContextGroupRelease = JSContextGroupRelease,
.FBJSContextStartGCTimers = .FBJSContextStartGCTimers =
(decltype(&FBJSContextStartGCTimers)) (decltype(&FBJSContextStartGCTimers))
Unimplemented_FBJSContextStartGCTimers, Unimplemented_FBJSContextStartGCTimers,
@ -131,19 +122,6 @@ const JSCWrapper* systemJSCWrapper() {
.JSValueUnprotect = JSValueUnprotect, .JSValueUnprotect = JSValueUnprotect,
.JSValueIsNull = JSValueIsNull, .JSValueIsNull = JSValueIsNull,
.JSWeakCreate =
(decltype(&JSWeakCreate))
Unimplemented_JSWeakCreate,
.JSWeakRetain =
(decltype(&JSWeakRetain))
Unimplemented_JSWeakRetain,
.JSWeakRelease =
(decltype(&JSWeakRelease))
Unimplemented_JSWeakRelease,
.JSWeakGetObject =
(decltype(&JSWeakGetObject))
Unimplemented_JSWeakGetObject,
.JSSamplingProfilerEnabled = JSSamplingProfilerEnabled, .JSSamplingProfilerEnabled = JSSamplingProfilerEnabled,
.JSPokeSamplingProfiler = .JSPokeSamplingProfiler =
(decltype(&JSPokeSamplingProfiler)) (decltype(&JSPokeSamplingProfiler))