Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #27506 - paulrouget:morePrefMemIssues, r=jdm

Browse source 
Keep C++ pref value in memory longer
This commit is contained in:
bors-servo 2020-08-05 10:58:15 -04:00 • committed by GitHub
commit 90aa0a3d41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

31
support/hololens/ServoApp/ServoControl/Servo.cpp
View file

@ -185,9 +185,18 @@ Servo::Servo(std::optional<hstring> initUrl, hstring args, GLsizei width,
std::vector<capi::CPref> cprefs;
// Ensure few things stay in memories long enough as we send raw
// pointers to Rust.
std::vector<std::unique_ptr<char *>> memChar;
std::vector<std::unique_ptr<bool>> memBool;
std::vector<std::unique_ptr<int64_t>> memInt;
std::vector<std::unique_ptr<double>> memDouble;
for (auto pref : prefs.Values()) {
auto key = *hstring2char(pref.Key());
auto charkey = hstring2char(pref.Key());
auto key = *charkey.get();
memChar.push_back(std::move(charkey));
auto value = pref.Value();
auto type = value.as<Windows::Foundation::IPropertyValue>().Type();
@ -197,20 +206,24 @@ Servo::Servo(std::optional<hstring> initUrl, hstring args, GLsizei width,
cpref.value = NULL;
if (type == Windows::Foundation::PropertyType::Boolean) {
cpref.pref_type = capi::CPrefType::Bool;
auto val = unbox_value<bool>(value);
cpref.value = &val;
auto val = std::make_unique<bool>(unbox_value<bool>(value));
cpref.value = val.get();
memBool.push_back(std::move(val));
} else if (type == Windows::Foundation::PropertyType::String) {
cpref.pref_type = capi::CPrefType::Str;
auto val = unbox_value<hstring>(value);
cpref.value = *hstring2char(val);
auto val = hstring2char(unbox_value<hstring>(value));
cpref.value = *val.get();
memChar.push_back(std::move(val));
} else if (type == Windows::Foundation::PropertyType::Int64) {
cpref.pref_type = capi::CPrefType::Int;
auto val = unbox_value<int64_t>(value);
cpref.value = &val;
auto val = std::make_unique<int64_t>(unbox_value<int64_t>(value));
cpref.value = val.get();
memInt.push_back(std::move(val));
} else if (type == Windows::Foundation::PropertyType::Double) {
cpref.pref_type = capi::CPrefType::Float;
auto val = unbox_value<double>(value);
cpref.value = &val;
auto val = std::make_unique<double>(unbox_value<double>(value));
cpref.value = val.get();
memDouble.push_back(std::move(val));
} else if (type == Windows::Foundation::PropertyType::Empty) {
cpref.pref_type = capi::CPrefType::Missing;
} else {