51156 2010-12-15 17:43:00 -0800 Fix V8 JNI bindings 2010-12-17 14:21:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 0 swang webkit-unassigned abarth benm commit-queue jorlow steveblock tony oldest_to_newest 322981 0 swang 2010-12-15 17:43:00 -0800 Change http://trac.webkit.org/changeset/72974 broke V8 JNI bindings which is used by Android DumpRenderTree files. 322992 1 76723 swang 2010-12-15 18:12:58 -0800 Created attachment 76723 Fix V8 JNI binding. Make sure short/long are correctly converted. 323027 2 76723 abarth 2010-12-15 19:44:26 -0800 Comment on attachment 76723 Fix V8 JNI binding. View in context: https://bugs.webkit.org/attachment.cgi?id=76723&action=review > WebCore/ChangeLog:8 > + Existing tests shall suffice to test. Really? What test does this patch fix? 323049 3 swang 2010-12-15 22:12:10 -0800 Thanks for review Adam. You have a very good point. Since I'm not that familiar with this part of code, wonder whether you have any suggestion how to test this change. Thanks. 323095 4 steveblock 2010-12-16 03:27:24 -0800 Simon, you mentioned to me that this change fixes a number of test on Android in fast/events/touch (and perhaps fast/dom/Geolocation too)? The reason being that numeric values to LayoutTestController functions were not being correctly passed through to Android's Java DRT. This may be a sufficient test in itself. If you want to add a test specifically for these bindings, I think the correct place is in the java/ LayoutTests. There may already be a test case there, but we don't run these on Android. As for the change itself, it looks correct to me, based on http://www.mozilla.org/js/liveconnect/lc3_method_overloading.html. This conversion is lacking in V8 JNI bridge, irrespective of http://trac.webkit.org/changeset/72974. 323103 5 76723 benm 2010-12-16 04:08:08 -0800 Comment on attachment 76723 Fix V8 JNI binding. View in context: https://bugs.webkit.org/attachment.cgi?id=76723&action=review > WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp:110 > + result.s = static_cast<jshort>(NPVARIANT_TO_DOUBLE(value)); I think in addition to short and int types we need to do it for bytes too. 323298 6 76790 swang 2010-12-16 11:12:42 -0800 Created attachment 76790 Fix V8 JNI binding. 323676 7 steveblock 2010-12-17 02:41:30 -0800 > If you want to add a test specifically for these bindings, I think the correct > place is in the java/ LayoutTests. There may already be a test case there, but > we don't run these on Android. Did you look into these tests? Such a test would exercise the V8+JNI case if run on Chrome. The problem is that Android doesn't have an upstream bot. I'd be more comfortable r+ing if this if it were tested (or at least could be tested) by an upstream bot. 323678 8 76790 benm 2010-12-17 02:45:47 -0800 Comment on attachment 76790 Fix V8 JNI binding. View in context: https://bugs.webkit.org/attachment.cgi?id=76790&action=review > WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp:92 > + result.b = static_cast<char>(NPVARIANT_TO_DOUBLE(value)); I see that we cast to char on the line above, but I think this is wrong and a good opportunity to clean it up - should be jbyte. 323885 9 76895 swang 2010-12-17 11:19:27 -0800 Created attachment 76895 Fix V8 JNI binding. 323891 10 76895 steveblock 2010-12-17 11:24:39 -0800 Comment on attachment 76895 Fix V8 JNI binding. Looks like you need to rebase 323897 11 76898 swang 2010-12-17 11:32:26 -0800 Created attachment 76898 Fix V8 JNI binding. 323904 12 76898 steveblock 2010-12-17 11:38:49 -0800 Comment on attachment 76898 Fix V8 JNI binding. r=me 323963 13 76898 commit-queue 2010-12-17 13:24:55 -0800 Comment on attachment 76898 Fix V8 JNI binding. Clearing flags on attachment: 76898 Committed r74288: <http://trac.webkit.org/changeset/74288> 323964 14 commit-queue 2010-12-17 13:25:02 -0800 All reviewed patches have been landed. Closing bug. 323989 15 commit-queue 2010-12-17 14:21:01 -0800 The commit-queue encountered the following flaky tests while processing attachment 76898: fast/preloader/script.html bug 50879 (author: abarth@webkit.org) fast/loader/recursive-before-unload-crash.html bug 50880 (authors: beidson@apple.com and eric@webkit.org) The commit-queue is continuing to process your patch. 76723 2010-12-15 18:12:58 -0800 2010-12-16 11:12:42 -0800 Fix V8 JNI binding. FixV8Jni.txt text/plain 1667 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDE2NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMTItMTUgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggVjggSk5JIGJpbmRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MTE1NgorCisgICAgICAgIEV4aXN0aW5nIHRlc3RzIHNoYWxsIHN1 ZmZpY2UgdG8gdGVzdC4KKworICAgICAgICAqIGJyaWRnZS9qbmkvdjgvSk5JVXRpbGl0eVByaXZh dGUuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6Y29udmVydE5QVmFyaWFudFRvSlZhbHVl KToKKwogMjAxMC0xMi0xNSAgQWxleCBCcmVkYXJpb2wgR3JpbG8gIDxhYmdyaWxvQHByb2Z1c2lv bi5tb2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29y ZS9icmlkZ2Uvam5pL3Y4L0pOSVV0aWxpdHlQcml2YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2JyaWRnZS9qbmkvdjgvSk5JVXRpbGl0eVByaXZhdGUuY3BwCShyZXZpc2lvbiA3NDE2NykK KysrIFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklVdGlsaXR5UHJpdmF0ZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTEwNiw2ICsxMDYsOCBAQCBqdmFsdWUgY29udmVydE5QVmFyaWFudFRvSlZhbHVl KE5QVmFyaWFuCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh0eXBlID09IE5QVmFyaWFudFR5 cGVfSW50MzIpCiAgICAgICAgICAgICAgICAgcmVzdWx0LnMgPSBzdGF0aWNfY2FzdDxqc2hvcnQ+ KE5QVkFSSUFOVF9UT19JTlQzMih2YWx1ZSkpOworICAgICAgICAgICAgZWxzZSBpZiAodHlwZSA9 PSBOUFZhcmlhbnRUeXBlX0RvdWJsZSkKKyAgICAgICAgICAgICAgICByZXN1bHQucyA9IHN0YXRp Y19jYXN0PGpzaG9ydD4oTlBWQVJJQU5UX1RPX0RPVUJMRSh2YWx1ZSkpOwogICAgICAgICAgICAg ZWxzZQogICAgICAgICAgICAgICAgIG1lbXNldCgmcmVzdWx0LCAwLCBzaXplb2YoanZhbHVlKSk7 CiAgICAgICAgIH0KQEAgLTExNSw2ICsxMTcsOCBAQCBqdmFsdWUgY29udmVydE5QVmFyaWFudFRv SlZhbHVlKE5QVmFyaWFuCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh0eXBlID09IE5QVmFy aWFudFR5cGVfSW50MzIpCiAgICAgICAgICAgICAgICAgcmVzdWx0LmkgPSBzdGF0aWNfY2FzdDxq aW50PihOUFZBUklBTlRfVE9fSU5UMzIodmFsdWUpKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKHR5 cGUgPT0gTlBWYXJpYW50VHlwZV9Eb3VibGUpCisgICAgICAgICAgICAgICAgcmVzdWx0LmkgPSBz dGF0aWNfY2FzdDxqaW50PihOUFZBUklBTlRfVE9fRE9VQkxFKHZhbHVlKSk7CiAgICAgICAgICAg ICBlbHNlCiAgICAgICAgICAgICAgICAgbWVtc2V0KCZyZXN1bHQsIDAsIHNpemVvZihqdmFsdWUp KTsKICAgICAgICAgfQo= 76790 2010-12-16 11:12:42 -0800 2010-12-17 11:19:27 -0800 Fix V8 JNI binding. FixV8Jni.txt text/plain 2071 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDE2NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTAtMTItMTUgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggVjggSk5JIGJpbmRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MTE1NgorCisgICAgICAgIFRlc3RlZCBvbiBBbmRyb2lkIGZhc3Qv ZXZlbnRzL3RvdWNoIHRlc3RzLgorCisgICAgICAgICogYnJpZGdlL2puaS92OC9KTklVdGlsaXR5 UHJpdmF0ZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpjb252ZXJ0TlBWYXJpYW50VG9K VmFsdWUpOgorCiAyMDEwLTEyLTE1ICBBbGV4IEJyZWRhcmlvbCBHcmlsbyAgPGFiZ3JpbG9AcHJv ZnVzaW9uLm1vYmk+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBX ZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JVXRpbGl0eVByaXZhdGUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklVdGlsaXR5UHJpdmF0ZS5jcHAJKHJldmlzaW9uIDc0 MTY3KQorKysgV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pOSVV0aWxpdHlQcml2YXRlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtODgsNiArODgsOCBAQCBqdmFsdWUgY29udmVydE5QVmFyaWFudFRvSlZh bHVlKE5QVmFyaWFuCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh0eXBlID09IE5QVmFyaWFu dFR5cGVfSW50MzIpCiAgICAgICAgICAgICAgICAgcmVzdWx0LmIgPSBzdGF0aWNfY2FzdDxjaGFy PihOUFZBUklBTlRfVE9fSU5UMzIodmFsdWUpKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKHR5cGUg PT0gTlBWYXJpYW50VHlwZV9Eb3VibGUpCisgICAgICAgICAgICAgICAgcmVzdWx0LmIgPSBzdGF0 aWNfY2FzdDxjaGFyPihOUFZBUklBTlRfVE9fRE9VQkxFKHZhbHVlKSk7CiAgICAgICAgICAgICBl bHNlCiAgICAgICAgICAgICAgICAgbWVtc2V0KCZyZXN1bHQsIDAsIHNpemVvZihqdmFsdWUpKTsK ICAgICAgICAgfQpAQCAtMTA2LDYgKzEwOCw4IEBAIGp2YWx1ZSBjb252ZXJ0TlBWYXJpYW50VG9K VmFsdWUoTlBWYXJpYW4KICAgICAgICAgewogICAgICAgICAgICAgaWYgKHR5cGUgPT0gTlBWYXJp YW50VHlwZV9JbnQzMikKICAgICAgICAgICAgICAgICByZXN1bHQucyA9IHN0YXRpY19jYXN0PGpz aG9ydD4oTlBWQVJJQU5UX1RPX0lOVDMyKHZhbHVlKSk7CisgICAgICAgICAgICBlbHNlIGlmICh0 eXBlID09IE5QVmFyaWFudFR5cGVfRG91YmxlKQorICAgICAgICAgICAgICAgIHJlc3VsdC5zID0g c3RhdGljX2Nhc3Q8anNob3J0PihOUFZBUklBTlRfVE9fRE9VQkxFKHZhbHVlKSk7CiAgICAgICAg ICAgICBlbHNlCiAgICAgICAgICAgICAgICAgbWVtc2V0KCZyZXN1bHQsIDAsIHNpemVvZihqdmFs dWUpKTsKICAgICAgICAgfQpAQCAtMTE1LDYgKzExOSw4IEBAIGp2YWx1ZSBjb252ZXJ0TlBWYXJp YW50VG9KVmFsdWUoTlBWYXJpYW4KICAgICAgICAgewogICAgICAgICAgICAgaWYgKHR5cGUgPT0g TlBWYXJpYW50VHlwZV9JbnQzMikKICAgICAgICAgICAgICAgICByZXN1bHQuaSA9IHN0YXRpY19j YXN0PGppbnQ+KE5QVkFSSUFOVF9UT19JTlQzMih2YWx1ZSkpOworICAgICAgICAgICAgZWxzZSBp ZiAodHlwZSA9PSBOUFZhcmlhbnRUeXBlX0RvdWJsZSkKKyAgICAgICAgICAgICAgICByZXN1bHQu aSA9IHN0YXRpY19jYXN0PGppbnQ+KE5QVkFSSUFOVF9UT19ET1VCTEUodmFsdWUpKTsKICAgICAg ICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBtZW1zZXQoJnJlc3VsdCwgMCwgc2l6ZW9mKGp2 YWx1ZSkpOwogICAgICAgICB9Cg== 76895 2010-12-17 11:19:27 -0800 2010-12-17 11:32:26 -0800 Fix V8 JNI binding. FixV8Jni.txt text/plain 2358 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDE2NykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMTItMTUgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggVjggSk5JIGJpbmRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MTE1NgorCisgICAgICAgIFRoZXJlJ3JlIExheW91dFRlc3RzIGlu OgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2Jyb3dzZXIvdHJ1bmsvTGF5b3V0VGVz dHMvamF2YS9sYzMvSlNOdW1iZXIKKyAgICAgICAgdG8gZXhlcmNpc2UgdGhlc2UgY29kZSBwYXRo cy4KKyAgICAgICAgVGhvdWdoIENocm9taXVtIGRvbid0IHJ1biB0aGVtLgorICAgICAgICBUZXN0 ZWQgb24gQW5kcm9pZCBmYXN0L2V2ZW50cy90b3VjaCB0ZXN0cy4KKworICAgICAgICAqIGJyaWRn ZS9qbmkvdjgvSk5JVXRpbGl0eVByaXZhdGUuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6 Y29udmVydE5QVmFyaWFudFRvSlZhbHVlKToKKwogMjAxMC0xMi0xNSAgQWxleCBCcmVkYXJpb2wg R3JpbG8gIDxhYmdyaWxvQHByb2Z1c2lvbi5tb2JpPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVy aWMgU2VpZGVsLgpJbmRleDogV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pOSVV0aWxpdHlQcml2YXRl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JVXRpbGl0eVByaXZh dGUuY3BwCShyZXZpc2lvbiA3NDE2NykKKysrIFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklVdGls aXR5UHJpdmF0ZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg3LDcgKzg3LDkgQEAganZhbHVlIGNv bnZlcnROUFZhcmlhbnRUb0pWYWx1ZShOUFZhcmlhbgogICAgIGNhc2UgYnl0ZV90eXBlOgogICAg ICAgICB7CiAgICAgICAgICAgICBpZiAodHlwZSA9PSBOUFZhcmlhbnRUeXBlX0ludDMyKQotICAg ICAgICAgICAgICAgIHJlc3VsdC5iID0gc3RhdGljX2Nhc3Q8Y2hhcj4oTlBWQVJJQU5UX1RPX0lO VDMyKHZhbHVlKSk7CisgICAgICAgICAgICAgICAgcmVzdWx0LmIgPSBzdGF0aWNfY2FzdDxqYnl0 ZT4oTlBWQVJJQU5UX1RPX0lOVDMyKHZhbHVlKSk7CisgICAgICAgICAgICBlbHNlIGlmICh0eXBl ID09IE5QVmFyaWFudFR5cGVfRG91YmxlKQorICAgICAgICAgICAgICAgIHJlc3VsdC5iID0gc3Rh dGljX2Nhc3Q8amJ5dGU+KE5QVkFSSUFOVF9UT19ET1VCTEUodmFsdWUpKTsKICAgICAgICAgICAg IGVsc2UKICAgICAgICAgICAgICAgICBtZW1zZXQoJnJlc3VsdCwgMCwgc2l6ZW9mKGp2YWx1ZSkp OwogICAgICAgICB9CkBAIC0xMDYsNiArMTA4LDggQEAganZhbHVlIGNvbnZlcnROUFZhcmlhbnRU b0pWYWx1ZShOUFZhcmlhbgogICAgICAgICB7CiAgICAgICAgICAgICBpZiAodHlwZSA9PSBOUFZh cmlhbnRUeXBlX0ludDMyKQogICAgICAgICAgICAgICAgIHJlc3VsdC5zID0gc3RhdGljX2Nhc3Q8 anNob3J0PihOUFZBUklBTlRfVE9fSU5UMzIodmFsdWUpKTsKKyAgICAgICAgICAgIGVsc2UgaWYg KHR5cGUgPT0gTlBWYXJpYW50VHlwZV9Eb3VibGUpCisgICAgICAgICAgICAgICAgcmVzdWx0LnMg PSBzdGF0aWNfY2FzdDxqc2hvcnQ+KE5QVkFSSUFOVF9UT19ET1VCTEUodmFsdWUpKTsKICAgICAg ICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBtZW1zZXQoJnJlc3VsdCwgMCwgc2l6ZW9mKGp2 YWx1ZSkpOwogICAgICAgICB9CkBAIC0xMTUsNiArMTE5LDggQEAganZhbHVlIGNvbnZlcnROUFZh cmlhbnRUb0pWYWx1ZShOUFZhcmlhbgogICAgICAgICB7CiAgICAgICAgICAgICBpZiAodHlwZSA9 PSBOUFZhcmlhbnRUeXBlX0ludDMyKQogICAgICAgICAgICAgICAgIHJlc3VsdC5pID0gc3RhdGlj X2Nhc3Q8amludD4oTlBWQVJJQU5UX1RPX0lOVDMyKHZhbHVlKSk7CisgICAgICAgICAgICBlbHNl IGlmICh0eXBlID09IE5QVmFyaWFudFR5cGVfRG91YmxlKQorICAgICAgICAgICAgICAgIHJlc3Vs dC5pID0gc3RhdGljX2Nhc3Q8amludD4oTlBWQVJJQU5UX1RPX0RPVUJMRSh2YWx1ZSkpOwogICAg ICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIG1lbXNldCgmcmVzdWx0LCAwLCBzaXplb2Yo anZhbHVlKSk7CiAgICAgICAgIH0K 76898 2010-12-17 11:32:26 -0800 2010-12-17 13:24:55 -0800 Fix V8 JNI binding. FixV8Jni.txt text/plain 2357 swang SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDI4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMTItMTcgIFNoaW1lbmcgKFNpbW9uKSBXYW5nICA8c3dhbmdA Z29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBGaXggVjggSk5JIGJpbmRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01MTE1NgorCisgICAgICAgIFRoZXJlJ3JlIExheW91dFRlc3RzIGlu OgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2Jyb3dzZXIvdHJ1bmsvTGF5b3V0VGVz dHMvamF2YS9sYzMvSlNOdW1iZXIKKyAgICAgICAgdG8gZXhlcmNpc2UgdGhlc2UgY29kZSBwYXRo cy4KKyAgICAgICAgVGhvdWdoIENocm9taXVtIGRvbid0IHJ1biB0aGVtLgorICAgICAgICBUZXN0 ZWQgb24gQW5kcm9pZCBmYXN0L2V2ZW50cy90b3VjaCB0ZXN0cy4KKworICAgICAgICAqIGJyaWRn ZS9qbmkvdjgvSk5JVXRpbGl0eVByaXZhdGUuY3BwOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6 Y29udmVydE5QVmFyaWFudFRvSlZhbHVlKToKKwogMjAxMC0xMi0xNyAgVy4gSmFtZXMgTWFjTGVh biAgPHdqbWFjbGVhbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMg Um9iaW5zb24uCkluZGV4OiBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JVXRpbGl0eVByaXZhdGUu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklVdGlsaXR5UHJpdmF0 ZS5jcHAJKHJldmlzaW9uIDc0MjgwKQorKysgV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pOSVV0aWxp dHlQcml2YXRlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODcsNyArODcsOSBAQCBqdmFsdWUgY29u dmVydE5QVmFyaWFudFRvSlZhbHVlKE5QVmFyaWFuCiAgICAgY2FzZSBieXRlX3R5cGU6CiAgICAg ICAgIHsKICAgICAgICAgICAgIGlmICh0eXBlID09IE5QVmFyaWFudFR5cGVfSW50MzIpCi0gICAg ICAgICAgICAgICAgcmVzdWx0LmIgPSBzdGF0aWNfY2FzdDxjaGFyPihOUFZBUklBTlRfVE9fSU5U MzIodmFsdWUpKTsKKyAgICAgICAgICAgICAgICByZXN1bHQuYiA9IHN0YXRpY19jYXN0PGpieXRl PihOUFZBUklBTlRfVE9fSU5UMzIodmFsdWUpKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKHR5cGUg PT0gTlBWYXJpYW50VHlwZV9Eb3VibGUpCisgICAgICAgICAgICAgICAgcmVzdWx0LmIgPSBzdGF0 aWNfY2FzdDxqYnl0ZT4oTlBWQVJJQU5UX1RPX0RPVUJMRSh2YWx1ZSkpOwogICAgICAgICAgICAg ZWxzZQogICAgICAgICAgICAgICAgIG1lbXNldCgmcmVzdWx0LCAwLCBzaXplb2YoanZhbHVlKSk7 CiAgICAgICAgIH0KQEAgLTEwNiw2ICsxMDgsOCBAQCBqdmFsdWUgY29udmVydE5QVmFyaWFudFRv SlZhbHVlKE5QVmFyaWFuCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh0eXBlID09IE5QVmFy aWFudFR5cGVfSW50MzIpCiAgICAgICAgICAgICAgICAgcmVzdWx0LnMgPSBzdGF0aWNfY2FzdDxq c2hvcnQ+KE5QVkFSSUFOVF9UT19JTlQzMih2YWx1ZSkpOworICAgICAgICAgICAgZWxzZSBpZiAo dHlwZSA9PSBOUFZhcmlhbnRUeXBlX0RvdWJsZSkKKyAgICAgICAgICAgICAgICByZXN1bHQucyA9 IHN0YXRpY19jYXN0PGpzaG9ydD4oTlBWQVJJQU5UX1RPX0RPVUJMRSh2YWx1ZSkpOwogICAgICAg ICAgICAgZWxzZQogICAgICAgICAgICAgICAgIG1lbXNldCgmcmVzdWx0LCAwLCBzaXplb2YoanZh bHVlKSk7CiAgICAgICAgIH0KQEAgLTExNSw2ICsxMTksOCBAQCBqdmFsdWUgY29udmVydE5QVmFy aWFudFRvSlZhbHVlKE5QVmFyaWFuCiAgICAgICAgIHsKICAgICAgICAgICAgIGlmICh0eXBlID09 IE5QVmFyaWFudFR5cGVfSW50MzIpCiAgICAgICAgICAgICAgICAgcmVzdWx0LmkgPSBzdGF0aWNf Y2FzdDxqaW50PihOUFZBUklBTlRfVE9fSU5UMzIodmFsdWUpKTsKKyAgICAgICAgICAgIGVsc2Ug aWYgKHR5cGUgPT0gTlBWYXJpYW50VHlwZV9Eb3VibGUpCisgICAgICAgICAgICAgICAgcmVzdWx0 LmkgPSBzdGF0aWNfY2FzdDxqaW50PihOUFZBUklBTlRfVE9fRE9VQkxFKHZhbHVlKSk7CiAgICAg ICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgbWVtc2V0KCZyZXN1bHQsIDAsIHNpemVvZihq dmFsdWUpKTsKICAgICAgICAgfQo=