129040 2014-02-19 05:36:54 -0800 [glib] Update the battery provider to UPower 1.0 2016-10-31 11:04:40 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX https://bugs.webkit.org/show_bug.cgi?id=164213 P2 Normal --- 1 scampa.giovanni webkit-unassigned bugs-noreply commit-queue mcatanzaro mrobinson pnormand zan oldest_to_newest 982330 0 scampa.giovanni 2014-02-19 05:36:54 -0800 [glib] Update the battery provider to UPower 1.0 982331 1 224627 scampa.giovanni 2014-02-19 05:37:24 -0800 Created attachment 224627 Patch 982332 2 commit-queue 2014-02-19 05:39:12 -0800 Attachment 224627 did not pass style-queue: ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:30: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:36: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:36: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:37: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:37: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:37: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:38: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:38: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:38: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:39: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:39: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:39: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:40: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:40: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:58: Extra space before ( in function call [whitespace/parens] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:84: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:85: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:86: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:87: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:88: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:89: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:90: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:97: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:98: Boolean expressions that span multiple lines should have their operators on the left side of the line instead of the right side. [whitespace/operators] [4] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:100: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] ERROR: Source/WebCore/platform/glib/BatteryProviderUPower.cpp:102: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 26 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 990956 3 pnormand 2014-03-16 03:48:44 -0700 This also needs a ChangeLog :) Also, we're moving from automake to cmake for the build. It seems that our current cmake setup doesn't check the presence of upower-glib, would you mind providing a patch for this? I suppose a new WebCore/cmake/FindUPower.cmake module would be required. 1103612 4 mcatanzaro 2015-06-20 07:57:30 -0700 So I was wondering why our battery provider was not horribly broken, considering that upower 1.0 removed all the D-Bus API it relies on before the original battery support was even committed. Turns out these files are not built at all (they were added only to the autotools build). So it's all dead code. Unofficial r- from me; we need to get this building again. Note: the battery provider cannot possibly ever work without this patch. 1103614 5 mcatanzaro 2015-06-20 08:00:00 -0700 Also, the comments of the style checker are not optional; WebKit coding style is different from what's normal in GNOME. 1106788 6 scampa.giovanni 2015-07-03 16:02:26 -0700 Well, given that this code is not actually used, and given that I don't have a lot of free time these days, I don't think I will work on improving it. Hope you find it useful for a subsequent properly cleaned up patch, otherwise just close the bug and sorry for the noise. 1106792 7 mcatanzaro 2015-07-03 16:30:21 -0700 No, of course it's useful, thanks for submitting it. :) 1172678 8 224627 mrobinson 2016-03-09 12:26:11 -0800 Comment on attachment 224627 Patch r- given previous comments. No objections specifically from me, but this shouldn't be in the review queue. 1172751 9 mcatanzaro 2016-03-09 14:08:36 -0800 We should either delete this code, or figure out what the battery provider is for, clean up this patch, and get it hooked up somehow. Any preferences? 1246502 10 mcatanzaro 2016-10-31 11:04:25 -0700 The API this code is intended to support is being removed, see bug #164213 224627 2014-02-19 05:37:24 -0800 2016-03-09 12:26:11 -0800 Patch bug-129040-20140219143744.patch text/plain 6526 scampa.giovanni U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9nbGliL0JhdHRlcnlQcm92aWRlclVQb3dlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9nbGliL0JhdHRlcnlQcm92aWRlclVQb3dlci5jcHAKaW5kZXggZWZjODAwMGVkMTIy OWUxZWJiNjZlMmZmMzQxYzZkZTUyMDcyMWZhNi4uMjVlZTVhMjUyMDg1YjA0NjlhY2M2ZTBhZGVi N2U4MzU5NjY5ZTk1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ2xpYi9C YXR0ZXJ5UHJvdmlkZXJVUG93ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2ds aWIvQmF0dGVyeVByb3ZpZGVyVVBvd2VyLmNwcApAQCAtMjQsMTYgKzI0LDIwIEBACiAKICNpbmNs dWRlICJCYXR0ZXJ5UHJvdmlkZXJVUG93ZXJDbGllbnQuaCIKICNpbmNsdWRlIDxjbWF0aD4KKyNp bmNsdWRlIDxjc3RyaW5nPgogI2luY2x1ZGUgPGxpbWl0cz4KICNpbmNsdWRlIDx3dGYvZ29iamVj dC9HVW5pcXVlUHRyLmg+CisjaW5jbHVkZSA8d3RmL2dvYmplY3QvR1JlZlB0ci5oPgogCiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotc3RhdGljIHZvaWQgcG93ZXJEZXZpY2VBbHRlcmF0aW9u Q2FsbGJhY2soVXBDbGllbnQqIHVwb3dlckNsaWVudCwgVXBEZXZpY2UqIHVwb3dlckRldmljZSwg QmF0dGVyeVByb3ZpZGVyVVBvd2VyKiBwcm92aWRlcikKK3N0YXRpYyB2b2lkIHBvd2VyRGV2aWNl QWx0ZXJhdGlvbkNhbGxiYWNrKFVwRGV2aWNlKiB1cG93ZXJEZXZpY2UsIEdQYXJhbVNwZWMgKnBy b3BlcnR5LCBCYXR0ZXJ5UHJvdmlkZXJVUG93ZXIqIHByb3ZpZGVyKQogewotICAgIFVwRGV2aWNl S2luZCBkZXZpY2VLaW5kOwotICAgIGdfb2JqZWN0X2dldCh1cG93ZXJEZXZpY2UsICJraW5kIiwg JmRldmljZUtpbmQsIG51bGxwdHIpOwotICAgIGlmIChkZXZpY2VLaW5kICE9IFVQX0RFVklDRV9L SU5EX0JBVFRFUlkpCisgICAgaWYgKHN0cmNtcCAocHJvcGVydHktPm5hbWUsICJ0aW1lLXRvLWVt cHR5IikgIT0gMCAmJgorICAgICAgICBzdHJjbXAgKHByb3BlcnR5LT5uYW1lLCAidGltZS10by1m dWxsIikgIT0gMCAmJgorICAgICAgICBzdHJjbXAgKHByb3BlcnR5LT5uYW1lLCAiaXMtcHJlc2Vu dCIpICE9IDAgJiYKKyAgICAgICAgc3RyY21wIChwcm9wZXJ0eS0+bmFtZSwgImtpbmQiKSAhPSAw ICYmCisgICAgICAgIHN0cmNtcCAocHJvcGVydHktPm5hbWUsICJzdGF0ZSIpICE9IDApCiAgICAg ICAgIHJldHVybjsKIAogICAgIHByb3ZpZGVyLT51cGRhdGVCYXR0ZXJ5U3RhdHVzKCk7CkBAIC00 OCwxOCArNTIsMTIgQEAgQmF0dGVyeVByb3ZpZGVyVVBvd2VyOjpCYXR0ZXJ5UHJvdmlkZXJVUG93 ZXIoQmF0dGVyeVByb3ZpZGVyVVBvd2VyQ2xpZW50KiBjbGllbnQKIAogdm9pZCBCYXR0ZXJ5UHJv dmlkZXJVUG93ZXI6OnN0YXJ0VXBkYXRpbmcoKQogewotICAgIEFTU0VSVCghbV91cG93ZXJDbGll bnQpOwotICAgIG1fdXBvd2VyQ2xpZW50ID0gYWRvcHRHUmVmKHVwX2NsaWVudF9uZXcoKSk7Cisg ICAgQVNTRVJUKCFtX3Vwb3dlckRldmljZSk7CiAKLSAgICBHVW5pcXVlT3V0UHRyPEdFcnJvcj4g ZXJyb3I7Ci0gICAgaWYgKCF1cF9jbGllbnRfZW51bWVyYXRlX2RldmljZXNfc3luYyhtX3Vwb3dl ckNsaWVudC5nZXQoKSwgMCwgJmVycm9yLm91dFB0cigpKSkgewotICAgICAgICBtX2NsaWVudC0+ dXBkYXRlQmF0dGVyeVN0YXR1cyhOb3RBdmFpbGFibGUpOwotICAgICAgICByZXR1cm47Ci0gICAg fQorICAgIEdSZWZQdHI8VXBDbGllbnQ+IGNsaWVudCA9IGFkb3B0R1JlZih1cF9jbGllbnRfbmV3 KCkpOworICAgIG1fdXBvd2VyRGV2aWNlID0gYWRvcHRHUmVmKHVwX2NsaWVudF9nZXRfZGlzcGxh eV9kZXZpY2UgKGNsaWVudCkpOwogCi0gICAgZ19zaWduYWxfY29ubmVjdChtX3Vwb3dlckNsaWVu dC5nZXQoKSwgImRldmljZS1jaGFuZ2VkIiwgR19DQUxMQkFDSyhwb3dlckRldmljZUFsdGVyYXRp b25DYWxsYmFjayksIHRoaXMpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3QobV91cG93ZXJDbGllbnQu Z2V0KCksICJkZXZpY2UtYWRkZWQiLCBHX0NBTExCQUNLKHBvd2VyRGV2aWNlQWx0ZXJhdGlvbkNh bGxiYWNrKSwgdGhpcyk7Ci0gICAgZ19zaWduYWxfY29ubmVjdChtX3Vwb3dlckNsaWVudC5nZXQo KSwgImRldmljZS1yZW1vdmVkIiwgR19DQUxMQkFDSyhwb3dlckRldmljZUFsdGVyYXRpb25DYWxs YmFjayksIHRoaXMpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QobV91cG93ZXJEZXZpY2UuZ2V0KCks ICJub3RpZnkiLCBHX0NBTExCQUNLKHBvd2VyRGV2aWNlQWx0ZXJhdGlvbkNhbGxiYWNrKSwgdGhp cyk7CiAKICAgICBtX2lzVXBkYXRpbmcgPSB0cnVlOwogICAgIHVwZGF0ZUJhdHRlcnlTdGF0dXMo KTsKQEAgLTY3LDcgKzY1LDcgQEAgdm9pZCBCYXR0ZXJ5UHJvdmlkZXJVUG93ZXI6OnN0YXJ0VXBk YXRpbmcoKQogCiB2b2lkIEJhdHRlcnlQcm92aWRlclVQb3dlcjo6c3RvcFVwZGF0aW5nKCkKIHsK LSAgICBtX3Vwb3dlckNsaWVudC5jbGVhcigpOworICAgIG1fdXBvd2VyRGV2aWNlLmNsZWFyKCk7 CiAgICAgbV9pc1VwZGF0aW5nID0gZmFsc2U7CiB9CiAKQEAgLTc2LDYxICs3NCwzMiBAQCB2b2lk IEJhdHRlcnlQcm92aWRlclVQb3dlcjo6dXBkYXRlQmF0dGVyeVN0YXR1cygpCiAgICAgaWYgKCFt X2lzVXBkYXRpbmcpCiAgICAgICAgIHJldHVybjsKIAotICAgIEdQdHJBcnJheSogZGV2aWNlcyA9 IHVwX2NsaWVudF9nZXRfZGV2aWNlcyhtX3Vwb3dlckNsaWVudC5nZXQoKSk7Ci0gICAgaWYgKCFk ZXZpY2VzKSB7Ci0gICAgICAgIG1fY2xpZW50LT51cGRhdGVCYXR0ZXJ5U3RhdHVzKE5vdEF2YWls YWJsZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICB1bnNpZ25lZCBudW1PZkJhdHRl cnlEZXZpY2VzID0gMDsKLSAgICBkb3VibGUgY29tYmluZWRFbmVyZ3lDYXBhY2l0eUN1cnJlbnQg PSAwLCBjb21iaW5lZEVuZXJneUNhcGFjaXR5RnVsbCA9IDAsIGNvbWJpbmVkRW5lcmd5UmF0ZSA9 IDA7Ci0KLSAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgZGV2aWNlcy0+bGVuOyBpKyspIHsK LSAgICAgICAgVXBEZXZpY2UqIGRldmljZSA9IHN0YXRpY19jYXN0PFVwRGV2aWNlKj4oZ19wdHJf YXJyYXlfaW5kZXgoZGV2aWNlcywgaSkpOwotICAgICAgICBVcERldmljZUtpbmQgZGV2aWNlS2lu ZDsKLSAgICAgICAgVXBEZXZpY2VTdGF0ZSBkZXZpY2VTdGF0ZTsKLSAgICAgICAgYm9vbCBpc1By ZXNlbnQ7Ci0gICAgICAgIGRvdWJsZSBlbmVyZ3lDYXBhY2l0eUN1cnJlbnQgPSAwLCBlbmVyZ3lD YXBhY2l0eUVtcHR5ID0gMCwgZW5lcmd5Q2FwYWNpdHlGdWxsID0gMCwgZW5lcmd5UmF0ZSA9IDA7 Ci0KLSAgICAgICAgZ19vYmplY3RfZ2V0KGRldmljZSwKLSAgICAgICAgICAgICJlbmVyZ3kiLCAm ZW5lcmd5Q2FwYWNpdHlDdXJyZW50LAotICAgICAgICAgICAgImVuZXJneS1lbXB0eSIsICZlbmVy Z3lDYXBhY2l0eUVtcHR5LAotICAgICAgICAgICAgImVuZXJneS1mdWxsIiwgJmVuZXJneUNhcGFj aXR5RnVsbCwKLSAgICAgICAgICAgICJlbmVyZ3ktcmF0ZSIsICZlbmVyZ3lSYXRlLAotICAgICAg ICAgICAgImlzLXByZXNlbnQiLCAmaXNQcmVzZW50LAotICAgICAgICAgICAgImtpbmQiLCAmZGV2 aWNlS2luZCwKLSAgICAgICAgICAgICJzdGF0ZSIsICZkZXZpY2VTdGF0ZSwKLSAgICAgICAgICAg IG51bGxwdHIpOwotCi0gICAgICAgIGlmIChkZXZpY2VLaW5kICE9IFVQX0RFVklDRV9LSU5EX0JB VFRFUlkgfHwgIWlzUHJlc2VudCkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotCi0gICAgICAgIG51 bU9mQmF0dGVyeURldmljZXMrKzsKLSAgICAgICAgY29tYmluZWRFbmVyZ3lDYXBhY2l0eUN1cnJl bnQgKz0gZW5lcmd5Q2FwYWNpdHlDdXJyZW50IC0gZW5lcmd5Q2FwYWNpdHlFbXB0eTsKLSAgICAg ICAgY29tYmluZWRFbmVyZ3lDYXBhY2l0eUZ1bGwgKz0gZW5lcmd5Q2FwYWNpdHlGdWxsOwotICAg ICAgICAvLyBBZGRlZCBlbmVyZ3kgcmF0ZSBzaG91bGQgYmUgc2lnbmVkIGFjY29yZGluZyB0byB0 aGUgY2hhcmdpbmcvZGlzY2hhcmdpbmcgc3RhdGUuCi0gICAgICAgIGNvbWJpbmVkRW5lcmd5UmF0 ZSArPSBkZXZpY2VTdGF0ZSA9PSBVUF9ERVZJQ0VfU1RBVEVfRElTQ0hBUkdJTkcgPyAtZW5lcmd5 UmF0ZSA6IGVuZXJneVJhdGU7Ci0gICAgfQotCi0gICAgZ19wdHJfYXJyYXlfdW5yZWYoZGV2aWNl cyk7Ci0KLSAgICBpZiAoIW51bU9mQmF0dGVyeURldmljZXMpIHsKKyAgICBVcERldmljZUtpbmQg ZGV2aWNlS2luZDsKKyAgICBVcERldmljZVN0YXRlIGRldmljZVN0YXRlOworICAgIGJvb2wgaXNQ cmVzZW50OworICAgIGdpbnQ2NCB0aW1lVG9FbXB0eSwgdGltZVRvRnVsbDsKKyAgICBnZG91Ymxl IHBlcmNlbnRhZ2U7CisKKyAgICBnX29iamVjdF9nZXQobV91cG93ZXJEZXZpY2UuZ2V0KCksCisg ICAgICAgICAgICAgICAgICJ0aW1lLXRvLWVtcHR5IiwgJnRpbWVUb0VtcHR5LAorICAgICAgICAg ICAgICAgICAidGltZS10by1mdWxsIiwgJnRpbWVUb0Z1bGwsCisgICAgICAgICAgICAgICAgICJw ZXJjZW50YWdlIiwgJnBlcmNlbnRhZ2UsCisgICAgICAgICAgICAgICAgICJpcy1wcmVzZW50Iiwg JmlzUHJlc2VudCwKKyAgICAgICAgICAgICAgICAgImtpbmQiLCAmZGV2aWNlS2luZCwKKyAgICAg ICAgICAgICAgICAgInN0YXRlIiwgJmRldmljZVN0YXRlLAorICAgICAgICAgICAgICAgICBudWxs cHRyKTsKKworICAgIGlmIChkZXZpY2VLaW5kICE9IFVQX0RFVklDRV9LSU5EX0JBVFRFUlkgfHwg IWlzUHJlc2VudCkgewogICAgICAgICBtX2NsaWVudC0+dXBkYXRlQmF0dGVyeVN0YXR1cyhOb3RB dmFpbGFibGUpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgZG91YmxlIGxldmVsID0g MDsKLSAgICBpZiAoY29tYmluZWRFbmVyZ3lDYXBhY2l0eUZ1bGwgPiAwKQotICAgICAgICBsZXZl bCA9IGNvbWJpbmVkRW5lcmd5Q2FwYWNpdHlDdXJyZW50IC8gY29tYmluZWRFbmVyZ3lDYXBhY2l0 eUZ1bGw7Ci0KLSAgICBpZiAoY29tYmluZWRFbmVyZ3lSYXRlID49IDApIHsKLSAgICAgICAgZG91 YmxlIGNoYXJnaW5nVGltZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHko KTsKLSAgICAgICAgaWYgKGNvbWJpbmVkRW5lcmd5UmF0ZSkKLSAgICAgICAgICAgIGNoYXJnaW5n VGltZSA9IDM2MDAgKiAoY29tYmluZWRFbmVyZ3lDYXBhY2l0eUZ1bGwgLSBjb21iaW5lZEVuZXJn eUNhcGFjaXR5Q3VycmVudCkgLyBjb21iaW5lZEVuZXJneVJhdGU7Ci0gICAgICAgIG1fY2xpZW50 LT51cGRhdGVCYXR0ZXJ5U3RhdHVzKENoYXJnaW5nLCBjaGFyZ2luZ1RpbWUsIGxldmVsKTsKKyAg ICBpZiAoZGV2aWNlU3RhdGUgPT0gVVBfREVWSUNFX1NUQVRFX0NIQVJHSU5HIHx8CisgICAgICAg IGRldmljZVN0YXRlID09IFVQX0RFVklDRV9TVEFURV9GVUxMWV9DSEFSR0VEIHx8CisgICAgICAg IGRldmljZVN0YXRlID09IFVQX0RFVklDRV9TVEFURV9QRU5ESU5HX0NIQVJHRSkgeworICAgICAg ICBtX2NsaWVudC0+dXBkYXRlQmF0dGVyeVN0YXR1cyhDaGFyZ2luZywgdGltZVRvRnVsbCAhPSAw ID8gdGltZVRvRnVsbCA6IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHkoKSwg cGVyY2VudGFnZSk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgZG91YmxlIGRpc2NoYXJnaW5nVGlt ZSA9IDM2MDAgKiBjb21iaW5lZEVuZXJneUNhcGFjaXR5Q3VycmVudCAvIHN0ZDo6YWJzKGNvbWJp bmVkRW5lcmd5UmF0ZSk7Ci0gICAgICAgIG1fY2xpZW50LT51cGRhdGVCYXR0ZXJ5U3RhdHVzKERp c2NoYXJnaW5nLCBkaXNjaGFyZ2luZ1RpbWUsIGxldmVsKTsKKyAgICAgICAgbV9jbGllbnQtPnVw ZGF0ZUJhdHRlcnlTdGF0dXMoRGlzY2hhcmdpbmcsIHRpbWVUb0VtcHR5ICE9IDAgPyB0aW1lVG9F bXB0eSA6IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91YmxlPjo6aW5maW5pdHkoKSwgcGVyY2VudGFn ZSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9nbGli L0JhdHRlcnlQcm92aWRlclVQb3dlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ2xpYi9C YXR0ZXJ5UHJvdmlkZXJVUG93ZXIuaAppbmRleCBkMTYwOWJiNjVhOGM1MmU4ODE1MThkOTVmZGVm ZjRjNWM2MTg3ZDE0Li43ZGQ4NTFmNjVmYjlhZGZmNmVmMGNkODQzMzc1MDFiZGYwZDU4YmRkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9nbGliL0JhdHRlcnlQcm92aWRlclVQ b3dlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dsaWIvQmF0dGVyeVByb3ZpZGVy VVBvd2VyLmgKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBCYXR0ZXJ5 UHJvdmlkZXJVUG93ZXJDbGllbnQqIG1fY2xpZW50OwogCi0gICAgR1JlZlB0cjxVcENsaWVudD4g bV91cG93ZXJDbGllbnQ7CisgICAgR1JlZlB0cjxVcERldmljZT4gbV91cG93ZXJEZXZpY2U7CiAK ICAgICBib29sIG1faXNVcGRhdGluZzsKIH07Cg==