@@ -69,47 +69,39 @@ void Instance::initializeBridge(
69
69
70
70
void Instance::loadApplication (std::unique_ptr<RAMBundleRegistry> bundleRegistry,
71
71
std::unique_ptr<const JSBigString> bundle,
72
- uint64_t bundleVersion, // TODO(OSS Candidate ISS#2710739)
73
- std::string bundleURL,
74
- std::string&& bytecodeFileName) { // TODO(OSS Candidate ISS#2710739)
72
+ std::string bundleURL) { // TODO(OSS Candidate ISS#2710739)
75
73
callback_->incrementPendingJSCalls ();
76
- SystraceSection s (" Instance::loadApplication" , " bundleURL" ,
77
- bundleURL);
78
- nativeToJsBridge_->loadApplication (std::move (bundleRegistry), std::move (bundle), bundleVersion,
79
- std::move (bundleURL), std::move (bytecodeFileName));
74
+ SystraceSection s (" Instance::loadApplication" , " bundleURL" , bundleURL);
75
+ nativeToJsBridge_->loadApplication (
76
+ std::move (bundleRegistry), std::move (bundle), std::move (bundleURL));
80
77
}
81
78
82
79
void Instance::loadApplicationSync (std::unique_ptr<RAMBundleRegistry> bundleRegistry,
83
80
std::unique_ptr<const JSBigString> bundle,
84
- uint64_t bundleVersion, // TODO(OSS Candidate ISS#2710739)
85
- std::string bundleURL,
86
- std::string&& bytecodeFileName) { // TODO(OSS Candidate ISS#2710739)
81
+ std::string bundleURL) {
87
82
std::unique_lock<std::mutex> lock (m_syncMutex);
88
83
m_syncCV.wait (lock, [this ] { return m_syncReady; });
89
84
90
- SystraceSection s (" Instance::loadApplicationSync" , " bundleURL" ,
91
- bundleURL);
92
- nativeToJsBridge_->loadApplicationSync (std::move (bundleRegistry), std::move (bundle), bundleVersion,
93
- std::move (bundleURL), std::move (bytecodeFileName)); // TODO(OSS Candidate ISS#2710739)
85
+ SystraceSection s (" Instance::loadApplicationSync" , " bundleURL" , bundleURL);
86
+ nativeToJsBridge_->loadApplicationSync (
87
+ std::move (bundleRegistry), std::move (bundle), std::move (bundleURL));
94
88
}
95
89
96
90
void Instance::setSourceURL (std::string sourceURL) {
97
91
callback_->incrementPendingJSCalls ();
98
92
SystraceSection s (" Instance::setSourceURL" , " sourceURL" , sourceURL);
99
93
100
- nativeToJsBridge_->loadApplication (nullptr , nullptr , 0 , std::move (sourceURL), " " /* bytecodeFileName */ ); // TODO(OSS Candidate ISS#2710739)
94
+ nativeToJsBridge_->loadApplication (nullptr , nullptr , std::move (sourceURL));
101
95
}
102
96
103
97
void Instance::loadScriptFromString (std::unique_ptr<const JSBigString> bundleString,
104
- uint64_t bundleVersion,
105
98
std::string bundleURL, // TODO(OSS Candidate ISS#2710739)
106
- bool loadSynchronously,
107
- std::string&& bytecodeFileName) { // TODO(OSS Candidate ISS#2710739)
99
+ bool loadSynchronously) {
108
100
SystraceSection s (" Instance::loadScriptFromString" , " bundleURL" , bundleURL); // TODO(OSS Candidate ISS#2710739)
109
101
if (loadSynchronously) {
110
- loadApplicationSync (nullptr , std::move (bundleString), bundleVersion, std::move (bundleURL), std::move (bytecodeFileName)); // TODO(OSS Candidate ISS#2710739)
102
+ loadApplicationSync (nullptr , std::move (bundleString), std::move (bundleURL));
111
103
} else {
112
- loadApplication (nullptr , std::move (bundleString), bundleVersion, std::move (bundleURL), std::move (bytecodeFileName)); // TODO(OSS Candidate ISS#2710739)
104
+ loadApplication (nullptr , std::move (bundleString), std::move (bundleURL));
113
105
}
114
106
}
115
107
@@ -161,11 +153,11 @@ void Instance::loadRAMBundle(std::unique_ptr<RAMBundleRegistry> bundleRegistry,
161
153
std::string startupScriptSourceURL,
162
154
bool loadSynchronously) {
163
155
if (loadSynchronously) {
164
- loadApplicationSync (std::move (bundleRegistry), std::move (startupScript), 0 /* bundleVersion */ , // TODO(OSS Candidate ISS#2710739)
165
- std::move (startupScriptSourceURL), " " /* bytecodeFileName */ ); // TODO(OSS Candidate ISS#2710739)
156
+ loadApplicationSync (std::move (bundleRegistry), std::move (startupScript),
157
+ std::move (startupScriptSourceURL));
166
158
} else {
167
- loadApplication (std::move (bundleRegistry), std::move (startupScript), 0 /* bundleVersion */ , // TODO(OSS Candidate ISS#2710739)
168
- std::move (startupScriptSourceURL), " " /* bytecodeFileName */ ); // TODO(OSS Candidate ISS#2710739)
159
+ loadApplication (std::move (bundleRegistry), std::move (startupScript),
160
+ std::move (startupScriptSourceURL));
169
161
}
170
162
}
171
163
0 commit comments