95573 2012-08-31 08:06:26 -0700 [chromium] WebGestureEvent deltaX/deltaY fields are overloaded 2012-09-05 21:46:20 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93123 95496 1 rbyers rbyers abarth jamesr rjkroege webkit.review.bot oldest_to_newest 709635 0 rbyers 2012-08-31 08:06:26 -0700 Split out from bug 93123 which covers PlatformGestureEvent. First I'll fix chromium's WebGestureEvent. 709726 1 161721 rbyers 2012-08-31 09:42:15 -0700 Created attachment 161721 Patch 711076 2 161721 rbyers 2012-09-04 06:48:18 -0700 Comment on attachment 161721 Patch I can't land this until http://codereview.chromium.org/10895024/ lands, but other than updating the ChangeLog with the right chromium revision number, I don't have any other changes planned so we might as well start reviewing this now. 711090 3 162037 rbyers 2012-09-04 07:10:18 -0700 Created attachment 162037 Update bug number in ChangeLog 711160 4 162037 jamesr 2012-09-04 09:00:35 -0700 Comment on attachment 162037 Update bug number in ChangeLog View in context: https://bugs.webkit.org/attachment.cgi?id=162037&action=review > Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp:1159 > + event.data.scrollUpdate.deltaX = > + static_cast<float>(arguments[0].toDouble()); > + event.data.scrollUpdate.deltaY = > + static_cast<float>(arguments[1].toDouble()); no need to line wrap - this is WebKit > Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp:1178 > + event.data.tap.tapCount = > + static_cast<float>(arguments[2].toDouble()); no line wrapping here > Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp:1240 > + event.data.flingStart.velocityX = > + static_cast<float>(arguments[2].toDouble()); > + event.data.flingStart.velocityY = > + static_cast<float>(arguments[3].toDouble()); same 711167 5 162037 rbyers 2012-09-04 09:13:50 -0700 Comment on attachment 162037 Update bug number in ChangeLog View in context: https://bugs.webkit.org/attachment.cgi?id=162037&action=review >> Tools/DumpRenderTree/chromium/TestRunner/EventSender.cpp:1159 >> + static_cast<float>(arguments[1].toDouble()); > > no need to line wrap - this is WebKit Thanks. Going back and forth on this 6-way handshake isn't making it any easier for me to get use to WebKit style vs. chromium style ;-) 711169 6 162050 rbyers 2012-09-04 09:17:18 -0700 Created attachment 162050 jamesr cr feedback 711209 7 162050 jamesr 2012-09-04 10:16:50 -0700 Comment on attachment 162050 jamesr cr feedback Looks good, although we can't land yet. 712333 8 162290 rbyers 2012-09-05 11:07:53 -0700 Created attachment 162290 Update ChangeLog with chromium CL numbers 712347 9 rbyers 2012-09-05 11:18:35 -0700 Thanks James! 712854 10 162290 webkit.review.bot 2012-09-05 21:46:16 -0700 Comment on attachment 162290 Update ChangeLog with chromium CL numbers Clearing flags on attachment: 162290 Committed r127689: <http://trac.webkit.org/changeset/127689> 712855 11 webkit.review.bot 2012-09-05 21:46:20 -0700 All reviewed patches have been landed. Closing bug. 161721 2012-08-31 09:42:15 -0700 2012-09-04 07:10:15 -0700 Patch bug-95573-20120831124202.patch text/plain 17092 rbyers U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGY1OTc1OGJlNDE1YTY0ODIxZGM5M2Y3OGI4MjdhN2FjMjUzYmQ2ZWYuLmMxNjQwNzIxMzU0NzNl YjBjZTlkMTUzYzYyN2I2YjA2OGJjOTg0M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTItMDgtMzAgIFJpY2sgQnllcnMgIDxyYnllcnNAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFVzZSBuZXcgdHlwZS1zcGVjaWZpYyBXZWJHZXN0dXJlRXZlbnQgZmll bGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzEy MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENocm9t aXVtIGhhcyBiZWVuIHVwZGF0ZWQgdG8gc3RvcmUgZ2VzdHVyZS10eXBlIHNwZWNpZmljIGRldGFp bHMgaW4gdGhlCisgICAgICAgIG5ldyBXZWJHZXN0dXJlRXZlbnQgZmllbGRzIChjcnJldi5jb20v MTUyNTA4KSwgc28gd2UgY2FuIG5vdyByZWx5IG9uIHRoZW0uCisgICAgICAgIFRPRE86IGFsc28g bGlzdCByZXZpc2lvbiBVUkwgZm9yCisgICAgICAgIGh0dHA6Ly9jb2RlcmV2aWV3LmNocm9taXVt Lm9yZy8xMDg5NTAyNC8gd2hlbiBpdCBsYW5kcy4KKworICAgICAgICAqIHNyYy9XZWJDb21wb3Np dG9ySW5wdXRIYW5kbGVySW1wbC5jcHA6CisgICAgICAgIFVwZGF0ZSB0aGUgY29tcG9zaXRvciBz Y3JvbGwsIHBpbmNoIGFuZCBmbGluZyBoYW5kbGluZyB0byB1c2UgdGhlc2UgbmV3IGZpZWxkcy4K KyAgICAgICAgKFdlYktpdDo6V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmhhbmRsZUlu cHV0RXZlbnRJbnRlcm5hbCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JJbnB1dEhh bmRsZXJJbXBsOjpoYW5kbGVHZXN0dXJlRmxpbmcpOgorICAgICAgICAqIHNyYy9XZWJJbnB1dEV2 ZW50Q29udmVyc2lvbi5jcHA6CisgICAgICAgIFVwZGF0ZSBQbGF0Zm9ybUdlc3R1cmVFdmVudC9X ZWJHZXN0dXJlRXZlbnQgY29udmVyc2lvbiB0byB1c2UgdGhlIG5ldworICAgICAgICBmaWVsZHMs IHN0b3JpbmcgaW50byB0aGUgZXhpc3Rpbmcgb3ZlcmxvYWRlZCBQbGF0Zm9ybUdlc3R1cmVFdmVu dAorICAgICAgICBmaWVsZHMgKHdoaWNoIHdpbGwgYmUgY2xlYW5lZCB1cCBpbiBteSBuZXh0IENM KS4KKyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1HZXN0dXJlRXZlbnRCdWlsZGVyOjpQbGF0Zm9y bUdlc3R1cmVFdmVudEJ1aWxkZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJHZXN0dXJlRXZlbnRC dWlsZGVyOjpXZWJHZXN0dXJlRXZlbnRCdWlsZGVyKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0lt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50 KToKKyAgICAgICAgVXBkYXRlIGZsaW5nIHNjcm9sbGluZyBpbXBsZW1lbnRhdGlvbiBmb3IgY29y cmVjdCBsb2NhdGlvbiBvZiB2ZWxvY2l0eS4KKyAgICAgICAgKiB0ZXN0cy9XZWJDb21wb3NpdG9y SW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpURVNUX0YpOgorICAg ICAgICBVcGRhdGUgdGVzdHMgdG8gdXNlIHRoZSBuZXcgZmllbGRzLgorCisKIDIwMTItMDgtMzAg IEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21p dW1dIE1ha2Ugd2Via2l0X2NvbXBvc2l0b3Igc3BlY2lmaWMgdW5pdCB0ZXN0IGNvbXBpbGF0aW9u IGNvbmRpdGlvbmFsIG9uIGd5cCB2YXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsLmNwcAppbmRleCA4MDg0 ZDcxNWM3YjAyYTU3OGU0MWVjYmEzZTk5Mzg0ZjY0MmFkMmU5Li4xZTUwMzg1NTBiMDE3OTM1YzBm ZGQyM2JlMzU0OWYyYWEyYTE3NGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGwuY3BwCkBAIC0yMTYs NyArMjE2LDggQEAgV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OkV2ZW50RGlzcG9zaXRp b24gV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmgKICAgICAgICAgICAgIHJldHVybiBE aWROb3RIYW5kbGU7CiAKICAgICAgICAgY29uc3QgV2ViR2VzdHVyZUV2ZW50JiBnZXN0dXJlRXZl bnQgPSAqc3RhdGljX2Nhc3Q8Y29uc3QgV2ViR2VzdHVyZUV2ZW50Kj4oJmV2ZW50KTsKLSAgICAg ICAgbV9pbnB1dEhhbmRsZXJDbGllbnQtPnNjcm9sbEJ5KEludFBvaW50KGdlc3R1cmVFdmVudC54 LCBnZXN0dXJlRXZlbnQueSksIEludFNpemUoLWdlc3R1cmVFdmVudC5kZWx0YVgsIC1nZXN0dXJl RXZlbnQuZGVsdGFZKSk7CisgICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5zY3JvbGxCeShJ bnRQb2ludChnZXN0dXJlRXZlbnQueCwgZ2VzdHVyZUV2ZW50LnkpLAorICAgICAgICAgICAgSW50 U2l6ZSgtZ2VzdHVyZUV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWCwgLWdlc3R1cmVFdmVu dC5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVkpKTsKICAgICAgICAgcmV0dXJuIERpZEhhbmRsZTsK ICAgICB9IGVsc2UgaWYgKGV2ZW50LnR5cGUgPT0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9s bEVuZCkgewogICAgICAgICBBU1NFUlQobV9leHBlY3RTY3JvbGxVcGRhdGVFbmQpOwpAQCAtMjQ2 LDcgKzI0Nyw3IEBAIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0 aW9uIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpoCiAgICAgfSBlbHNlIGlmIChldmVu dC50eXBlID09IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQaW5jaFVwZGF0ZSkgewogICAgICAgICBB U1NFUlQobV9leHBlY3RQaW5jaFVwZGF0ZUVuZCk7CiAgICAgICAgIGNvbnN0IFdlYkdlc3R1cmVF dmVudCYgZ2VzdHVyZUV2ZW50ID0gKnN0YXRpY19jYXN0PGNvbnN0IFdlYkdlc3R1cmVFdmVudCo+ KCZldmVudCk7Ci0gICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5waW5jaEdlc3R1cmVVcGRh dGUoZ2VzdHVyZUV2ZW50LmRlbHRhWCwgSW50UG9pbnQoZ2VzdHVyZUV2ZW50LngsIGdlc3R1cmVF dmVudC55KSk7CisgICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5waW5jaEdlc3R1cmVVcGRh dGUoZ2VzdHVyZUV2ZW50LmRhdGEucGluY2hVcGRhdGUuc2NhbGUsIEludFBvaW50KGdlc3R1cmVF dmVudC54LCBnZXN0dXJlRXZlbnQueSkpOwogICAgICAgICByZXR1cm4gRGlkSGFuZGxlOwogICAg IH0gZWxzZSBpZiAoZXZlbnQudHlwZSA9PSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlRmxpbmdTdGFy dCkgewogICAgICAgICBjb25zdCBXZWJHZXN0dXJlRXZlbnQmIGdlc3R1cmVFdmVudCA9ICpzdGF0 aWNfY2FzdDxjb25zdCBXZWJHZXN0dXJlRXZlbnQqPigmZXZlbnQpOwpAQCAtMjY3LDkgKzI2OCw5 IEBAIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0aW9uIFdlYkNv bXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpoCiAgICAgc3dpdGNoIChzY3JvbGxTdGF0dXMpIHsK ICAgICBjYXNlIENDSW5wdXRIYW5kbGVyQ2xpZW50OjpTY3JvbGxTdGFydGVkOiB7CiAgICAgICAg IFRSQUNFX0VWRU5UX0lOU1RBTlQwKCJjYyIsICJXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1w bDo6aGFuZGxlR2VzdHVyZUZsaW5nOjpzdGFydGVkIik7Ci0gICAgICAgIE93blB0cjxQbGF0Zm9y bUdlc3R1cmVDdXJ2ZT4gZmxpbmdDdXJ2ZSA9IFRvdWNocGFkRmxpbmdQbGF0Zm9ybUdlc3R1cmVD dXJ2ZTo6Y3JlYXRlKEZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50LmRlbHRhWCwgZ2VzdHVyZUV2ZW50 LmRlbHRhWSkpOworICAgICAgICBPd25QdHI8UGxhdGZvcm1HZXN0dXJlQ3VydmU+IGZsaW5nQ3Vy dmUgPSBUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0dXJlQ3VydmU6OmNyZWF0ZShGbG9hdFBvaW50 KGdlc3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYLCBnZXN0dXJlRXZlbnQuZGF0 YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WSkpOwogICAgICAgICBtX3doZWVsRmxpbmdBbmltYXRpb24g PSBDQ0FjdGl2ZUdlc3R1cmVBbmltYXRpb246OmNyZWF0ZShQbGF0Zm9ybUdlc3R1cmVUb0NDR2Vz dHVyZUFkYXB0ZXI6OmNyZWF0ZShmbGluZ0N1cnZlLnJlbGVhc2UoKSksIHRoaXMpOwotICAgICAg ICBtX3doZWVsRmxpbmdQYXJhbWV0ZXJzLmRlbHRhID0gV2ViRmxvYXRQb2ludChnZXN0dXJlRXZl bnQuZGVsdGFYLCBnZXN0dXJlRXZlbnQuZGVsdGFZKTsKKyAgICAgICAgbV93aGVlbEZsaW5nUGFy YW1ldGVycy5kZWx0YSA9IFdlYkZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50LmRhdGEuZmxpbmdTdGFy dC52ZWxvY2l0eVgsIGdlc3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZKTsKICAg ICAgICAgbV93aGVlbEZsaW5nUGFyYW1ldGVycy5wb2ludCA9IFdlYlBvaW50KGdlc3R1cmVFdmVu dC54LCBnZXN0dXJlRXZlbnQueSk7CiAgICAgICAgIG1fd2hlZWxGbGluZ1BhcmFtZXRlcnMuZ2xv YmFsUG9pbnQgPSBXZWJQb2ludChnZXN0dXJlRXZlbnQuZ2xvYmFsWCwgZ2VzdHVyZUV2ZW50Lmds b2JhbFkpOwogICAgICAgICBtX3doZWVsRmxpbmdQYXJhbWV0ZXJzLm1vZGlmaWVycyA9IGdlc3R1 cmVFdmVudC5tb2RpZmllcnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAKaW5kZXggMDM5MWMyODViN2Y4ZTNlNjY5NTE2 MzlkMzY1ZjU4YmQ3M2U4YTk5Mi4uYmI2YjU3MzU1MzllZDc2MmJjMWM2NTkyZmJiY2I1NGI0NDRh MjI4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVu dENvbnZlcnNpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0 RXZlbnRDb252ZXJzaW9uLmNwcApAQCAtMTQ5LDEwICsxNDksMTQgQEAgUGxhdGZvcm1HZXN0dXJl RXZlbnRCdWlsZGVyOjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRnZXQs IGNvbnN0IFcKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJl U2Nyb2xsVXBkYXRlOgogICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlU2Ny b2xsVXBkYXRlOworICAgICAgICBtX2RlbHRhWCA9IGUuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFY OworICAgICAgICBtX2RlbHRhWSA9IGUuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZOwogICAgICAg ICBicmVhazsKICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Okdlc3R1cmVUYXA6CiAgICAgICAgIG1f dHlwZSA9IFBsYXRmb3JtRXZlbnQ6Okdlc3R1cmVUYXA7Ci0gICAgICAgIG1fYXJlYSA9IEludFNp emUoZS5ib3VuZGluZ0JveC53aWR0aCwgZS5ib3VuZGluZ0JveC5oZWlnaHQpOworICAgICAgICBt X2FyZWEgPSBJbnRTaXplKGUuZGF0YS50YXAud2lkdGgsIGUuZGF0YS50YXAuaGVpZ2h0KTsKKyAg ICAgICAgLy8gRklYTUU6IFBsYXRmb3JtR2VzdHVyZUV2ZW50IGRlbHRhWCBpcyBvdmVybG9hZGVk IC0gd2tiLnVnLzkzMTIzCisgICAgICAgIG1fZGVsdGFYID0gc3RhdGljX2Nhc3Q8aW50PihlLmRh dGEudGFwLnRhcENvdW50KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50 OjpHZXN0dXJlVGFwRG93bjoKICAgICAgICAgbV90eXBlID0gUGxhdGZvcm1FdmVudDo6R2VzdHVy ZVRhcERvd247CkBAIC0xNjUsNyArMTY5LDcgQEAgUGxhdGZvcm1HZXN0dXJlRXZlbnRCdWlsZGVy OjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IFcKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlTG9uZ1ByZXNzOgog ICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlTG9uZ1ByZXNzOwotICAgICAg ICBtX2FyZWEgPSBJbnRTaXplKGUuYm91bmRpbmdCb3gud2lkdGgsIGUuYm91bmRpbmdCb3guaGVp Z2h0KTsKKyAgICAgICAgbV9hcmVhID0gSW50U2l6ZShlLmRhdGEubG9uZ1ByZXNzLndpZHRoLCBl LmRhdGEubG9uZ1ByZXNzLmhlaWdodCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5w dXRFdmVudDo6R2VzdHVyZVBpbmNoQmVnaW46CiAgICAgICAgIG1fdHlwZSA9IFBsYXRmb3JtRXZl bnQ6Okdlc3R1cmVQaW5jaEJlZ2luOwpAQCAtMTc1LDE0ICsxNzksMTQgQEAgUGxhdGZvcm1HZXN0 dXJlRXZlbnRCdWlsZGVyOjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRn ZXQsIGNvbnN0IFcKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0 dXJlUGluY2hVcGRhdGU6CiAgICAgICAgIG1fdHlwZSA9IFBsYXRmb3JtRXZlbnQ6Okdlc3R1cmVQ aW5jaFVwZGF0ZTsKKyAgICAgICAgLy8gRklYTUU6IFBsYXRmb3JtR2VzdHVyZUV2ZW50IGRlbHRh WCBpcyBvdmVybG9hZGVkIC0gd2tiLnVnLzkzMTIzCisgICAgICAgIG1fZGVsdGFYID0gZS5kYXRh LnBpbmNoVXBkYXRlLnNjYWxlOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAgICAgbV9wb3NpdGlvbiA9IHdpZGdldC0+ Y29udmVydEZyb21Db250YWluaW5nV2luZG93KEludFBvaW50KGUueCwgZS55KSk7CiAgICAgbV9n bG9iYWxQb3NpdGlvbiA9IEludFBvaW50KGUuZ2xvYmFsWCwgZS5nbG9iYWxZKTsKLSAgICBtX2Rl bHRhWCA9IGUuZGVsdGFYOwotICAgIG1fZGVsdGFZID0gZS5kZWx0YVk7CiAgICAgbV90aW1lc3Rh bXAgPSBlLnRpbWVTdGFtcFNlY29uZHM7CiAKICAgICBtX21vZGlmaWVycyA9IDA7CkBAIC01MjYs OCArNTMwLDExIEBAIFdlYkdlc3R1cmVFdmVudEJ1aWxkZXI6OldlYkdlc3R1cmVFdmVudEJ1aWxk ZXIoY29uc3QgV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IEdlc3R1CiAgICAgICAgIHR5cGUgPSBHZXN0 dXJlU2Nyb2xsQmVnaW47CiAgICAgZWxzZSBpZiAoZXZlbnQudHlwZSgpID09IGV2ZW50TmFtZXMo KS5nZXN0dXJlc2Nyb2xsZW5kRXZlbnQpCiAgICAgICAgIHR5cGUgPSBHZXN0dXJlU2Nyb2xsRW5k OwotICAgIGVsc2UgaWYgKGV2ZW50LnR5cGUoKSA9PSBldmVudE5hbWVzKCkuZ2VzdHVyZXNjcm9s bHVwZGF0ZUV2ZW50KQorICAgIGVsc2UgaWYgKGV2ZW50LnR5cGUoKSA9PSBldmVudE5hbWVzKCku Z2VzdHVyZXNjcm9sbHVwZGF0ZUV2ZW50KSB7CiAgICAgICAgIHR5cGUgPSBHZXN0dXJlU2Nyb2xs VXBkYXRlOworICAgICAgICBkYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVggPSBldmVudC5kZWx0YVgo KTsKKyAgICAgICAgZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZID0gZXZlbnQuZGVsdGFZKCk7Cisg ICAgfQogCiAgICAgdGltZVN0YW1wU2Vjb25kcyA9IGV2ZW50LnRpbWVTdGFtcCgpIC8gbWlsbGlz UGVyU2Vjb25kOwogICAgIG1vZGlmaWVycyA9IGdldFdlYklucHV0TW9kaWZpZXJzKGV2ZW50KTsK QEAgLTUzNiw5ICs1NDMsNiBAQCBXZWJHZXN0dXJlRXZlbnRCdWlsZGVyOjpXZWJHZXN0dXJlRXZl bnRCdWlsZGVyKGNvbnN0IFdpZGdldCogd2lkZ2V0LCBjb25zdCBHZXN0dQogICAgIGdsb2JhbFkg PSBldmVudC5zY3JlZW5ZKCk7CiAgICAgeCA9IGV2ZW50LmFic29sdXRlTG9jYXRpb24oKS54KCkg LSB3aWRnZXQtPmxvY2F0aW9uKCkueCgpOwogICAgIHkgPSBldmVudC5hYnNvbHV0ZUxvY2F0aW9u KCkueSgpIC0gd2lkZ2V0LT5sb2NhdGlvbigpLnkoKTsKLQotICAgIGRlbHRhWCA9IGV2ZW50LmRl bHRhWCgpOwotICAgIGRlbHRhWSA9IGV2ZW50LmRlbHRhWSgpOwogfQogI2VuZGlmIC8vIEVOQUJM RShHRVNUVVJFX0VWRU5UUykKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCmluZGV4IDYyNmNiMGI1ZjFhYWEyM2VlZTc4OTYwNWVjYzcxMTdjYzNhN2YxZjMuLjU1 NWY3NjliODg1MmNiNDRkNTJiN2EzNjI0ZjZiMTcxYzE4NzJmYTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTY5Myw3ICs2OTMsNyBAQCBib29sIFdl YlZpZXdJbXBsOjpoYW5kbGVHZXN0dXJlRXZlbnQoY29uc3QgV2ViR2VzdHVyZUV2ZW50JiBldmVu dCkKICAgICAgICAgbV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50Lmds b2JhbFgsIGV2ZW50Lmdsb2JhbFkpOwogICAgICAgICBtX2ZsaW5nTW9kaWZpZXIgPSBldmVudC5t b2RpZmllcnM7CiAgICAgICAgIC8vIEZJWE1FOiBNYWtlIHRoZSBjdXJ2ZSBwYXJhbWV0cml6YWJs ZSBmcm9tIHRoZSBicm93c2VyLgotICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBBY3RpdmVQ bGF0Zm9ybUdlc3R1cmVBbmltYXRpb246OmNyZWF0ZShUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0 dXJlQ3VydmU6OmNyZWF0ZShGbG9hdFBvaW50KGV2ZW50LmRlbHRhWCwgZXZlbnQuZGVsdGFZKSks IHRoaXMpOworICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBBY3RpdmVQbGF0Zm9ybUdlc3R1 cmVBbmltYXRpb246OmNyZWF0ZShUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0dXJlQ3VydmU6OmNy ZWF0ZShGbG9hdFBvaW50KGV2ZW50LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVgsIGV2ZW50LmRh dGEuZmxpbmdTdGFydC52ZWxvY2l0eVkpKSwgdGhpcyk7CiAgICAgICAgIHNjaGVkdWxlQW5pbWF0 aW9uKCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LmNw cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxl ckltcGxUZXN0LmNwcAppbmRleCA4MzEzYjBmNWI4YmZjN2RlZGY4NGVlZDVkMjFmNzAzZTlmNmVk ZTZkLi44MmUzYjU0NmE1Mzc3M2ZjNjBjMWYzMmM1ZWVhOWFiZTUwNDRlYWE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJ bXBsVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJDb21wb3Np dG9ySW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwCkBAIC0yMDAsMTQgKzIwMCwxNCBAQCBURVNUX0Yo V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlU2Nyb2xsU3RhcnRlZCkK ICAgICBWRVJJRllfQU5EX1JFU0VUX01PQ0tTKCk7CiAKICAgICBnZXN0dXJlLnR5cGUgPSBXZWJJ bnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xsVXBkYXRlOwotICAgIGdlc3R1cmUuZGVsdGFZID0gLTQw OyAvLyAtWSBtZWFucyBzY3JvbGwgZG93biAtIGkuZS4gaW4gdGhlICtZIGRpcmVjdGlvbi4KKyAg ICBnZXN0dXJlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9IC00MDsgLy8gLVkgbWVhbnMgc2Ny b2xsIGRvd24gLSBpLmUuIGluIHRoZSArWSBkaXJlY3Rpb24uCiAgICAgRVhQRUNUX0NBTEwobV9t b2NrQ0NJbnB1dEhhbmRsZXJDbGllbnQsIHNjcm9sbEJ5KHRlc3Rpbmc6Ol8sIHRlc3Rpbmc6OlBy b3BlcnR5KCZXZWJDb3JlOjpJbnRTaXplOjpoZWlnaHQsIHRlc3Rpbmc6Okd0KDApKSkpOwogICAg IG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCiAgICAgVkVSSUZZ X0FORF9SRVNFVF9NT0NLUygpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6 R2VzdHVyZVNjcm9sbEVuZDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IDA7CisgICAgZ2VzdHVyZS5k YXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVkgPSAwOwogICAgIEVYUEVDVF9DQUxMKG1fbW9ja0NDSW5w dXRIYW5kbGVyQ2xpZW50LCBzY3JvbGxFbmQoKSk7CiAgICAgbV9pbnB1dEhhbmRsZXItPmhhbmRs ZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiB9CkBAIC0yMjcsMTMgKzIyNywxMyBAQCBURVNUX0YoV2Vi Q29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlU2Nyb2xsT25NYWluVGhyZWFk KQogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUudHlwZSA9IFdl YklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxVcGRhdGU7Ci0gICAgZ2VzdHVyZS5kZWx0YVkgPSA0 MDsKKyAgICBnZXN0dXJlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9IDQwOwogICAgIG1faW5w dXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCiAgICAgVkVSSUZZX0FORF9S RVNFVF9NT0NLUygpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVy ZVNjcm9sbEVuZDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IDA7CisgICAgZ2VzdHVyZS5kYXRhLnNj cm9sbFVwZGF0ZS5kZWx0YVkgPSAwOwogICAgIG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2 ZW50KGdlc3R1cmUpOwogfQogCkBAIC0yNjYsNyArMjY2LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0 b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2VzdHVyZVBpbmNoKQogICAgIFZFUklGWV9BTkRfUkVT RVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQ aW5jaFVwZGF0ZTsKLSAgICBnZXN0dXJlLmRlbHRhWCA9IDEuNTsKKyAgICBnZXN0dXJlLmRhdGEu cGluY2hVcGRhdGUuc2NhbGUgPSAxLjU7CiAgICAgZ2VzdHVyZS54ID0gNzsKICAgICBnZXN0dXJl LnkgPSAxMzsKICAgICBFWFBFQ1RfQ0FMTChtX21vY2tDQ0lucHV0SGFuZGxlckNsaWVudCwgcGlu Y2hHZXN0dXJlVXBkYXRlKDEuNSwgV2ViQ29yZTo6SW50UG9pbnQoNywgMTMpKSk7CkBAIC0yNzUs NyArMjc1LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2Vz dHVyZVBpbmNoKQogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUu dHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQaW5jaFVwZGF0ZTsKLSAgICBnZXN0dXJlLmRl bHRhWCA9IDAuNTsKKyAgICBnZXN0dXJlLmRhdGEucGluY2hVcGRhdGUuc2NhbGUgPSAwLjU7CiAg ICAgZ2VzdHVyZS54ID0gOTsKICAgICBnZXN0dXJlLnkgPSA2OwogICAgIEVYUEVDVF9DQUxMKG1f bW9ja0NDSW5wdXRIYW5kbGVyQ2xpZW50LCBwaW5jaEdlc3R1cmVVcGRhdGUoLjUsIFdlYkNvcmU6 OkludFBvaW50KDksIDYpKSk7CkBAIC0yOTgsNyArMjk4LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0 b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nU3RhcnRlZCkKICAgICAgICAgLldp bGxPbmNlKHRlc3Rpbmc6OlJldHVybihXZWJDb3JlOjpDQ0lucHV0SGFuZGxlckNsaWVudDo6U2Ny b2xsU3RhcnRlZCkpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVy ZUZsaW5nU3RhcnQ7Ci0gICAgZ2VzdHVyZS5kZWx0YVggPSAxMDsKKyAgICBnZXN0dXJlLmRhdGEu ZmxpbmdTdGFydC52ZWxvY2l0eVggPSAxMDsKICAgICBFWFBFQ1RfQ0FMTChtX21vY2tDQ0lucHV0 SGFuZGxlckNsaWVudCwgc2NoZWR1bGVBbmltYXRpb24oKSk7CiAgICAgbV9pbnB1dEhhbmRsZXIt PmhhbmRsZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiAKQEAgLTM1OSw4ICszNTksOCBAQCBURVNUX0Yo V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlRmxpbmdBbmltYXRlcykK ICAgICBXZWJQb2ludCBmbGluZ1BvaW50ID0gV2ViUG9pbnQoNywgMTMpOwogICAgIFdlYlBvaW50 IGZsaW5nR2xvYmFsUG9pbnQgPSBXZWJQb2ludCgxNywgMjMpOwogICAgIGludCBtb2RpZmllcnMg PSA3OwotICAgIGdlc3R1cmUuZGVsdGFYID0gZmxpbmdEZWx0YS54OwotICAgIGdlc3R1cmUuZGVs dGFZID0gZmxpbmdEZWx0YS55OworICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5 WCA9IGZsaW5nRGVsdGEueDsKKyAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVkg PSBmbGluZ0RlbHRhLnk7CiAgICAgZ2VzdHVyZS54ID0gZmxpbmdQb2ludC54OwogICAgIGdlc3R1 cmUueSA9IGZsaW5nUG9pbnQueTsKICAgICBnZXN0dXJlLmdsb2JhbFggPSBmbGluZ0dsb2JhbFBv aW50Lng7CkBAIC00NDMsOCArNDQzLDggQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRs ZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nVHJhbnNmZXJSZXNldHMpCiAgICAgV2ViUG9pbnQgZmxp bmdQb2ludCA9IFdlYlBvaW50KDcsIDEzKTsKICAgICBXZWJQb2ludCBmbGluZ0dsb2JhbFBvaW50 ID0gV2ViUG9pbnQoMTcsIDIzKTsKICAgICBpbnQgbW9kaWZpZXJzID0gMTsKLSAgICBnZXN0dXJl LmRlbHRhWCA9IGZsaW5nRGVsdGEueDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IGZsaW5nRGVsdGEu eTsKKyAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVggPSBmbGluZ0RlbHRhLng7 CisgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZID0gZmxpbmdEZWx0YS55Owog ICAgIGdlc3R1cmUueCA9IGZsaW5nUG9pbnQueDsKICAgICBnZXN0dXJlLnkgPSBmbGluZ1BvaW50 Lnk7CiAgICAgZ2VzdHVyZS5nbG9iYWxYID0gZmxpbmdHbG9iYWxQb2ludC54OwpAQCAtNTIyLDgg KzUyMiw4IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1 cmVGbGluZ1RyYW5zZmVyUmVzZXRzKQogICAgIGZsaW5nUG9pbnQgPSBXZWJQb2ludCg5NSwgODcp OwogICAgIGZsaW5nR2xvYmFsUG9pbnQgPSBXZWJQb2ludCgzMiwgNzEpOwogICAgIG1vZGlmaWVy cyA9IDI7Ci0gICAgZ2VzdHVyZS5kZWx0YVggPSBmbGluZ0RlbHRhLng7Ci0gICAgZ2VzdHVyZS5k ZWx0YVkgPSBmbGluZ0RlbHRhLnk7CisgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQudmVsb2Np dHlYID0gZmxpbmdEZWx0YS54OworICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5 WSA9IGZsaW5nRGVsdGEueTsKICAgICBnZXN0dXJlLnggPSBmbGluZ1BvaW50Lng7CiAgICAgZ2Vz dHVyZS55ID0gZmxpbmdQb2ludC55OwogICAgIGdlc3R1cmUuZ2xvYmFsWCA9IGZsaW5nR2xvYmFs UG9pbnQueDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCBjN2Q2YmZiNDg0NTQyNzRjNTEyZDAwNTFiZmE1MmZkMDc2NmQzZGNlLi44ZDM2YzIwNGY4 NGNkOTdkMGFjMzNiMDc0MjFkNWUwZDVhMDJhYThmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMzAgIFJp Y2sgQnllcnMgIDxyYnllcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVwZGF0ZSBjaHJvbWl1 bSBEdW1wUmVuZGVyVHJlZSBmb3IgbmV3IFdlYkdlc3R1cmVFdmVudCBmaWVsZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMTIzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIEV2ZW50U2VuZGVy IHRvIHdyaXRlIGdlc3R1cmUgZGV0YWlscyBpbnRvIHRoZSBhcHByb3ByaWF0ZQorICAgICAgICB0 eXBlLXNwZWNpZmljIFdlYkdlc3R1cmVFdmVudCBmaWVsZHMuCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9FdmVudFNlbmRlci5jcHA6CisgICAgICAgIChFdmVu dFNlbmRlcjo6Z2VzdHVyZUV2ZW50KToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpnZXN0dXJlRmxp bmdTdGFydCk6CisKIDIwMTItMDgtMzAgIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUu Y29tPgogCiAgICAgICAgIG9iamNfbXNnU2VuZCBhbmQgSU1QIHNob3VsZCBiZSBjYXN0IGFwcHJv cHJpYXRlbHkgYmVmb3JlIHVzaW5nCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9UZXN0UnVubmVyL0V2ZW50U2VuZGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCmluZGV4IGNhZmFjYTlhY2Q3Y2Q4 NjRkNzM5NGZlNzUyNjQxN2M0NzRhMjk3ZDIuLjhhZWEwYjNjYjY5ODM0ZTRkYTgxY2VhMjg2OTQ3 YTY4ZjQzZGEzMjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCkBAIC0xMTUzLDEyICsxMTUzLDE0IEBAIHZv aWQgRXZlbnRTZW5kZXI6Omdlc3R1cmVFdmVudChXZWJJbnB1dEV2ZW50OjpUeXBlIHR5cGUsIGNv bnN0IENwcEFyZ3VtZW50TGlzdCYKIAogICAgIHN3aXRjaCAodHlwZSkgewogICAgIGNhc2UgV2Vi SW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZToKLSAgICAgICAgZXZlbnQuZGVsdGFYID0g c3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1swXS50b0RvdWJsZSgpKTsKLSAgICAgICAgZXZl bnQuZGVsdGFZID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1sxXS50b0RvdWJsZSgpKTsK KyAgICAgICAgZXZlbnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFYID0KKyAgICAgICAgICAgIHN0 YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMF0udG9Eb3VibGUoKSk7CisgICAgICAgIGV2ZW50 LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9CisgICAgICAgICAgICBzdGF0aWNfY2FzdDxmbG9h dD4oYXJndW1lbnRzWzFdLnRvRG91YmxlKCkpOwogICAgICAgICBldmVudC54ID0gbV9jdXJyZW50 R2VzdHVyZUxvY2F0aW9uLng7CiAgICAgICAgIGV2ZW50LnkgPSBtX2N1cnJlbnRHZXN0dXJlTG9j YXRpb24ueTsKLSAgICAgICAgbV9jdXJyZW50R2VzdHVyZUxvY2F0aW9uLnggPSBtX2N1cnJlbnRH ZXN0dXJlTG9jYXRpb24ueCArIGV2ZW50LmRlbHRhWDsKLSAgICAgICAgbV9jdXJyZW50R2VzdHVy ZUxvY2F0aW9uLnkgPSBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueSArIGV2ZW50LmRlbHRhWTsK KyAgICAgICAgbV9jdXJyZW50R2VzdHVyZUxvY2F0aW9uLnggPSBtX2N1cnJlbnRHZXN0dXJlTG9j YXRpb24ueCArIGV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWDsKKyAgICAgICAgbV9jdXJy ZW50R2VzdHVyZUxvY2F0aW9uLnkgPSBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueSArIGV2ZW50 LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWTsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIFdl YklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxCZWdpbjoKQEAgLTExNjcsMTUgKzExNjksMTUgQEAg dm9pZCBFdmVudFNlbmRlcjo6Z2VzdHVyZUV2ZW50KFdlYklucHV0RXZlbnQ6OlR5cGUgdHlwZSwg Y29uc3QgQ3BwQXJndW1lbnRMaXN0JgogICAgICAgICBldmVudC55ID0gbV9jdXJyZW50R2VzdHVy ZUxvY2F0aW9uLnk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6R2Vz dHVyZVNjcm9sbEVuZDoKLSAgICAgICAgZXZlbnQuZGVsdGFYID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+ KGFyZ3VtZW50c1swXS50b0RvdWJsZSgpKTsKLSAgICAgICAgZXZlbnQuZGVsdGFZID0gc3RhdGlj X2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1sxXS50b0RvdWJsZSgpKTsKICAgICAgICAgZXZlbnQueCA9 IG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi54OwogICAgICAgICBldmVudC55ID0gbV9jdXJyZW50 R2VzdHVyZUxvY2F0aW9uLnk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5wdXRFdmVu dDo6R2VzdHVyZVRhcDoKICAgICAgICAgaWYgKGFyZ3VtZW50cy5zaXplKCkgPj0gMykgewotICAg ICAgICAgICAgLy8gVGFwIGNvdW50LgotICAgICAgICAgICAgZXZlbnQuZGVsdGFYID0gc3RhdGlj X2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1syXS50b0RvdWJsZSgpKTsKKyAgICAgICAgICAgIGV2ZW50 LmRhdGEudGFwLnRhcENvdW50ID0KKyAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxmbG9hdD4o YXJndW1lbnRzWzJdLnRvRG91YmxlKCkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIGV2 ZW50LmRhdGEudGFwLnRhcENvdW50ID0gMTsKICAgICAgICAgfQogICAgICAgICBldmVudC54ID0g cG9pbnQueDsKICAgICAgICAgZXZlbnQueSA9IHBvaW50Lnk7CkBAIC0xMjMyLDggKzEyMzQsMTAg QEAgdm9pZCBFdmVudFNlbmRlcjo6Z2VzdHVyZUZsaW5nU3RhcnQoY29uc3QgQ3BwQXJndW1lbnRM aXN0JiBhcmd1bWVudHMsIENwcFZhcmlhbnQKICAgICBldmVudC5nbG9iYWxYID0gZXZlbnQueDsK ICAgICBldmVudC5nbG9iYWxZID0gZXZlbnQueTsKIAotICAgIGV2ZW50LmRlbHRhWCA9IHN0YXRp Y19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMl0udG9Eb3VibGUoKSk7Ci0gICAgZXZlbnQuZGVsdGFZ ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1szXS50b0RvdWJsZSgpKTsKKyAgICBldmVu dC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYID0KKyAgICAgICAgc3RhdGljX2Nhc3Q8ZmxvYXQ+ KGFyZ3VtZW50c1syXS50b0RvdWJsZSgpKTsKKyAgICBldmVudC5kYXRhLmZsaW5nU3RhcnQudmVs b2NpdHlZID0KKyAgICAgICAgc3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1szXS50b0RvdWJs ZSgpKTsKICAgICBldmVudC50aW1lU3RhbXBTZWNvbmRzID0gZ2V0Q3VycmVudEV2ZW50VGltZVNl YygpOwogICAgIHdlYnZpZXcoKS0+aGFuZGxlSW5wdXRFdmVudChldmVudCk7CiB9Cg== 162037 2012-09-04 07:10:18 -0700 2012-09-04 09:17:15 -0700 Update bug number in ChangeLog bug-95573-20120904101000.patch text/plain 17092 rbyers U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGY1OTc1OGJlNDE1YTY0ODIxZGM5M2Y3OGI4MjdhN2FjMjUzYmQ2ZWYuLmZlNmYzZmIyNTczY2U3 NTY4ZWUxYTE2ZDg3YzgyNDYxMjI2ZWNmOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTItMDgtMzAgIFJpY2sgQnllcnMgIDxyYnllcnNAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFVzZSBuZXcgdHlwZS1zcGVjaWZpYyBXZWJHZXN0dXJlRXZlbnQgZmll bGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENocm9t aXVtIGhhcyBiZWVuIHVwZGF0ZWQgdG8gc3RvcmUgZ2VzdHVyZS10eXBlIHNwZWNpZmljIGRldGFp bHMgaW4gdGhlCisgICAgICAgIG5ldyBXZWJHZXN0dXJlRXZlbnQgZmllbGRzIChjcnJldi5jb20v MTUyNTA4KSwgc28gd2UgY2FuIG5vdyByZWx5IG9uIHRoZW0uCisgICAgICAgIFRPRE86IGFsc28g bGlzdCByZXZpc2lvbiBVUkwgZm9yCisgICAgICAgIGh0dHA6Ly9jb2RlcmV2aWV3LmNocm9taXVt Lm9yZy8xMDg5NTAyNC8gd2hlbiBpdCBsYW5kcy4KKworICAgICAgICAqIHNyYy9XZWJDb21wb3Np dG9ySW5wdXRIYW5kbGVySW1wbC5jcHA6CisgICAgICAgIFVwZGF0ZSB0aGUgY29tcG9zaXRvciBz Y3JvbGwsIHBpbmNoIGFuZCBmbGluZyBoYW5kbGluZyB0byB1c2UgdGhlc2UgbmV3IGZpZWxkcy4K KyAgICAgICAgKFdlYktpdDo6V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmhhbmRsZUlu cHV0RXZlbnRJbnRlcm5hbCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JJbnB1dEhh bmRsZXJJbXBsOjpoYW5kbGVHZXN0dXJlRmxpbmcpOgorICAgICAgICAqIHNyYy9XZWJJbnB1dEV2 ZW50Q29udmVyc2lvbi5jcHA6CisgICAgICAgIFVwZGF0ZSBQbGF0Zm9ybUdlc3R1cmVFdmVudC9X ZWJHZXN0dXJlRXZlbnQgY29udmVyc2lvbiB0byB1c2UgdGhlIG5ldworICAgICAgICBmaWVsZHMs IHN0b3JpbmcgaW50byB0aGUgZXhpc3Rpbmcgb3ZlcmxvYWRlZCBQbGF0Zm9ybUdlc3R1cmVFdmVu dAorICAgICAgICBmaWVsZHMgKHdoaWNoIHdpbGwgYmUgY2xlYW5lZCB1cCBpbiBteSBuZXh0IENM KS4KKyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1HZXN0dXJlRXZlbnRCdWlsZGVyOjpQbGF0Zm9y bUdlc3R1cmVFdmVudEJ1aWxkZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJHZXN0dXJlRXZlbnRC dWlsZGVyOjpXZWJHZXN0dXJlRXZlbnRCdWlsZGVyKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0lt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50 KToKKyAgICAgICAgVXBkYXRlIGZsaW5nIHNjcm9sbGluZyBpbXBsZW1lbnRhdGlvbiBmb3IgY29y cmVjdCBsb2NhdGlvbiBvZiB2ZWxvY2l0eS4KKyAgICAgICAgKiB0ZXN0cy9XZWJDb21wb3NpdG9y SW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpURVNUX0YpOgorICAg ICAgICBVcGRhdGUgdGVzdHMgdG8gdXNlIHRoZSBuZXcgZmllbGRzLgorCisKIDIwMTItMDgtMzAg IEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21p dW1dIE1ha2Ugd2Via2l0X2NvbXBvc2l0b3Igc3BlY2lmaWMgdW5pdCB0ZXN0IGNvbXBpbGF0aW9u IGNvbmRpdGlvbmFsIG9uIGd5cCB2YXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsLmNwcAppbmRleCA4MDg0 ZDcxNWM3YjAyYTU3OGU0MWVjYmEzZTk5Mzg0ZjY0MmFkMmU5Li4xZTUwMzg1NTBiMDE3OTM1YzBm ZGQyM2JlMzU0OWYyYWEyYTE3NGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGwuY3BwCkBAIC0yMTYs NyArMjE2LDggQEAgV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OkV2ZW50RGlzcG9zaXRp b24gV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmgKICAgICAgICAgICAgIHJldHVybiBE aWROb3RIYW5kbGU7CiAKICAgICAgICAgY29uc3QgV2ViR2VzdHVyZUV2ZW50JiBnZXN0dXJlRXZl bnQgPSAqc3RhdGljX2Nhc3Q8Y29uc3QgV2ViR2VzdHVyZUV2ZW50Kj4oJmV2ZW50KTsKLSAgICAg ICAgbV9pbnB1dEhhbmRsZXJDbGllbnQtPnNjcm9sbEJ5KEludFBvaW50KGdlc3R1cmVFdmVudC54 LCBnZXN0dXJlRXZlbnQueSksIEludFNpemUoLWdlc3R1cmVFdmVudC5kZWx0YVgsIC1nZXN0dXJl RXZlbnQuZGVsdGFZKSk7CisgICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5zY3JvbGxCeShJ bnRQb2ludChnZXN0dXJlRXZlbnQueCwgZ2VzdHVyZUV2ZW50LnkpLAorICAgICAgICAgICAgSW50 U2l6ZSgtZ2VzdHVyZUV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWCwgLWdlc3R1cmVFdmVu dC5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVkpKTsKICAgICAgICAgcmV0dXJuIERpZEhhbmRsZTsK ICAgICB9IGVsc2UgaWYgKGV2ZW50LnR5cGUgPT0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9s bEVuZCkgewogICAgICAgICBBU1NFUlQobV9leHBlY3RTY3JvbGxVcGRhdGVFbmQpOwpAQCAtMjQ2 LDcgKzI0Nyw3IEBAIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0 aW9uIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpoCiAgICAgfSBlbHNlIGlmIChldmVu dC50eXBlID09IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQaW5jaFVwZGF0ZSkgewogICAgICAgICBB U1NFUlQobV9leHBlY3RQaW5jaFVwZGF0ZUVuZCk7CiAgICAgICAgIGNvbnN0IFdlYkdlc3R1cmVF dmVudCYgZ2VzdHVyZUV2ZW50ID0gKnN0YXRpY19jYXN0PGNvbnN0IFdlYkdlc3R1cmVFdmVudCo+ KCZldmVudCk7Ci0gICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5waW5jaEdlc3R1cmVVcGRh dGUoZ2VzdHVyZUV2ZW50LmRlbHRhWCwgSW50UG9pbnQoZ2VzdHVyZUV2ZW50LngsIGdlc3R1cmVF dmVudC55KSk7CisgICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5waW5jaEdlc3R1cmVVcGRh dGUoZ2VzdHVyZUV2ZW50LmRhdGEucGluY2hVcGRhdGUuc2NhbGUsIEludFBvaW50KGdlc3R1cmVF dmVudC54LCBnZXN0dXJlRXZlbnQueSkpOwogICAgICAgICByZXR1cm4gRGlkSGFuZGxlOwogICAg IH0gZWxzZSBpZiAoZXZlbnQudHlwZSA9PSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlRmxpbmdTdGFy dCkgewogICAgICAgICBjb25zdCBXZWJHZXN0dXJlRXZlbnQmIGdlc3R1cmVFdmVudCA9ICpzdGF0 aWNfY2FzdDxjb25zdCBXZWJHZXN0dXJlRXZlbnQqPigmZXZlbnQpOwpAQCAtMjY3LDkgKzI2OCw5 IEBAIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0aW9uIFdlYkNv bXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpoCiAgICAgc3dpdGNoIChzY3JvbGxTdGF0dXMpIHsK ICAgICBjYXNlIENDSW5wdXRIYW5kbGVyQ2xpZW50OjpTY3JvbGxTdGFydGVkOiB7CiAgICAgICAg IFRSQUNFX0VWRU5UX0lOU1RBTlQwKCJjYyIsICJXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1w bDo6aGFuZGxlR2VzdHVyZUZsaW5nOjpzdGFydGVkIik7Ci0gICAgICAgIE93blB0cjxQbGF0Zm9y bUdlc3R1cmVDdXJ2ZT4gZmxpbmdDdXJ2ZSA9IFRvdWNocGFkRmxpbmdQbGF0Zm9ybUdlc3R1cmVD dXJ2ZTo6Y3JlYXRlKEZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50LmRlbHRhWCwgZ2VzdHVyZUV2ZW50 LmRlbHRhWSkpOworICAgICAgICBPd25QdHI8UGxhdGZvcm1HZXN0dXJlQ3VydmU+IGZsaW5nQ3Vy dmUgPSBUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0dXJlQ3VydmU6OmNyZWF0ZShGbG9hdFBvaW50 KGdlc3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYLCBnZXN0dXJlRXZlbnQuZGF0 YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WSkpOwogICAgICAgICBtX3doZWVsRmxpbmdBbmltYXRpb24g PSBDQ0FjdGl2ZUdlc3R1cmVBbmltYXRpb246OmNyZWF0ZShQbGF0Zm9ybUdlc3R1cmVUb0NDR2Vz dHVyZUFkYXB0ZXI6OmNyZWF0ZShmbGluZ0N1cnZlLnJlbGVhc2UoKSksIHRoaXMpOwotICAgICAg ICBtX3doZWVsRmxpbmdQYXJhbWV0ZXJzLmRlbHRhID0gV2ViRmxvYXRQb2ludChnZXN0dXJlRXZl bnQuZGVsdGFYLCBnZXN0dXJlRXZlbnQuZGVsdGFZKTsKKyAgICAgICAgbV93aGVlbEZsaW5nUGFy YW1ldGVycy5kZWx0YSA9IFdlYkZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50LmRhdGEuZmxpbmdTdGFy dC52ZWxvY2l0eVgsIGdlc3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZKTsKICAg ICAgICAgbV93aGVlbEZsaW5nUGFyYW1ldGVycy5wb2ludCA9IFdlYlBvaW50KGdlc3R1cmVFdmVu dC54LCBnZXN0dXJlRXZlbnQueSk7CiAgICAgICAgIG1fd2hlZWxGbGluZ1BhcmFtZXRlcnMuZ2xv YmFsUG9pbnQgPSBXZWJQb2ludChnZXN0dXJlRXZlbnQuZ2xvYmFsWCwgZ2VzdHVyZUV2ZW50Lmds b2JhbFkpOwogICAgICAgICBtX3doZWVsRmxpbmdQYXJhbWV0ZXJzLm1vZGlmaWVycyA9IGdlc3R1 cmVFdmVudC5tb2RpZmllcnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAKaW5kZXggMDM5MWMyODViN2Y4ZTNlNjY5NTE2 MzlkMzY1ZjU4YmQ3M2U4YTk5Mi4uYmI2YjU3MzU1MzllZDc2MmJjMWM2NTkyZmJiY2I1NGI0NDRh MjI4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVu dENvbnZlcnNpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0 RXZlbnRDb252ZXJzaW9uLmNwcApAQCAtMTQ5LDEwICsxNDksMTQgQEAgUGxhdGZvcm1HZXN0dXJl RXZlbnRCdWlsZGVyOjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRnZXQs IGNvbnN0IFcKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJl U2Nyb2xsVXBkYXRlOgogICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlU2Ny b2xsVXBkYXRlOworICAgICAgICBtX2RlbHRhWCA9IGUuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFY OworICAgICAgICBtX2RlbHRhWSA9IGUuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZOwogICAgICAg ICBicmVhazsKICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Okdlc3R1cmVUYXA6CiAgICAgICAgIG1f dHlwZSA9IFBsYXRmb3JtRXZlbnQ6Okdlc3R1cmVUYXA7Ci0gICAgICAgIG1fYXJlYSA9IEludFNp emUoZS5ib3VuZGluZ0JveC53aWR0aCwgZS5ib3VuZGluZ0JveC5oZWlnaHQpOworICAgICAgICBt X2FyZWEgPSBJbnRTaXplKGUuZGF0YS50YXAud2lkdGgsIGUuZGF0YS50YXAuaGVpZ2h0KTsKKyAg ICAgICAgLy8gRklYTUU6IFBsYXRmb3JtR2VzdHVyZUV2ZW50IGRlbHRhWCBpcyBvdmVybG9hZGVk IC0gd2tiLnVnLzkzMTIzCisgICAgICAgIG1fZGVsdGFYID0gc3RhdGljX2Nhc3Q8aW50PihlLmRh dGEudGFwLnRhcENvdW50KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50 OjpHZXN0dXJlVGFwRG93bjoKICAgICAgICAgbV90eXBlID0gUGxhdGZvcm1FdmVudDo6R2VzdHVy ZVRhcERvd247CkBAIC0xNjUsNyArMTY5LDcgQEAgUGxhdGZvcm1HZXN0dXJlRXZlbnRCdWlsZGVy OjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IFcKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlTG9uZ1ByZXNzOgog ICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlTG9uZ1ByZXNzOwotICAgICAg ICBtX2FyZWEgPSBJbnRTaXplKGUuYm91bmRpbmdCb3gud2lkdGgsIGUuYm91bmRpbmdCb3guaGVp Z2h0KTsKKyAgICAgICAgbV9hcmVhID0gSW50U2l6ZShlLmRhdGEubG9uZ1ByZXNzLndpZHRoLCBl LmRhdGEubG9uZ1ByZXNzLmhlaWdodCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5w dXRFdmVudDo6R2VzdHVyZVBpbmNoQmVnaW46CiAgICAgICAgIG1fdHlwZSA9IFBsYXRmb3JtRXZl bnQ6Okdlc3R1cmVQaW5jaEJlZ2luOwpAQCAtMTc1LDE0ICsxNzksMTQgQEAgUGxhdGZvcm1HZXN0 dXJlRXZlbnRCdWlsZGVyOjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRn ZXQsIGNvbnN0IFcKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0 dXJlUGluY2hVcGRhdGU6CiAgICAgICAgIG1fdHlwZSA9IFBsYXRmb3JtRXZlbnQ6Okdlc3R1cmVQ aW5jaFVwZGF0ZTsKKyAgICAgICAgLy8gRklYTUU6IFBsYXRmb3JtR2VzdHVyZUV2ZW50IGRlbHRh WCBpcyBvdmVybG9hZGVkIC0gd2tiLnVnLzkzMTIzCisgICAgICAgIG1fZGVsdGFYID0gZS5kYXRh LnBpbmNoVXBkYXRlLnNjYWxlOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAgICAgbV9wb3NpdGlvbiA9IHdpZGdldC0+ Y29udmVydEZyb21Db250YWluaW5nV2luZG93KEludFBvaW50KGUueCwgZS55KSk7CiAgICAgbV9n bG9iYWxQb3NpdGlvbiA9IEludFBvaW50KGUuZ2xvYmFsWCwgZS5nbG9iYWxZKTsKLSAgICBtX2Rl bHRhWCA9IGUuZGVsdGFYOwotICAgIG1fZGVsdGFZID0gZS5kZWx0YVk7CiAgICAgbV90aW1lc3Rh bXAgPSBlLnRpbWVTdGFtcFNlY29uZHM7CiAKICAgICBtX21vZGlmaWVycyA9IDA7CkBAIC01MjYs OCArNTMwLDExIEBAIFdlYkdlc3R1cmVFdmVudEJ1aWxkZXI6OldlYkdlc3R1cmVFdmVudEJ1aWxk ZXIoY29uc3QgV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IEdlc3R1CiAgICAgICAgIHR5cGUgPSBHZXN0 dXJlU2Nyb2xsQmVnaW47CiAgICAgZWxzZSBpZiAoZXZlbnQudHlwZSgpID09IGV2ZW50TmFtZXMo KS5nZXN0dXJlc2Nyb2xsZW5kRXZlbnQpCiAgICAgICAgIHR5cGUgPSBHZXN0dXJlU2Nyb2xsRW5k OwotICAgIGVsc2UgaWYgKGV2ZW50LnR5cGUoKSA9PSBldmVudE5hbWVzKCkuZ2VzdHVyZXNjcm9s bHVwZGF0ZUV2ZW50KQorICAgIGVsc2UgaWYgKGV2ZW50LnR5cGUoKSA9PSBldmVudE5hbWVzKCku Z2VzdHVyZXNjcm9sbHVwZGF0ZUV2ZW50KSB7CiAgICAgICAgIHR5cGUgPSBHZXN0dXJlU2Nyb2xs VXBkYXRlOworICAgICAgICBkYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVggPSBldmVudC5kZWx0YVgo KTsKKyAgICAgICAgZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZID0gZXZlbnQuZGVsdGFZKCk7Cisg ICAgfQogCiAgICAgdGltZVN0YW1wU2Vjb25kcyA9IGV2ZW50LnRpbWVTdGFtcCgpIC8gbWlsbGlz UGVyU2Vjb25kOwogICAgIG1vZGlmaWVycyA9IGdldFdlYklucHV0TW9kaWZpZXJzKGV2ZW50KTsK QEAgLTUzNiw5ICs1NDMsNiBAQCBXZWJHZXN0dXJlRXZlbnRCdWlsZGVyOjpXZWJHZXN0dXJlRXZl bnRCdWlsZGVyKGNvbnN0IFdpZGdldCogd2lkZ2V0LCBjb25zdCBHZXN0dQogICAgIGdsb2JhbFkg PSBldmVudC5zY3JlZW5ZKCk7CiAgICAgeCA9IGV2ZW50LmFic29sdXRlTG9jYXRpb24oKS54KCkg LSB3aWRnZXQtPmxvY2F0aW9uKCkueCgpOwogICAgIHkgPSBldmVudC5hYnNvbHV0ZUxvY2F0aW9u KCkueSgpIC0gd2lkZ2V0LT5sb2NhdGlvbigpLnkoKTsKLQotICAgIGRlbHRhWCA9IGV2ZW50LmRl bHRhWCgpOwotICAgIGRlbHRhWSA9IGV2ZW50LmRlbHRhWSgpOwogfQogI2VuZGlmIC8vIEVOQUJM RShHRVNUVVJFX0VWRU5UUykKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCmluZGV4IDYyNmNiMGI1ZjFhYWEyM2VlZTc4OTYwNWVjYzcxMTdjYzNhN2YxZjMuLjU1 NWY3NjliODg1MmNiNDRkNTJiN2EzNjI0ZjZiMTcxYzE4NzJmYTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTY5Myw3ICs2OTMsNyBAQCBib29sIFdl YlZpZXdJbXBsOjpoYW5kbGVHZXN0dXJlRXZlbnQoY29uc3QgV2ViR2VzdHVyZUV2ZW50JiBldmVu dCkKICAgICAgICAgbV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50Lmds b2JhbFgsIGV2ZW50Lmdsb2JhbFkpOwogICAgICAgICBtX2ZsaW5nTW9kaWZpZXIgPSBldmVudC5t b2RpZmllcnM7CiAgICAgICAgIC8vIEZJWE1FOiBNYWtlIHRoZSBjdXJ2ZSBwYXJhbWV0cml6YWJs ZSBmcm9tIHRoZSBicm93c2VyLgotICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBBY3RpdmVQ bGF0Zm9ybUdlc3R1cmVBbmltYXRpb246OmNyZWF0ZShUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0 dXJlQ3VydmU6OmNyZWF0ZShGbG9hdFBvaW50KGV2ZW50LmRlbHRhWCwgZXZlbnQuZGVsdGFZKSks IHRoaXMpOworICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBBY3RpdmVQbGF0Zm9ybUdlc3R1 cmVBbmltYXRpb246OmNyZWF0ZShUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0dXJlQ3VydmU6OmNy ZWF0ZShGbG9hdFBvaW50KGV2ZW50LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVgsIGV2ZW50LmRh dGEuZmxpbmdTdGFydC52ZWxvY2l0eVkpKSwgdGhpcyk7CiAgICAgICAgIHNjaGVkdWxlQW5pbWF0 aW9uKCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LmNw cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxl ckltcGxUZXN0LmNwcAppbmRleCA4MzEzYjBmNWI4YmZjN2RlZGY4NGVlZDVkMjFmNzAzZTlmNmVk ZTZkLi44MmUzYjU0NmE1Mzc3M2ZjNjBjMWYzMmM1ZWVhOWFiZTUwNDRlYWE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJ bXBsVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJDb21wb3Np dG9ySW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwCkBAIC0yMDAsMTQgKzIwMCwxNCBAQCBURVNUX0Yo V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlU2Nyb2xsU3RhcnRlZCkK ICAgICBWRVJJRllfQU5EX1JFU0VUX01PQ0tTKCk7CiAKICAgICBnZXN0dXJlLnR5cGUgPSBXZWJJ bnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xsVXBkYXRlOwotICAgIGdlc3R1cmUuZGVsdGFZID0gLTQw OyAvLyAtWSBtZWFucyBzY3JvbGwgZG93biAtIGkuZS4gaW4gdGhlICtZIGRpcmVjdGlvbi4KKyAg ICBnZXN0dXJlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9IC00MDsgLy8gLVkgbWVhbnMgc2Ny b2xsIGRvd24gLSBpLmUuIGluIHRoZSArWSBkaXJlY3Rpb24uCiAgICAgRVhQRUNUX0NBTEwobV9t b2NrQ0NJbnB1dEhhbmRsZXJDbGllbnQsIHNjcm9sbEJ5KHRlc3Rpbmc6Ol8sIHRlc3Rpbmc6OlBy b3BlcnR5KCZXZWJDb3JlOjpJbnRTaXplOjpoZWlnaHQsIHRlc3Rpbmc6Okd0KDApKSkpOwogICAg IG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCiAgICAgVkVSSUZZ X0FORF9SRVNFVF9NT0NLUygpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6 R2VzdHVyZVNjcm9sbEVuZDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IDA7CisgICAgZ2VzdHVyZS5k YXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVkgPSAwOwogICAgIEVYUEVDVF9DQUxMKG1fbW9ja0NDSW5w dXRIYW5kbGVyQ2xpZW50LCBzY3JvbGxFbmQoKSk7CiAgICAgbV9pbnB1dEhhbmRsZXItPmhhbmRs ZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiB9CkBAIC0yMjcsMTMgKzIyNywxMyBAQCBURVNUX0YoV2Vi Q29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlU2Nyb2xsT25NYWluVGhyZWFk KQogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUudHlwZSA9IFdl YklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxVcGRhdGU7Ci0gICAgZ2VzdHVyZS5kZWx0YVkgPSA0 MDsKKyAgICBnZXN0dXJlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9IDQwOwogICAgIG1faW5w dXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCiAgICAgVkVSSUZZX0FORF9S RVNFVF9NT0NLUygpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVy ZVNjcm9sbEVuZDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IDA7CisgICAgZ2VzdHVyZS5kYXRhLnNj cm9sbFVwZGF0ZS5kZWx0YVkgPSAwOwogICAgIG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2 ZW50KGdlc3R1cmUpOwogfQogCkBAIC0yNjYsNyArMjY2LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0 b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2VzdHVyZVBpbmNoKQogICAgIFZFUklGWV9BTkRfUkVT RVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQ aW5jaFVwZGF0ZTsKLSAgICBnZXN0dXJlLmRlbHRhWCA9IDEuNTsKKyAgICBnZXN0dXJlLmRhdGEu cGluY2hVcGRhdGUuc2NhbGUgPSAxLjU7CiAgICAgZ2VzdHVyZS54ID0gNzsKICAgICBnZXN0dXJl LnkgPSAxMzsKICAgICBFWFBFQ1RfQ0FMTChtX21vY2tDQ0lucHV0SGFuZGxlckNsaWVudCwgcGlu Y2hHZXN0dXJlVXBkYXRlKDEuNSwgV2ViQ29yZTo6SW50UG9pbnQoNywgMTMpKSk7CkBAIC0yNzUs NyArMjc1LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2Vz dHVyZVBpbmNoKQogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUu dHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQaW5jaFVwZGF0ZTsKLSAgICBnZXN0dXJlLmRl bHRhWCA9IDAuNTsKKyAgICBnZXN0dXJlLmRhdGEucGluY2hVcGRhdGUuc2NhbGUgPSAwLjU7CiAg ICAgZ2VzdHVyZS54ID0gOTsKICAgICBnZXN0dXJlLnkgPSA2OwogICAgIEVYUEVDVF9DQUxMKG1f bW9ja0NDSW5wdXRIYW5kbGVyQ2xpZW50LCBwaW5jaEdlc3R1cmVVcGRhdGUoLjUsIFdlYkNvcmU6 OkludFBvaW50KDksIDYpKSk7CkBAIC0yOTgsNyArMjk4LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0 b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nU3RhcnRlZCkKICAgICAgICAgLldp bGxPbmNlKHRlc3Rpbmc6OlJldHVybihXZWJDb3JlOjpDQ0lucHV0SGFuZGxlckNsaWVudDo6U2Ny b2xsU3RhcnRlZCkpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVy ZUZsaW5nU3RhcnQ7Ci0gICAgZ2VzdHVyZS5kZWx0YVggPSAxMDsKKyAgICBnZXN0dXJlLmRhdGEu ZmxpbmdTdGFydC52ZWxvY2l0eVggPSAxMDsKICAgICBFWFBFQ1RfQ0FMTChtX21vY2tDQ0lucHV0 SGFuZGxlckNsaWVudCwgc2NoZWR1bGVBbmltYXRpb24oKSk7CiAgICAgbV9pbnB1dEhhbmRsZXIt PmhhbmRsZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiAKQEAgLTM1OSw4ICszNTksOCBAQCBURVNUX0Yo V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlRmxpbmdBbmltYXRlcykK ICAgICBXZWJQb2ludCBmbGluZ1BvaW50ID0gV2ViUG9pbnQoNywgMTMpOwogICAgIFdlYlBvaW50 IGZsaW5nR2xvYmFsUG9pbnQgPSBXZWJQb2ludCgxNywgMjMpOwogICAgIGludCBtb2RpZmllcnMg PSA3OwotICAgIGdlc3R1cmUuZGVsdGFYID0gZmxpbmdEZWx0YS54OwotICAgIGdlc3R1cmUuZGVs dGFZID0gZmxpbmdEZWx0YS55OworICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5 WCA9IGZsaW5nRGVsdGEueDsKKyAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVkg PSBmbGluZ0RlbHRhLnk7CiAgICAgZ2VzdHVyZS54ID0gZmxpbmdQb2ludC54OwogICAgIGdlc3R1 cmUueSA9IGZsaW5nUG9pbnQueTsKICAgICBnZXN0dXJlLmdsb2JhbFggPSBmbGluZ0dsb2JhbFBv aW50Lng7CkBAIC00NDMsOCArNDQzLDggQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRs ZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nVHJhbnNmZXJSZXNldHMpCiAgICAgV2ViUG9pbnQgZmxp bmdQb2ludCA9IFdlYlBvaW50KDcsIDEzKTsKICAgICBXZWJQb2ludCBmbGluZ0dsb2JhbFBvaW50 ID0gV2ViUG9pbnQoMTcsIDIzKTsKICAgICBpbnQgbW9kaWZpZXJzID0gMTsKLSAgICBnZXN0dXJl LmRlbHRhWCA9IGZsaW5nRGVsdGEueDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IGZsaW5nRGVsdGEu eTsKKyAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVggPSBmbGluZ0RlbHRhLng7 CisgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZID0gZmxpbmdEZWx0YS55Owog ICAgIGdlc3R1cmUueCA9IGZsaW5nUG9pbnQueDsKICAgICBnZXN0dXJlLnkgPSBmbGluZ1BvaW50 Lnk7CiAgICAgZ2VzdHVyZS5nbG9iYWxYID0gZmxpbmdHbG9iYWxQb2ludC54OwpAQCAtNTIyLDgg KzUyMiw4IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1 cmVGbGluZ1RyYW5zZmVyUmVzZXRzKQogICAgIGZsaW5nUG9pbnQgPSBXZWJQb2ludCg5NSwgODcp OwogICAgIGZsaW5nR2xvYmFsUG9pbnQgPSBXZWJQb2ludCgzMiwgNzEpOwogICAgIG1vZGlmaWVy cyA9IDI7Ci0gICAgZ2VzdHVyZS5kZWx0YVggPSBmbGluZ0RlbHRhLng7Ci0gICAgZ2VzdHVyZS5k ZWx0YVkgPSBmbGluZ0RlbHRhLnk7CisgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQudmVsb2Np dHlYID0gZmxpbmdEZWx0YS54OworICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5 WSA9IGZsaW5nRGVsdGEueTsKICAgICBnZXN0dXJlLnggPSBmbGluZ1BvaW50Lng7CiAgICAgZ2Vz dHVyZS55ID0gZmxpbmdQb2ludC55OwogICAgIGdlc3R1cmUuZ2xvYmFsWCA9IGZsaW5nR2xvYmFs UG9pbnQueDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCBjN2Q2YmZiNDg0NTQyNzRjNTEyZDAwNTFiZmE1MmZkMDc2NmQzZGNlLi5iNDEzMDI3MWY2 ZTg4Njc3ZDY2NzkwNDJjZDNjNDUwOGVmMmJkYjYyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMzAgIFJp Y2sgQnllcnMgIDxyYnllcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVwZGF0ZSBjaHJvbWl1 bSBEdW1wUmVuZGVyVHJlZSBmb3IgbmV3IFdlYkdlc3R1cmVFdmVudCBmaWVsZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NTczCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIEV2ZW50U2VuZGVy IHRvIHdyaXRlIGdlc3R1cmUgZGV0YWlscyBpbnRvIHRoZSBhcHByb3ByaWF0ZQorICAgICAgICB0 eXBlLXNwZWNpZmljIFdlYkdlc3R1cmVFdmVudCBmaWVsZHMuCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9FdmVudFNlbmRlci5jcHA6CisgICAgICAgIChFdmVu dFNlbmRlcjo6Z2VzdHVyZUV2ZW50KToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpnZXN0dXJlRmxp bmdTdGFydCk6CisKIDIwMTItMDgtMzAgIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUu Y29tPgogCiAgICAgICAgIG9iamNfbXNnU2VuZCBhbmQgSU1QIHNob3VsZCBiZSBjYXN0IGFwcHJv cHJpYXRlbHkgYmVmb3JlIHVzaW5nCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9UZXN0UnVubmVyL0V2ZW50U2VuZGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCmluZGV4IGNhZmFjYTlhY2Q3Y2Q4 NjRkNzM5NGZlNzUyNjQxN2M0NzRhMjk3ZDIuLjhhZWEwYjNjYjY5ODM0ZTRkYTgxY2VhMjg2OTQ3 YTY4ZjQzZGEzMjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCkBAIC0xMTUzLDEyICsxMTUzLDE0IEBAIHZv aWQgRXZlbnRTZW5kZXI6Omdlc3R1cmVFdmVudChXZWJJbnB1dEV2ZW50OjpUeXBlIHR5cGUsIGNv bnN0IENwcEFyZ3VtZW50TGlzdCYKIAogICAgIHN3aXRjaCAodHlwZSkgewogICAgIGNhc2UgV2Vi SW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZToKLSAgICAgICAgZXZlbnQuZGVsdGFYID0g c3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1swXS50b0RvdWJsZSgpKTsKLSAgICAgICAgZXZl bnQuZGVsdGFZID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1sxXS50b0RvdWJsZSgpKTsK KyAgICAgICAgZXZlbnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFYID0KKyAgICAgICAgICAgIHN0 YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMF0udG9Eb3VibGUoKSk7CisgICAgICAgIGV2ZW50 LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9CisgICAgICAgICAgICBzdGF0aWNfY2FzdDxmbG9h dD4oYXJndW1lbnRzWzFdLnRvRG91YmxlKCkpOwogICAgICAgICBldmVudC54ID0gbV9jdXJyZW50 R2VzdHVyZUxvY2F0aW9uLng7CiAgICAgICAgIGV2ZW50LnkgPSBtX2N1cnJlbnRHZXN0dXJlTG9j YXRpb24ueTsKLSAgICAgICAgbV9jdXJyZW50R2VzdHVyZUxvY2F0aW9uLnggPSBtX2N1cnJlbnRH ZXN0dXJlTG9jYXRpb24ueCArIGV2ZW50LmRlbHRhWDsKLSAgICAgICAgbV9jdXJyZW50R2VzdHVy ZUxvY2F0aW9uLnkgPSBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueSArIGV2ZW50LmRlbHRhWTsK KyAgICAgICAgbV9jdXJyZW50R2VzdHVyZUxvY2F0aW9uLnggPSBtX2N1cnJlbnRHZXN0dXJlTG9j YXRpb24ueCArIGV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWDsKKyAgICAgICAgbV9jdXJy ZW50R2VzdHVyZUxvY2F0aW9uLnkgPSBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueSArIGV2ZW50 LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWTsKICAgICAgICAgYnJlYWs7CiAKICAgICBjYXNlIFdl YklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxCZWdpbjoKQEAgLTExNjcsMTUgKzExNjksMTUgQEAg dm9pZCBFdmVudFNlbmRlcjo6Z2VzdHVyZUV2ZW50KFdlYklucHV0RXZlbnQ6OlR5cGUgdHlwZSwg Y29uc3QgQ3BwQXJndW1lbnRMaXN0JgogICAgICAgICBldmVudC55ID0gbV9jdXJyZW50R2VzdHVy ZUxvY2F0aW9uLnk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6R2Vz dHVyZVNjcm9sbEVuZDoKLSAgICAgICAgZXZlbnQuZGVsdGFYID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+ KGFyZ3VtZW50c1swXS50b0RvdWJsZSgpKTsKLSAgICAgICAgZXZlbnQuZGVsdGFZID0gc3RhdGlj X2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1sxXS50b0RvdWJsZSgpKTsKICAgICAgICAgZXZlbnQueCA9 IG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi54OwogICAgICAgICBldmVudC55ID0gbV9jdXJyZW50 R2VzdHVyZUxvY2F0aW9uLnk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5wdXRFdmVu dDo6R2VzdHVyZVRhcDoKICAgICAgICAgaWYgKGFyZ3VtZW50cy5zaXplKCkgPj0gMykgewotICAg ICAgICAgICAgLy8gVGFwIGNvdW50LgotICAgICAgICAgICAgZXZlbnQuZGVsdGFYID0gc3RhdGlj X2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1syXS50b0RvdWJsZSgpKTsKKyAgICAgICAgICAgIGV2ZW50 LmRhdGEudGFwLnRhcENvdW50ID0KKyAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxmbG9hdD4o YXJndW1lbnRzWzJdLnRvRG91YmxlKCkpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgIGV2 ZW50LmRhdGEudGFwLnRhcENvdW50ID0gMTsKICAgICAgICAgfQogICAgICAgICBldmVudC54ID0g cG9pbnQueDsKICAgICAgICAgZXZlbnQueSA9IHBvaW50Lnk7CkBAIC0xMjMyLDggKzEyMzQsMTAg QEAgdm9pZCBFdmVudFNlbmRlcjo6Z2VzdHVyZUZsaW5nU3RhcnQoY29uc3QgQ3BwQXJndW1lbnRM aXN0JiBhcmd1bWVudHMsIENwcFZhcmlhbnQKICAgICBldmVudC5nbG9iYWxYID0gZXZlbnQueDsK ICAgICBldmVudC5nbG9iYWxZID0gZXZlbnQueTsKIAotICAgIGV2ZW50LmRlbHRhWCA9IHN0YXRp Y19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMl0udG9Eb3VibGUoKSk7Ci0gICAgZXZlbnQuZGVsdGFZ ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1szXS50b0RvdWJsZSgpKTsKKyAgICBldmVu dC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYID0KKyAgICAgICAgc3RhdGljX2Nhc3Q8ZmxvYXQ+ KGFyZ3VtZW50c1syXS50b0RvdWJsZSgpKTsKKyAgICBldmVudC5kYXRhLmZsaW5nU3RhcnQudmVs b2NpdHlZID0KKyAgICAgICAgc3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1szXS50b0RvdWJs ZSgpKTsKICAgICBldmVudC50aW1lU3RhbXBTZWNvbmRzID0gZ2V0Q3VycmVudEV2ZW50VGltZVNl YygpOwogICAgIHdlYnZpZXcoKS0+aGFuZGxlSW5wdXRFdmVudChldmVudCk7CiB9Cg== 162050 2012-09-04 09:17:18 -0700 2012-09-05 11:07:50 -0700 jamesr cr feedback bug-95573-20120904121701.patch text/plain 17078 rbyers U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3MTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGY1OTc1OGJlNDE1YTY0ODIxZGM5M2Y3OGI4MjdhN2FjMjUzYmQ2ZWYuLmZlNmYzZmIyNTczY2U3 NTY4ZWUxYTE2ZDg3YzgyNDYxMjI2ZWNmOTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzMgQEAKKzIwMTItMDgtMzAgIFJpY2sgQnllcnMgIDxyYnllcnNAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFVzZSBuZXcgdHlwZS1zcGVjaWZpYyBXZWJHZXN0dXJlRXZlbnQgZmll bGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENocm9t aXVtIGhhcyBiZWVuIHVwZGF0ZWQgdG8gc3RvcmUgZ2VzdHVyZS10eXBlIHNwZWNpZmljIGRldGFp bHMgaW4gdGhlCisgICAgICAgIG5ldyBXZWJHZXN0dXJlRXZlbnQgZmllbGRzIChjcnJldi5jb20v MTUyNTA4KSwgc28gd2UgY2FuIG5vdyByZWx5IG9uIHRoZW0uCisgICAgICAgIFRPRE86IGFsc28g bGlzdCByZXZpc2lvbiBVUkwgZm9yCisgICAgICAgIGh0dHA6Ly9jb2RlcmV2aWV3LmNocm9taXVt Lm9yZy8xMDg5NTAyNC8gd2hlbiBpdCBsYW5kcy4KKworICAgICAgICAqIHNyYy9XZWJDb21wb3Np dG9ySW5wdXRIYW5kbGVySW1wbC5jcHA6CisgICAgICAgIFVwZGF0ZSB0aGUgY29tcG9zaXRvciBz Y3JvbGwsIHBpbmNoIGFuZCBmbGluZyBoYW5kbGluZyB0byB1c2UgdGhlc2UgbmV3IGZpZWxkcy4K KyAgICAgICAgKFdlYktpdDo6V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmhhbmRsZUlu cHV0RXZlbnRJbnRlcm5hbCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JJbnB1dEhh bmRsZXJJbXBsOjpoYW5kbGVHZXN0dXJlRmxpbmcpOgorICAgICAgICAqIHNyYy9XZWJJbnB1dEV2 ZW50Q29udmVyc2lvbi5jcHA6CisgICAgICAgIFVwZGF0ZSBQbGF0Zm9ybUdlc3R1cmVFdmVudC9X ZWJHZXN0dXJlRXZlbnQgY29udmVyc2lvbiB0byB1c2UgdGhlIG5ldworICAgICAgICBmaWVsZHMs IHN0b3JpbmcgaW50byB0aGUgZXhpc3Rpbmcgb3ZlcmxvYWRlZCBQbGF0Zm9ybUdlc3R1cmVFdmVu dAorICAgICAgICBmaWVsZHMgKHdoaWNoIHdpbGwgYmUgY2xlYW5lZCB1cCBpbiBteSBuZXh0IENM KS4KKyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1HZXN0dXJlRXZlbnRCdWlsZGVyOjpQbGF0Zm9y bUdlc3R1cmVFdmVudEJ1aWxkZXIpOgorICAgICAgICAoV2ViS2l0OjpXZWJHZXN0dXJlRXZlbnRC dWlsZGVyOjpXZWJHZXN0dXJlRXZlbnRCdWlsZGVyKToKKyAgICAgICAgKiBzcmMvV2ViVmlld0lt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50 KToKKyAgICAgICAgVXBkYXRlIGZsaW5nIHNjcm9sbGluZyBpbXBsZW1lbnRhdGlvbiBmb3IgY29y cmVjdCBsb2NhdGlvbiBvZiB2ZWxvY2l0eS4KKyAgICAgICAgKiB0ZXN0cy9XZWJDb21wb3NpdG9y SW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwOgorICAgICAgICAoV2ViS2l0OjpURVNUX0YpOgorICAg ICAgICBVcGRhdGUgdGVzdHMgdG8gdXNlIHRoZSBuZXcgZmllbGRzLgorCisKIDIwMTItMDgtMzAg IEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21p dW1dIE1ha2Ugd2Via2l0X2NvbXBvc2l0b3Igc3BlY2lmaWMgdW5pdCB0ZXN0IGNvbXBpbGF0aW9u IGNvbmRpdGlvbmFsIG9uIGd5cCB2YXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsLmNwcAppbmRleCA4MDg0 ZDcxNWM3YjAyYTU3OGU0MWVjYmEzZTk5Mzg0ZjY0MmFkMmU5Li4xZTUwMzg1NTBiMDE3OTM1YzBm ZGQyM2JlMzU0OWYyYWEyYTE3NGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGwuY3BwCkBAIC0yMTYs NyArMjE2LDggQEAgV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OkV2ZW50RGlzcG9zaXRp b24gV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmgKICAgICAgICAgICAgIHJldHVybiBE aWROb3RIYW5kbGU7CiAKICAgICAgICAgY29uc3QgV2ViR2VzdHVyZUV2ZW50JiBnZXN0dXJlRXZl bnQgPSAqc3RhdGljX2Nhc3Q8Y29uc3QgV2ViR2VzdHVyZUV2ZW50Kj4oJmV2ZW50KTsKLSAgICAg ICAgbV9pbnB1dEhhbmRsZXJDbGllbnQtPnNjcm9sbEJ5KEludFBvaW50KGdlc3R1cmVFdmVudC54 LCBnZXN0dXJlRXZlbnQueSksIEludFNpemUoLWdlc3R1cmVFdmVudC5kZWx0YVgsIC1nZXN0dXJl RXZlbnQuZGVsdGFZKSk7CisgICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5zY3JvbGxCeShJ bnRQb2ludChnZXN0dXJlRXZlbnQueCwgZ2VzdHVyZUV2ZW50LnkpLAorICAgICAgICAgICAgSW50 U2l6ZSgtZ2VzdHVyZUV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWCwgLWdlc3R1cmVFdmVu dC5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVkpKTsKICAgICAgICAgcmV0dXJuIERpZEhhbmRsZTsK ICAgICB9IGVsc2UgaWYgKGV2ZW50LnR5cGUgPT0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9s bEVuZCkgewogICAgICAgICBBU1NFUlQobV9leHBlY3RTY3JvbGxVcGRhdGVFbmQpOwpAQCAtMjQ2 LDcgKzI0Nyw3IEBAIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0 aW9uIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpoCiAgICAgfSBlbHNlIGlmIChldmVu dC50eXBlID09IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQaW5jaFVwZGF0ZSkgewogICAgICAgICBB U1NFUlQobV9leHBlY3RQaW5jaFVwZGF0ZUVuZCk7CiAgICAgICAgIGNvbnN0IFdlYkdlc3R1cmVF dmVudCYgZ2VzdHVyZUV2ZW50ID0gKnN0YXRpY19jYXN0PGNvbnN0IFdlYkdlc3R1cmVFdmVudCo+ KCZldmVudCk7Ci0gICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5waW5jaEdlc3R1cmVVcGRh dGUoZ2VzdHVyZUV2ZW50LmRlbHRhWCwgSW50UG9pbnQoZ2VzdHVyZUV2ZW50LngsIGdlc3R1cmVF dmVudC55KSk7CisgICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5waW5jaEdlc3R1cmVVcGRh dGUoZ2VzdHVyZUV2ZW50LmRhdGEucGluY2hVcGRhdGUuc2NhbGUsIEludFBvaW50KGdlc3R1cmVF dmVudC54LCBnZXN0dXJlRXZlbnQueSkpOwogICAgICAgICByZXR1cm4gRGlkSGFuZGxlOwogICAg IH0gZWxzZSBpZiAoZXZlbnQudHlwZSA9PSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlRmxpbmdTdGFy dCkgewogICAgICAgICBjb25zdCBXZWJHZXN0dXJlRXZlbnQmIGdlc3R1cmVFdmVudCA9ICpzdGF0 aWNfY2FzdDxjb25zdCBXZWJHZXN0dXJlRXZlbnQqPigmZXZlbnQpOwpAQCAtMjY3LDkgKzI2OCw5 IEBAIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0aW9uIFdlYkNv bXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpoCiAgICAgc3dpdGNoIChzY3JvbGxTdGF0dXMpIHsK ICAgICBjYXNlIENDSW5wdXRIYW5kbGVyQ2xpZW50OjpTY3JvbGxTdGFydGVkOiB7CiAgICAgICAg IFRSQUNFX0VWRU5UX0lOU1RBTlQwKCJjYyIsICJXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1w bDo6aGFuZGxlR2VzdHVyZUZsaW5nOjpzdGFydGVkIik7Ci0gICAgICAgIE93blB0cjxQbGF0Zm9y bUdlc3R1cmVDdXJ2ZT4gZmxpbmdDdXJ2ZSA9IFRvdWNocGFkRmxpbmdQbGF0Zm9ybUdlc3R1cmVD dXJ2ZTo6Y3JlYXRlKEZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50LmRlbHRhWCwgZ2VzdHVyZUV2ZW50 LmRlbHRhWSkpOworICAgICAgICBPd25QdHI8UGxhdGZvcm1HZXN0dXJlQ3VydmU+IGZsaW5nQ3Vy dmUgPSBUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0dXJlQ3VydmU6OmNyZWF0ZShGbG9hdFBvaW50 KGdlc3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYLCBnZXN0dXJlRXZlbnQuZGF0 YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WSkpOwogICAgICAgICBtX3doZWVsRmxpbmdBbmltYXRpb24g PSBDQ0FjdGl2ZUdlc3R1cmVBbmltYXRpb246OmNyZWF0ZShQbGF0Zm9ybUdlc3R1cmVUb0NDR2Vz dHVyZUFkYXB0ZXI6OmNyZWF0ZShmbGluZ0N1cnZlLnJlbGVhc2UoKSksIHRoaXMpOwotICAgICAg ICBtX3doZWVsRmxpbmdQYXJhbWV0ZXJzLmRlbHRhID0gV2ViRmxvYXRQb2ludChnZXN0dXJlRXZl bnQuZGVsdGFYLCBnZXN0dXJlRXZlbnQuZGVsdGFZKTsKKyAgICAgICAgbV93aGVlbEZsaW5nUGFy YW1ldGVycy5kZWx0YSA9IFdlYkZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50LmRhdGEuZmxpbmdTdGFy dC52ZWxvY2l0eVgsIGdlc3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZKTsKICAg ICAgICAgbV93aGVlbEZsaW5nUGFyYW1ldGVycy5wb2ludCA9IFdlYlBvaW50KGdlc3R1cmVFdmVu dC54LCBnZXN0dXJlRXZlbnQueSk7CiAgICAgICAgIG1fd2hlZWxGbGluZ1BhcmFtZXRlcnMuZ2xv YmFsUG9pbnQgPSBXZWJQb2ludChnZXN0dXJlRXZlbnQuZ2xvYmFsWCwgZ2VzdHVyZUV2ZW50Lmds b2JhbFkpOwogICAgICAgICBtX3doZWVsRmxpbmdQYXJhbWV0ZXJzLm1vZGlmaWVycyA9IGdlc3R1 cmVFdmVudC5tb2RpZmllcnM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAKaW5kZXggMDM5MWMyODViN2Y4ZTNlNjY5NTE2 MzlkMzY1ZjU4YmQ3M2U4YTk5Mi4uYmI2YjU3MzU1MzllZDc2MmJjMWM2NTkyZmJiY2I1NGI0NDRh MjI4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVu dENvbnZlcnNpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYklucHV0 RXZlbnRDb252ZXJzaW9uLmNwcApAQCAtMTQ5LDEwICsxNDksMTQgQEAgUGxhdGZvcm1HZXN0dXJl RXZlbnRCdWlsZGVyOjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRnZXQs IGNvbnN0IFcKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJl U2Nyb2xsVXBkYXRlOgogICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlU2Ny b2xsVXBkYXRlOworICAgICAgICBtX2RlbHRhWCA9IGUuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFY OworICAgICAgICBtX2RlbHRhWSA9IGUuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZOwogICAgICAg ICBicmVhazsKICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Okdlc3R1cmVUYXA6CiAgICAgICAgIG1f dHlwZSA9IFBsYXRmb3JtRXZlbnQ6Okdlc3R1cmVUYXA7Ci0gICAgICAgIG1fYXJlYSA9IEludFNp emUoZS5ib3VuZGluZ0JveC53aWR0aCwgZS5ib3VuZGluZ0JveC5oZWlnaHQpOworICAgICAgICBt X2FyZWEgPSBJbnRTaXplKGUuZGF0YS50YXAud2lkdGgsIGUuZGF0YS50YXAuaGVpZ2h0KTsKKyAg ICAgICAgLy8gRklYTUU6IFBsYXRmb3JtR2VzdHVyZUV2ZW50IGRlbHRhWCBpcyBvdmVybG9hZGVk IC0gd2tiLnVnLzkzMTIzCisgICAgICAgIG1fZGVsdGFYID0gc3RhdGljX2Nhc3Q8aW50PihlLmRh dGEudGFwLnRhcENvdW50KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50 OjpHZXN0dXJlVGFwRG93bjoKICAgICAgICAgbV90eXBlID0gUGxhdGZvcm1FdmVudDo6R2VzdHVy ZVRhcERvd247CkBAIC0xNjUsNyArMTY5LDcgQEAgUGxhdGZvcm1HZXN0dXJlRXZlbnRCdWlsZGVy OjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IFcKICAg ICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlTG9uZ1ByZXNzOgog ICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlTG9uZ1ByZXNzOwotICAgICAg ICBtX2FyZWEgPSBJbnRTaXplKGUuYm91bmRpbmdCb3gud2lkdGgsIGUuYm91bmRpbmdCb3guaGVp Z2h0KTsKKyAgICAgICAgbV9hcmVhID0gSW50U2l6ZShlLmRhdGEubG9uZ1ByZXNzLndpZHRoLCBl LmRhdGEubG9uZ1ByZXNzLmhlaWdodCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5w dXRFdmVudDo6R2VzdHVyZVBpbmNoQmVnaW46CiAgICAgICAgIG1fdHlwZSA9IFBsYXRmb3JtRXZl bnQ6Okdlc3R1cmVQaW5jaEJlZ2luOwpAQCAtMTc1LDE0ICsxNzksMTQgQEAgUGxhdGZvcm1HZXN0 dXJlRXZlbnRCdWlsZGVyOjpQbGF0Zm9ybUdlc3R1cmVFdmVudEJ1aWxkZXIoV2lkZ2V0KiB3aWRn ZXQsIGNvbnN0IFcKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0 dXJlUGluY2hVcGRhdGU6CiAgICAgICAgIG1fdHlwZSA9IFBsYXRmb3JtRXZlbnQ6Okdlc3R1cmVQ aW5jaFVwZGF0ZTsKKyAgICAgICAgLy8gRklYTUU6IFBsYXRmb3JtR2VzdHVyZUV2ZW50IGRlbHRh WCBpcyBvdmVybG9hZGVkIC0gd2tiLnVnLzkzMTIzCisgICAgICAgIG1fZGVsdGFYID0gZS5kYXRh LnBpbmNoVXBkYXRlLnNjYWxlOwogICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAgICAgbV9wb3NpdGlvbiA9IHdpZGdldC0+ Y29udmVydEZyb21Db250YWluaW5nV2luZG93KEludFBvaW50KGUueCwgZS55KSk7CiAgICAgbV9n bG9iYWxQb3NpdGlvbiA9IEludFBvaW50KGUuZ2xvYmFsWCwgZS5nbG9iYWxZKTsKLSAgICBtX2Rl bHRhWCA9IGUuZGVsdGFYOwotICAgIG1fZGVsdGFZID0gZS5kZWx0YVk7CiAgICAgbV90aW1lc3Rh bXAgPSBlLnRpbWVTdGFtcFNlY29uZHM7CiAKICAgICBtX21vZGlmaWVycyA9IDA7CkBAIC01MjYs OCArNTMwLDExIEBAIFdlYkdlc3R1cmVFdmVudEJ1aWxkZXI6OldlYkdlc3R1cmVFdmVudEJ1aWxk ZXIoY29uc3QgV2lkZ2V0KiB3aWRnZXQsIGNvbnN0IEdlc3R1CiAgICAgICAgIHR5cGUgPSBHZXN0 dXJlU2Nyb2xsQmVnaW47CiAgICAgZWxzZSBpZiAoZXZlbnQudHlwZSgpID09IGV2ZW50TmFtZXMo KS5nZXN0dXJlc2Nyb2xsZW5kRXZlbnQpCiAgICAgICAgIHR5cGUgPSBHZXN0dXJlU2Nyb2xsRW5k OwotICAgIGVsc2UgaWYgKGV2ZW50LnR5cGUoKSA9PSBldmVudE5hbWVzKCkuZ2VzdHVyZXNjcm9s bHVwZGF0ZUV2ZW50KQorICAgIGVsc2UgaWYgKGV2ZW50LnR5cGUoKSA9PSBldmVudE5hbWVzKCku Z2VzdHVyZXNjcm9sbHVwZGF0ZUV2ZW50KSB7CiAgICAgICAgIHR5cGUgPSBHZXN0dXJlU2Nyb2xs VXBkYXRlOworICAgICAgICBkYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVggPSBldmVudC5kZWx0YVgo KTsKKyAgICAgICAgZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZID0gZXZlbnQuZGVsdGFZKCk7Cisg ICAgfQogCiAgICAgdGltZVN0YW1wU2Vjb25kcyA9IGV2ZW50LnRpbWVTdGFtcCgpIC8gbWlsbGlz UGVyU2Vjb25kOwogICAgIG1vZGlmaWVycyA9IGdldFdlYklucHV0TW9kaWZpZXJzKGV2ZW50KTsK QEAgLTUzNiw5ICs1NDMsNiBAQCBXZWJHZXN0dXJlRXZlbnRCdWlsZGVyOjpXZWJHZXN0dXJlRXZl bnRCdWlsZGVyKGNvbnN0IFdpZGdldCogd2lkZ2V0LCBjb25zdCBHZXN0dQogICAgIGdsb2JhbFkg PSBldmVudC5zY3JlZW5ZKCk7CiAgICAgeCA9IGV2ZW50LmFic29sdXRlTG9jYXRpb24oKS54KCkg LSB3aWRnZXQtPmxvY2F0aW9uKCkueCgpOwogICAgIHkgPSBldmVudC5hYnNvbHV0ZUxvY2F0aW9u KCkueSgpIC0gd2lkZ2V0LT5sb2NhdGlvbigpLnkoKTsKLQotICAgIGRlbHRhWCA9IGV2ZW50LmRl bHRhWCgpOwotICAgIGRlbHRhWSA9IGV2ZW50LmRlbHRhWSgpOwogfQogI2VuZGlmIC8vIEVOQUJM RShHRVNUVVJFX0VWRU5UUykKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuY3BwCmluZGV4IDYyNmNiMGI1ZjFhYWEyM2VlZTc4OTYwNWVjYzcxMTdjYzNhN2YxZjMuLjU1 NWY3NjliODg1MmNiNDRkNTJiN2EzNjI0ZjZiMTcxYzE4NzJmYTcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTY5Myw3ICs2OTMsNyBAQCBib29sIFdl YlZpZXdJbXBsOjpoYW5kbGVHZXN0dXJlRXZlbnQoY29uc3QgV2ViR2VzdHVyZUV2ZW50JiBldmVu dCkKICAgICAgICAgbV9sYXN0V2hlZWxHbG9iYWxQb3NpdGlvbiA9IFdlYlBvaW50KGV2ZW50Lmds b2JhbFgsIGV2ZW50Lmdsb2JhbFkpOwogICAgICAgICBtX2ZsaW5nTW9kaWZpZXIgPSBldmVudC5t b2RpZmllcnM7CiAgICAgICAgIC8vIEZJWE1FOiBNYWtlIHRoZSBjdXJ2ZSBwYXJhbWV0cml6YWJs ZSBmcm9tIHRoZSBicm93c2VyLgotICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBBY3RpdmVQ bGF0Zm9ybUdlc3R1cmVBbmltYXRpb246OmNyZWF0ZShUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0 dXJlQ3VydmU6OmNyZWF0ZShGbG9hdFBvaW50KGV2ZW50LmRlbHRhWCwgZXZlbnQuZGVsdGFZKSks IHRoaXMpOworICAgICAgICBtX2dlc3R1cmVBbmltYXRpb24gPSBBY3RpdmVQbGF0Zm9ybUdlc3R1 cmVBbmltYXRpb246OmNyZWF0ZShUb3VjaHBhZEZsaW5nUGxhdGZvcm1HZXN0dXJlQ3VydmU6OmNy ZWF0ZShGbG9hdFBvaW50KGV2ZW50LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVgsIGV2ZW50LmRh dGEuZmxpbmdTdGFydC52ZWxvY2l0eVkpKSwgdGhpcyk7CiAgICAgICAgIHNjaGVkdWxlQW5pbWF0 aW9uKCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LmNw cCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxl ckltcGxUZXN0LmNwcAppbmRleCA4MzEzYjBmNWI4YmZjN2RlZGY4NGVlZDVkMjFmNzAzZTlmNmVk ZTZkLi44MmUzYjU0NmE1Mzc3M2ZjNjBjMWYzMmM1ZWVhOWFiZTUwNDRlYWE4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJ bXBsVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJDb21wb3Np dG9ySW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwCkBAIC0yMDAsMTQgKzIwMCwxNCBAQCBURVNUX0Yo V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlU2Nyb2xsU3RhcnRlZCkK ICAgICBWRVJJRllfQU5EX1JFU0VUX01PQ0tTKCk7CiAKICAgICBnZXN0dXJlLnR5cGUgPSBXZWJJ bnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xsVXBkYXRlOwotICAgIGdlc3R1cmUuZGVsdGFZID0gLTQw OyAvLyAtWSBtZWFucyBzY3JvbGwgZG93biAtIGkuZS4gaW4gdGhlICtZIGRpcmVjdGlvbi4KKyAg ICBnZXN0dXJlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9IC00MDsgLy8gLVkgbWVhbnMgc2Ny b2xsIGRvd24gLSBpLmUuIGluIHRoZSArWSBkaXJlY3Rpb24uCiAgICAgRVhQRUNUX0NBTEwobV9t b2NrQ0NJbnB1dEhhbmRsZXJDbGllbnQsIHNjcm9sbEJ5KHRlc3Rpbmc6Ol8sIHRlc3Rpbmc6OlBy b3BlcnR5KCZXZWJDb3JlOjpJbnRTaXplOjpoZWlnaHQsIHRlc3Rpbmc6Okd0KDApKSkpOwogICAg IG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCiAgICAgVkVSSUZZ X0FORF9SRVNFVF9NT0NLUygpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6 R2VzdHVyZVNjcm9sbEVuZDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IDA7CisgICAgZ2VzdHVyZS5k YXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVkgPSAwOwogICAgIEVYUEVDVF9DQUxMKG1fbW9ja0NDSW5w dXRIYW5kbGVyQ2xpZW50LCBzY3JvbGxFbmQoKSk7CiAgICAgbV9pbnB1dEhhbmRsZXItPmhhbmRs ZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiB9CkBAIC0yMjcsMTMgKzIyNywxMyBAQCBURVNUX0YoV2Vi Q29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlU2Nyb2xsT25NYWluVGhyZWFk KQogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUudHlwZSA9IFdl YklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxVcGRhdGU7Ci0gICAgZ2VzdHVyZS5kZWx0YVkgPSA0 MDsKKyAgICBnZXN0dXJlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9IDQwOwogICAgIG1faW5w dXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCiAgICAgVkVSSUZZX0FORF9S RVNFVF9NT0NLUygpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVy ZVNjcm9sbEVuZDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IDA7CisgICAgZ2VzdHVyZS5kYXRhLnNj cm9sbFVwZGF0ZS5kZWx0YVkgPSAwOwogICAgIG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2 ZW50KGdlc3R1cmUpOwogfQogCkBAIC0yNjYsNyArMjY2LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0 b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2VzdHVyZVBpbmNoKQogICAgIFZFUklGWV9BTkRfUkVT RVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQ aW5jaFVwZGF0ZTsKLSAgICBnZXN0dXJlLmRlbHRhWCA9IDEuNTsKKyAgICBnZXN0dXJlLmRhdGEu cGluY2hVcGRhdGUuc2NhbGUgPSAxLjU7CiAgICAgZ2VzdHVyZS54ID0gNzsKICAgICBnZXN0dXJl LnkgPSAxMzsKICAgICBFWFBFQ1RfQ0FMTChtX21vY2tDQ0lucHV0SGFuZGxlckNsaWVudCwgcGlu Y2hHZXN0dXJlVXBkYXRlKDEuNSwgV2ViQ29yZTo6SW50UG9pbnQoNywgMTMpKSk7CkBAIC0yNzUs NyArMjc1LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2Vz dHVyZVBpbmNoKQogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUu dHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQaW5jaFVwZGF0ZTsKLSAgICBnZXN0dXJlLmRl bHRhWCA9IDAuNTsKKyAgICBnZXN0dXJlLmRhdGEucGluY2hVcGRhdGUuc2NhbGUgPSAwLjU7CiAg ICAgZ2VzdHVyZS54ID0gOTsKICAgICBnZXN0dXJlLnkgPSA2OwogICAgIEVYUEVDVF9DQUxMKG1f bW9ja0NDSW5wdXRIYW5kbGVyQ2xpZW50LCBwaW5jaEdlc3R1cmVVcGRhdGUoLjUsIFdlYkNvcmU6 OkludFBvaW50KDksIDYpKSk7CkBAIC0yOTgsNyArMjk4LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0 b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nU3RhcnRlZCkKICAgICAgICAgLldp bGxPbmNlKHRlc3Rpbmc6OlJldHVybihXZWJDb3JlOjpDQ0lucHV0SGFuZGxlckNsaWVudDo6U2Ny b2xsU3RhcnRlZCkpOwogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVy ZUZsaW5nU3RhcnQ7Ci0gICAgZ2VzdHVyZS5kZWx0YVggPSAxMDsKKyAgICBnZXN0dXJlLmRhdGEu ZmxpbmdTdGFydC52ZWxvY2l0eVggPSAxMDsKICAgICBFWFBFQ1RfQ0FMTChtX21vY2tDQ0lucHV0 SGFuZGxlckNsaWVudCwgc2NoZWR1bGVBbmltYXRpb24oKSk7CiAgICAgbV9pbnB1dEhhbmRsZXIt PmhhbmRsZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiAKQEAgLTM1OSw4ICszNTksOCBAQCBURVNUX0Yo V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlRmxpbmdBbmltYXRlcykK ICAgICBXZWJQb2ludCBmbGluZ1BvaW50ID0gV2ViUG9pbnQoNywgMTMpOwogICAgIFdlYlBvaW50 IGZsaW5nR2xvYmFsUG9pbnQgPSBXZWJQb2ludCgxNywgMjMpOwogICAgIGludCBtb2RpZmllcnMg PSA3OwotICAgIGdlc3R1cmUuZGVsdGFYID0gZmxpbmdEZWx0YS54OwotICAgIGdlc3R1cmUuZGVs dGFZID0gZmxpbmdEZWx0YS55OworICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5 WCA9IGZsaW5nRGVsdGEueDsKKyAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVkg PSBmbGluZ0RlbHRhLnk7CiAgICAgZ2VzdHVyZS54ID0gZmxpbmdQb2ludC54OwogICAgIGdlc3R1 cmUueSA9IGZsaW5nUG9pbnQueTsKICAgICBnZXN0dXJlLmdsb2JhbFggPSBmbGluZ0dsb2JhbFBv aW50Lng7CkBAIC00NDMsOCArNDQzLDggQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRs ZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nVHJhbnNmZXJSZXNldHMpCiAgICAgV2ViUG9pbnQgZmxp bmdQb2ludCA9IFdlYlBvaW50KDcsIDEzKTsKICAgICBXZWJQb2ludCBmbGluZ0dsb2JhbFBvaW50 ID0gV2ViUG9pbnQoMTcsIDIzKTsKICAgICBpbnQgbW9kaWZpZXJzID0gMTsKLSAgICBnZXN0dXJl LmRlbHRhWCA9IGZsaW5nRGVsdGEueDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IGZsaW5nRGVsdGEu eTsKKyAgICBnZXN0dXJlLmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVggPSBmbGluZ0RlbHRhLng7 CisgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZID0gZmxpbmdEZWx0YS55Owog ICAgIGdlc3R1cmUueCA9IGZsaW5nUG9pbnQueDsKICAgICBnZXN0dXJlLnkgPSBmbGluZ1BvaW50 Lnk7CiAgICAgZ2VzdHVyZS5nbG9iYWxYID0gZmxpbmdHbG9iYWxQb2ludC54OwpAQCAtNTIyLDgg KzUyMiw4IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1 cmVGbGluZ1RyYW5zZmVyUmVzZXRzKQogICAgIGZsaW5nUG9pbnQgPSBXZWJQb2ludCg5NSwgODcp OwogICAgIGZsaW5nR2xvYmFsUG9pbnQgPSBXZWJQb2ludCgzMiwgNzEpOwogICAgIG1vZGlmaWVy cyA9IDI7Ci0gICAgZ2VzdHVyZS5kZWx0YVggPSBmbGluZ0RlbHRhLng7Ci0gICAgZ2VzdHVyZS5k ZWx0YVkgPSBmbGluZ0RlbHRhLnk7CisgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQudmVsb2Np dHlYID0gZmxpbmdEZWx0YS54OworICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5 WSA9IGZsaW5nRGVsdGEueTsKICAgICBnZXN0dXJlLnggPSBmbGluZ1BvaW50Lng7CiAgICAgZ2Vz dHVyZS55ID0gZmxpbmdQb2ludC55OwogICAgIGdlc3R1cmUuZ2xvYmFsWCA9IGZsaW5nR2xvYmFs UG9pbnQueDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCBjN2Q2YmZiNDg0NTQyNzRjNTEyZDAwNTFiZmE1MmZkMDc2NmQzZGNlLi5iNDEzMDI3MWY2 ZTg4Njc3ZDY2NzkwNDJjZDNjNDUwOGVmMmJkYjYyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMzAgIFJp Y2sgQnllcnMgIDxyYnllcnNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFVwZGF0ZSBjaHJvbWl1 bSBEdW1wUmVuZGVyVHJlZSBmb3IgbmV3IFdlYkdlc3R1cmVFdmVudCBmaWVsZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NTczCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRlIEV2ZW50U2VuZGVy IHRvIHdyaXRlIGdlc3R1cmUgZGV0YWlscyBpbnRvIHRoZSBhcHByb3ByaWF0ZQorICAgICAgICB0 eXBlLXNwZWNpZmljIFdlYkdlc3R1cmVFdmVudCBmaWVsZHMuCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvY2hyb21pdW0vVGVzdFJ1bm5lci9FdmVudFNlbmRlci5jcHA6CisgICAgICAgIChFdmVu dFNlbmRlcjo6Z2VzdHVyZUV2ZW50KToKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpnZXN0dXJlRmxp bmdTdGFydCk6CisKIDIwMTItMDgtMzAgIFByYXRpayBTb2xhbmtpICA8cHNvbGFua2lAYXBwbGUu Y29tPgogCiAgICAgICAgIG9iamNfbXNnU2VuZCBhbmQgSU1QIHNob3VsZCBiZSBjYXN0IGFwcHJv cHJpYXRlbHkgYmVmb3JlIHVzaW5nCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9j aHJvbWl1bS9UZXN0UnVubmVyL0V2ZW50U2VuZGVyLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCmluZGV4IGNhZmFjYTlhY2Q3Y2Q4 NjRkNzM5NGZlNzUyNjQxN2M0NzRhMjk3ZDIuLmQ1ZWFhYzRhZGExZGRlNTk2YzA4YTg2MGQ5MzVh ZjIyZTZiYjllZmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL1Rlc3RSdW5uZXIvRXZlbnRTZW5kZXIuY3BwCkBAIC0xMTUzLDEyICsxMTUzLDEyIEBAIHZv aWQgRXZlbnRTZW5kZXI6Omdlc3R1cmVFdmVudChXZWJJbnB1dEV2ZW50OjpUeXBlIHR5cGUsIGNv bnN0IENwcEFyZ3VtZW50TGlzdCYKIAogICAgIHN3aXRjaCAodHlwZSkgewogICAgIGNhc2UgV2Vi SW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZToKLSAgICAgICAgZXZlbnQuZGVsdGFYID0g c3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1swXS50b0RvdWJsZSgpKTsKLSAgICAgICAgZXZl bnQuZGVsdGFZID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1sxXS50b0RvdWJsZSgpKTsK KyAgICAgICAgZXZlbnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFYID0gc3RhdGljX2Nhc3Q8Zmxv YXQ+KGFyZ3VtZW50c1swXS50b0RvdWJsZSgpKTsKKyAgICAgICAgZXZlbnQuZGF0YS5zY3JvbGxV cGRhdGUuZGVsdGFZID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1sxXS50b0RvdWJsZSgp KTsKICAgICAgICAgZXZlbnQueCA9IG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi54OwogICAgICAg ICBldmVudC55ID0gbV9jdXJyZW50R2VzdHVyZUxvY2F0aW9uLnk7Ci0gICAgICAgIG1fY3VycmVu dEdlc3R1cmVMb2NhdGlvbi54ID0gbV9jdXJyZW50R2VzdHVyZUxvY2F0aW9uLnggKyBldmVudC5k ZWx0YVg7Ci0gICAgICAgIG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi55ID0gbV9jdXJyZW50R2Vz dHVyZUxvY2F0aW9uLnkgKyBldmVudC5kZWx0YVk7CisgICAgICAgIG1fY3VycmVudEdlc3R1cmVM b2NhdGlvbi54ID0gbV9jdXJyZW50R2VzdHVyZUxvY2F0aW9uLnggKyBldmVudC5kYXRhLnNjcm9s bFVwZGF0ZS5kZWx0YVg7CisgICAgICAgIG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi55ID0gbV9j dXJyZW50R2VzdHVyZUxvY2F0aW9uLnkgKyBldmVudC5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVk7 CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xs QmVnaW46CkBAIC0xMTY3LDE2ICsxMTY3LDE0IEBAIHZvaWQgRXZlbnRTZW5kZXI6Omdlc3R1cmVF dmVudChXZWJJbnB1dEV2ZW50OjpUeXBlIHR5cGUsIGNvbnN0IENwcEFyZ3VtZW50TGlzdCYKICAg ICAgICAgZXZlbnQueSA9IG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi55OwogICAgICAgICBicmVh azsKICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxFbmQ6Ci0gICAgICAgIGV2 ZW50LmRlbHRhWCA9IHN0YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMF0udG9Eb3VibGUoKSk7 Ci0gICAgICAgIGV2ZW50LmRlbHRhWSA9IHN0YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMV0u dG9Eb3VibGUoKSk7CiAgICAgICAgIGV2ZW50LnggPSBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24u eDsKICAgICAgICAgZXZlbnQueSA9IG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi55OwogICAgICAg ICBicmVhazsKICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Okdlc3R1cmVUYXA6Ci0gICAgICAgIGlm IChhcmd1bWVudHMuc2l6ZSgpID49IDMpIHsKLSAgICAgICAgICAgIC8vIFRhcCBjb3VudC4KLSAg ICAgICAgICAgIGV2ZW50LmRlbHRhWCA9IHN0YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMl0u dG9Eb3VibGUoKSk7Ci0gICAgICAgIH0KKyAgICAgICAgaWYgKGFyZ3VtZW50cy5zaXplKCkgPj0g MykKKyAgICAgICAgICAgIGV2ZW50LmRhdGEudGFwLnRhcENvdW50ID0gc3RhdGljX2Nhc3Q8Zmxv YXQ+KGFyZ3VtZW50c1syXS50b0RvdWJsZSgpKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgIGV2 ZW50LmRhdGEudGFwLnRhcENvdW50ID0gMTsKICAgICAgICAgZXZlbnQueCA9IHBvaW50Lng7CiAg ICAgICAgIGV2ZW50LnkgPSBwb2ludC55OwogICAgICAgICBicmVhazsKQEAgLTEyMzIsOCArMTIz MCw4IEBAIHZvaWQgRXZlbnRTZW5kZXI6Omdlc3R1cmVGbGluZ1N0YXJ0KGNvbnN0IENwcEFyZ3Vt ZW50TGlzdCYgYXJndW1lbnRzLCBDcHBWYXJpYW50CiAgICAgZXZlbnQuZ2xvYmFsWCA9IGV2ZW50 Lng7CiAgICAgZXZlbnQuZ2xvYmFsWSA9IGV2ZW50Lnk7CiAKLSAgICBldmVudC5kZWx0YVggPSBz dGF0aWNfY2FzdDxmbG9hdD4oYXJndW1lbnRzWzJdLnRvRG91YmxlKCkpOwotICAgIGV2ZW50LmRl bHRhWSA9IHN0YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbM10udG9Eb3VibGUoKSk7CisgICAg ZXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WCA9IHN0YXRpY19jYXN0PGZsb2F0Pihhcmd1 bWVudHNbMl0udG9Eb3VibGUoKSk7CisgICAgZXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5 WSA9IHN0YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbM10udG9Eb3VibGUoKSk7CiAgICAgZXZl bnQudGltZVN0YW1wU2Vjb25kcyA9IGdldEN1cnJlbnRFdmVudFRpbWVTZWMoKTsKICAgICB3ZWJ2 aWV3KCktPmhhbmRsZUlucHV0RXZlbnQoZXZlbnQpOwogfQo= 162290 2012-09-05 11:07:53 -0700 2012-09-05 21:46:16 -0700 Update ChangeLog with chromium CL numbers bug-95573-20120905140734.patch text/plain 17016 rbyers U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGYyMzRlN2IxNzgxM2NhMDAxOGViNWZmZGVhNWUxYzNjMTUyZmU0YWQuLjBlZWEzZTY4MTllZDI3 MGRjYjAxMTE0ZDQwYWFkZTQxZDA2YjczOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMzIgQEAKKzIwMTItMDgtMzAgIFJpY2sgQnllcnMgIDxyYnllcnNAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFVzZSBuZXcgdHlwZS1zcGVjaWZpYyBXZWJHZXN0dXJlRXZlbnQgZmll bGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTU3 MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENocm9t aXVtIGhhcyBiZWVuIHVwZGF0ZWQgdG8gc3RvcmUgZ2VzdHVyZS10eXBlIHNwZWNpZmljIGRldGFp bHMgaW4gdGhlCisgICAgICAgIG5ldyBXZWJHZXN0dXJlRXZlbnQgZmllbGRzIChjcnJldi5jb20v MTUyNTA4LCBjcnJldi5jb20vMTU0ODE1IGFuZAorICAgICAgICBjcnJldi5jb20vMTU0OTU5KSwg c28gd2UgY2FuIG5vdyByZWx5IG9uIHRoZW0uCisKKyAgICAgICAgKiBzcmMvV2ViQ29tcG9zaXRv cklucHV0SGFuZGxlckltcGwuY3BwOgorICAgICAgICBVcGRhdGUgdGhlIGNvbXBvc2l0b3Igc2Ny b2xsLCBwaW5jaCBhbmQgZmxpbmcgaGFuZGxpbmcgdG8gdXNlIHRoZXNlIG5ldyBmaWVsZHMuCisg ICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjpoYW5kbGVJbnB1 dEV2ZW50SW50ZXJuYWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb21wb3NpdG9ySW5wdXRIYW5k bGVySW1wbDo6aGFuZGxlR2VzdHVyZUZsaW5nKToKKyAgICAgICAgKiBzcmMvV2ViSW5wdXRFdmVu dENvbnZlcnNpb24uY3BwOgorICAgICAgICBVcGRhdGUgUGxhdGZvcm1HZXN0dXJlRXZlbnQvV2Vi R2VzdHVyZUV2ZW50IGNvbnZlcnNpb24gdG8gdXNlIHRoZSBuZXcKKyAgICAgICAgZmllbGRzLCBz dG9yaW5nIGludG8gdGhlIGV4aXN0aW5nIG92ZXJsb2FkZWQgUGxhdGZvcm1HZXN0dXJlRXZlbnQK KyAgICAgICAgZmllbGRzICh3aGljaCB3aWxsIGJlIGNsZWFuZWQgdXAgaW4gbXkgbmV4dCBDTCku CisgICAgICAgIChXZWJLaXQ6OlBsYXRmb3JtR2VzdHVyZUV2ZW50QnVpbGRlcjo6UGxhdGZvcm1H ZXN0dXJlRXZlbnRCdWlsZGVyKToKKyAgICAgICAgKFdlYktpdDo6V2ViR2VzdHVyZUV2ZW50QnVp bGRlcjo6V2ViR2VzdHVyZUV2ZW50QnVpbGRlcik6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBs LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmhhbmRsZUdlc3R1cmVFdmVudCk6 CisgICAgICAgIFVwZGF0ZSBmbGluZyBzY3JvbGxpbmcgaW1wbGVtZW50YXRpb24gZm9yIGNvcnJl Y3QgbG9jYXRpb24gb2YgdmVsb2NpdHkuCisgICAgICAgICogdGVzdHMvV2ViQ29tcG9zaXRvcklu cHV0SGFuZGxlckltcGxUZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6VEVTVF9GKToKKyAgICAg ICAgVXBkYXRlIHRlc3RzIHRvIHVzZSB0aGUgbmV3IGZpZWxkcy4KKworCiAyMDEyLTA5LTA0ICBU aWVuLVJlbiBDaGVuICA8dHJjaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1d IFJlbmFtZSBXZWJWaWV3Q2xpZW50OjpoYW5kbGVEaXNhbWJpZ3VhdGlvblBvcHVwCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVy SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9ySW5wdXRI YW5kbGVySW1wbC5jcHAKaW5kZXggODA4NGQ3MTVjN2IwMmE1NzhlNDFlY2JhM2U5OTM4NGY2NDJh ZDJlOS4uMWU1MDM4NTUwYjAxNzkzNWMwZmRkMjNiZTM1NDlmMmFhMmExNzRkOCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlcklt cGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1 dEhhbmRsZXJJbXBsLmNwcApAQCAtMjE2LDcgKzIxNiw4IEBAIFdlYkNvbXBvc2l0b3JJbnB1dEhh bmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0aW9uIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBs OjpoCiAgICAgICAgICAgICByZXR1cm4gRGlkTm90SGFuZGxlOwogCiAgICAgICAgIGNvbnN0IFdl Ykdlc3R1cmVFdmVudCYgZ2VzdHVyZUV2ZW50ID0gKnN0YXRpY19jYXN0PGNvbnN0IFdlYkdlc3R1 cmVFdmVudCo+KCZldmVudCk7Ci0gICAgICAgIG1faW5wdXRIYW5kbGVyQ2xpZW50LT5zY3JvbGxC eShJbnRQb2ludChnZXN0dXJlRXZlbnQueCwgZ2VzdHVyZUV2ZW50LnkpLCBJbnRTaXplKC1nZXN0 dXJlRXZlbnQuZGVsdGFYLCAtZ2VzdHVyZUV2ZW50LmRlbHRhWSkpOworICAgICAgICBtX2lucHV0 SGFuZGxlckNsaWVudC0+c2Nyb2xsQnkoSW50UG9pbnQoZ2VzdHVyZUV2ZW50LngsIGdlc3R1cmVF dmVudC55KSwKKyAgICAgICAgICAgIEludFNpemUoLWdlc3R1cmVFdmVudC5kYXRhLnNjcm9sbFVw ZGF0ZS5kZWx0YVgsIC1nZXN0dXJlRXZlbnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZKSk7CiAg ICAgICAgIHJldHVybiBEaWRIYW5kbGU7CiAgICAgfSBlbHNlIGlmIChldmVudC50eXBlID09IFdl YklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxFbmQpIHsKICAgICAgICAgQVNTRVJUKG1fZXhwZWN0 U2Nyb2xsVXBkYXRlRW5kKTsKQEAgLTI0Niw3ICsyNDcsNyBAQCBXZWJDb21wb3NpdG9ySW5wdXRI YW5kbGVySW1wbDo6RXZlbnREaXNwb3NpdGlvbiBXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1w bDo6aAogICAgIH0gZWxzZSBpZiAoZXZlbnQudHlwZSA9PSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJl UGluY2hVcGRhdGUpIHsKICAgICAgICAgQVNTRVJUKG1fZXhwZWN0UGluY2hVcGRhdGVFbmQpOwog ICAgICAgICBjb25zdCBXZWJHZXN0dXJlRXZlbnQmIGdlc3R1cmVFdmVudCA9ICpzdGF0aWNfY2Fz dDxjb25zdCBXZWJHZXN0dXJlRXZlbnQqPigmZXZlbnQpOwotICAgICAgICBtX2lucHV0SGFuZGxl ckNsaWVudC0+cGluY2hHZXN0dXJlVXBkYXRlKGdlc3R1cmVFdmVudC5kZWx0YVgsIEludFBvaW50 KGdlc3R1cmVFdmVudC54LCBnZXN0dXJlRXZlbnQueSkpOworICAgICAgICBtX2lucHV0SGFuZGxl ckNsaWVudC0+cGluY2hHZXN0dXJlVXBkYXRlKGdlc3R1cmVFdmVudC5kYXRhLnBpbmNoVXBkYXRl LnNjYWxlLCBJbnRQb2ludChnZXN0dXJlRXZlbnQueCwgZ2VzdHVyZUV2ZW50LnkpKTsKICAgICAg ICAgcmV0dXJuIERpZEhhbmRsZTsKICAgICB9IGVsc2UgaWYgKGV2ZW50LnR5cGUgPT0gV2ViSW5w dXRFdmVudDo6R2VzdHVyZUZsaW5nU3RhcnQpIHsKICAgICAgICAgY29uc3QgV2ViR2VzdHVyZUV2 ZW50JiBnZXN0dXJlRXZlbnQgPSAqc3RhdGljX2Nhc3Q8Y29uc3QgV2ViR2VzdHVyZUV2ZW50Kj4o JmV2ZW50KTsKQEAgLTI2Nyw5ICsyNjgsOSBAQCBXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1w bDo6RXZlbnREaXNwb3NpdGlvbiBXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbDo6aAogICAg IHN3aXRjaCAoc2Nyb2xsU3RhdHVzKSB7CiAgICAgY2FzZSBDQ0lucHV0SGFuZGxlckNsaWVudDo6 U2Nyb2xsU3RhcnRlZDogewogICAgICAgICBUUkFDRV9FVkVOVF9JTlNUQU5UMCgiY2MiLCAiV2Vi Q29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmhhbmRsZUdlc3R1cmVGbGluZzo6c3RhcnRlZCIp OwotICAgICAgICBPd25QdHI8UGxhdGZvcm1HZXN0dXJlQ3VydmU+IGZsaW5nQ3VydmUgPSBUb3Vj aHBhZEZsaW5nUGxhdGZvcm1HZXN0dXJlQ3VydmU6OmNyZWF0ZShGbG9hdFBvaW50KGdlc3R1cmVF dmVudC5kZWx0YVgsIGdlc3R1cmVFdmVudC5kZWx0YVkpKTsKKyAgICAgICAgT3duUHRyPFBsYXRm b3JtR2VzdHVyZUN1cnZlPiBmbGluZ0N1cnZlID0gVG91Y2hwYWRGbGluZ1BsYXRmb3JtR2VzdHVy ZUN1cnZlOjpjcmVhdGUoRmxvYXRQb2ludChnZXN0dXJlRXZlbnQuZGF0YS5mbGluZ1N0YXJ0LnZl bG9jaXR5WCwgZ2VzdHVyZUV2ZW50LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVkpKTsKICAgICAg ICAgbV93aGVlbEZsaW5nQW5pbWF0aW9uID0gQ0NBY3RpdmVHZXN0dXJlQW5pbWF0aW9uOjpjcmVh dGUoUGxhdGZvcm1HZXN0dXJlVG9DQ0dlc3R1cmVBZGFwdGVyOjpjcmVhdGUoZmxpbmdDdXJ2ZS5y ZWxlYXNlKCkpLCB0aGlzKTsKLSAgICAgICAgbV93aGVlbEZsaW5nUGFyYW1ldGVycy5kZWx0YSA9 IFdlYkZsb2F0UG9pbnQoZ2VzdHVyZUV2ZW50LmRlbHRhWCwgZ2VzdHVyZUV2ZW50LmRlbHRhWSk7 CisgICAgICAgIG1fd2hlZWxGbGluZ1BhcmFtZXRlcnMuZGVsdGEgPSBXZWJGbG9hdFBvaW50KGdl c3R1cmVFdmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYLCBnZXN0dXJlRXZlbnQuZGF0YS5m bGluZ1N0YXJ0LnZlbG9jaXR5WSk7CiAgICAgICAgIG1fd2hlZWxGbGluZ1BhcmFtZXRlcnMucG9p bnQgPSBXZWJQb2ludChnZXN0dXJlRXZlbnQueCwgZ2VzdHVyZUV2ZW50LnkpOwogICAgICAgICBt X3doZWVsRmxpbmdQYXJhbWV0ZXJzLmdsb2JhbFBvaW50ID0gV2ViUG9pbnQoZ2VzdHVyZUV2ZW50 Lmdsb2JhbFgsIGdlc3R1cmVFdmVudC5nbG9iYWxZKTsKICAgICAgICAgbV93aGVlbEZsaW5nUGFy YW1ldGVycy5tb2RpZmllcnMgPSBnZXN0dXJlRXZlbnQubW9kaWZpZXJzOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViSW5wdXRFdmVudENvbnZlcnNpb24uY3BwCmlu ZGV4IDAzOTFjMjg1YjdmOGUzZTY2OTUxNjM5ZDM2NWY1OGJkNzNlOGE5OTIuLmJiNmI1NzM1NTM5 ZWQ3NjJiYzFjNjU5MmZiYmNiNTRiNDQ0YTIyODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYklucHV0RXZlbnRDb252ZXJzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJJbnB1dEV2ZW50Q29udmVyc2lvbi5jcHAKQEAgLTE0OSwxMCAr MTQ5LDE0IEBAIFBsYXRmb3JtR2VzdHVyZUV2ZW50QnVpbGRlcjo6UGxhdGZvcm1HZXN0dXJlRXZl bnRCdWlsZGVyKFdpZGdldCogd2lkZ2V0LCBjb25zdCBXCiAgICAgICAgIGJyZWFrOwogICAgIGNh c2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZToKICAgICAgICAgbV90eXBlID0g UGxhdGZvcm1FdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZTsKKyAgICAgICAgbV9kZWx0YVggPSBl LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWDsKKyAgICAgICAgbV9kZWx0YVkgPSBlLmRhdGEuc2Ny b2xsVXBkYXRlLmRlbHRhWTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50 OjpHZXN0dXJlVGFwOgogICAgICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlVGFw OwotICAgICAgICBtX2FyZWEgPSBJbnRTaXplKGUuYm91bmRpbmdCb3gud2lkdGgsIGUuYm91bmRp bmdCb3guaGVpZ2h0KTsKKyAgICAgICAgbV9hcmVhID0gSW50U2l6ZShlLmRhdGEudGFwLndpZHRo LCBlLmRhdGEudGFwLmhlaWdodCk7CisgICAgICAgIC8vIEZJWE1FOiBQbGF0Zm9ybUdlc3R1cmVF dmVudCBkZWx0YVggaXMgb3ZlcmxvYWRlZCAtIHdrYi51Zy85MzEyMworICAgICAgICBtX2RlbHRh WCA9IHN0YXRpY19jYXN0PGludD4oZS5kYXRhLnRhcC50YXBDb3VudCk7CiAgICAgICAgIGJyZWFr OwogICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZVRhcERvd246CiAgICAgICAgIG1fdHlw ZSA9IFBsYXRmb3JtRXZlbnQ6Okdlc3R1cmVUYXBEb3duOwpAQCAtMTY1LDcgKzE2OSw3IEBAIFBs YXRmb3JtR2VzdHVyZUV2ZW50QnVpbGRlcjo6UGxhdGZvcm1HZXN0dXJlRXZlbnRCdWlsZGVyKFdp ZGdldCogd2lkZ2V0LCBjb25zdCBXCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgV2ViSW5wdXRF dmVudDo6R2VzdHVyZUxvbmdQcmVzczoKICAgICAgICAgbV90eXBlID0gUGxhdGZvcm1FdmVudDo6 R2VzdHVyZUxvbmdQcmVzczsKLSAgICAgICAgbV9hcmVhID0gSW50U2l6ZShlLmJvdW5kaW5nQm94 LndpZHRoLCBlLmJvdW5kaW5nQm94LmhlaWdodCk7CisgICAgICAgIG1fYXJlYSA9IEludFNpemUo ZS5kYXRhLmxvbmdQcmVzcy53aWR0aCwgZS5kYXRhLmxvbmdQcmVzcy5oZWlnaHQpOwogICAgICAg ICBicmVhazsKICAgICBjYXNlIFdlYklucHV0RXZlbnQ6Okdlc3R1cmVQaW5jaEJlZ2luOgogICAg ICAgICBtX3R5cGUgPSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlUGluY2hCZWdpbjsKQEAgLTE3NSwx NCArMTc5LDE0IEBAIFBsYXRmb3JtR2VzdHVyZUV2ZW50QnVpbGRlcjo6UGxhdGZvcm1HZXN0dXJl RXZlbnRCdWlsZGVyKFdpZGdldCogd2lkZ2V0LCBjb25zdCBXCiAgICAgICAgIGJyZWFrOwogICAg IGNhc2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZVBpbmNoVXBkYXRlOgogICAgICAgICBtX3R5cGUg PSBQbGF0Zm9ybUV2ZW50OjpHZXN0dXJlUGluY2hVcGRhdGU7CisgICAgICAgIC8vIEZJWE1FOiBQ bGF0Zm9ybUdlc3R1cmVFdmVudCBkZWx0YVggaXMgb3ZlcmxvYWRlZCAtIHdrYi51Zy85MzEyMwor ICAgICAgICBtX2RlbHRhWCA9IGUuZGF0YS5waW5jaFVwZGF0ZS5zY2FsZTsKICAgICAgICAgYnJl YWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgfQog ICAgIG1fcG9zaXRpb24gPSB3aWRnZXQtPmNvbnZlcnRGcm9tQ29udGFpbmluZ1dpbmRvdyhJbnRQ b2ludChlLngsIGUueSkpOwogICAgIG1fZ2xvYmFsUG9zaXRpb24gPSBJbnRQb2ludChlLmdsb2Jh bFgsIGUuZ2xvYmFsWSk7Ci0gICAgbV9kZWx0YVggPSBlLmRlbHRhWDsKLSAgICBtX2RlbHRhWSA9 IGUuZGVsdGFZOwogICAgIG1fdGltZXN0YW1wID0gZS50aW1lU3RhbXBTZWNvbmRzOwogCiAgICAg bV9tb2RpZmllcnMgPSAwOwpAQCAtNTI2LDggKzUzMCwxMSBAQCBXZWJHZXN0dXJlRXZlbnRCdWls ZGVyOjpXZWJHZXN0dXJlRXZlbnRCdWlsZGVyKGNvbnN0IFdpZGdldCogd2lkZ2V0LCBjb25zdCBH ZXN0dQogICAgICAgICB0eXBlID0gR2VzdHVyZVNjcm9sbEJlZ2luOwogICAgIGVsc2UgaWYgKGV2 ZW50LnR5cGUoKSA9PSBldmVudE5hbWVzKCkuZ2VzdHVyZXNjcm9sbGVuZEV2ZW50KQogICAgICAg ICB0eXBlID0gR2VzdHVyZVNjcm9sbEVuZDsKLSAgICBlbHNlIGlmIChldmVudC50eXBlKCkgPT0g ZXZlbnROYW1lcygpLmdlc3R1cmVzY3JvbGx1cGRhdGVFdmVudCkKKyAgICBlbHNlIGlmIChldmVu dC50eXBlKCkgPT0gZXZlbnROYW1lcygpLmdlc3R1cmVzY3JvbGx1cGRhdGVFdmVudCkgewogICAg ICAgICB0eXBlID0gR2VzdHVyZVNjcm9sbFVwZGF0ZTsKKyAgICAgICAgZGF0YS5zY3JvbGxVcGRh dGUuZGVsdGFYID0gZXZlbnQuZGVsdGFYKCk7CisgICAgICAgIGRhdGEuc2Nyb2xsVXBkYXRlLmRl bHRhWSA9IGV2ZW50LmRlbHRhWSgpOworICAgIH0KIAogICAgIHRpbWVTdGFtcFNlY29uZHMgPSBl dmVudC50aW1lU3RhbXAoKSAvIG1pbGxpc1BlclNlY29uZDsKICAgICBtb2RpZmllcnMgPSBnZXRX ZWJJbnB1dE1vZGlmaWVycyhldmVudCk7CkBAIC01MzYsOSArNTQzLDYgQEAgV2ViR2VzdHVyZUV2 ZW50QnVpbGRlcjo6V2ViR2VzdHVyZUV2ZW50QnVpbGRlcihjb25zdCBXaWRnZXQqIHdpZGdldCwg Y29uc3QgR2VzdHUKICAgICBnbG9iYWxZID0gZXZlbnQuc2NyZWVuWSgpOwogICAgIHggPSBldmVu dC5hYnNvbHV0ZUxvY2F0aW9uKCkueCgpIC0gd2lkZ2V0LT5sb2NhdGlvbigpLngoKTsKICAgICB5 ID0gZXZlbnQuYWJzb2x1dGVMb2NhdGlvbigpLnkoKSAtIHdpZGdldC0+bG9jYXRpb24oKS55KCk7 Ci0KLSAgICBkZWx0YVggPSBldmVudC5kZWx0YVgoKTsKLSAgICBkZWx0YVkgPSBldmVudC5kZWx0 YVkoKTsKIH0KICNlbmRpZiAvLyBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBhYjhjMzZjNjZhODhjNzFhNWJi YTJjYjE1Mzc5MjM5ZjA0NTUzMTY1Li4wMWEzN2U0NTNhZjE4NWU2ZTNmN2ZkOWJmYTRlMzAxZThh N2VlMDA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBA IC02OTMsNyArNjkzLDcgQEAgYm9vbCBXZWJWaWV3SW1wbDo6aGFuZGxlR2VzdHVyZUV2ZW50KGNv bnN0IFdlYkdlc3R1cmVFdmVudCYgZXZlbnQpCiAgICAgICAgIG1fbGFzdFdoZWVsR2xvYmFsUG9z aXRpb24gPSBXZWJQb2ludChldmVudC5nbG9iYWxYLCBldmVudC5nbG9iYWxZKTsKICAgICAgICAg bV9mbGluZ01vZGlmaWVyID0gZXZlbnQubW9kaWZpZXJzOwogICAgICAgICAvLyBGSVhNRTogTWFr ZSB0aGUgY3VydmUgcGFyYW1ldHJpemFibGUgZnJvbSB0aGUgYnJvd3Nlci4KLSAgICAgICAgbV9n ZXN0dXJlQW5pbWF0aW9uID0gQWN0aXZlUGxhdGZvcm1HZXN0dXJlQW5pbWF0aW9uOjpjcmVhdGUo VG91Y2hwYWRGbGluZ1BsYXRmb3JtR2VzdHVyZUN1cnZlOjpjcmVhdGUoRmxvYXRQb2ludChldmVu dC5kZWx0YVgsIGV2ZW50LmRlbHRhWSkpLCB0aGlzKTsKKyAgICAgICAgbV9nZXN0dXJlQW5pbWF0 aW9uID0gQWN0aXZlUGxhdGZvcm1HZXN0dXJlQW5pbWF0aW9uOjpjcmVhdGUoVG91Y2hwYWRGbGlu Z1BsYXRmb3JtR2VzdHVyZUN1cnZlOjpjcmVhdGUoRmxvYXRQb2ludChldmVudC5kYXRhLmZsaW5n U3RhcnQudmVsb2NpdHlYLCBldmVudC5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZKSksIHRoaXMp OwogICAgICAgICBzY2hlZHVsZUFuaW1hdGlvbigpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dlYkNvbXBvc2l0 b3JJbnB1dEhhbmRsZXJJbXBsVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdC5jcHAKaW5kZXggODMxM2IwZjViOGJm YzdkZWRmODRlZWQ1ZDIxZjcwM2U5ZjZlZGU2ZC4uODJlM2I1NDZhNTM3NzNmYzYwYzFmMzJjNWVl YTlhYmU1MDQ0ZWFhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9X ZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LmNwcApAQCAt MjAwLDE0ICsyMDAsMTQgQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVz dCwgZ2VzdHVyZVNjcm9sbFN0YXJ0ZWQpCiAgICAgVkVSSUZZX0FORF9SRVNFVF9NT0NLUygpOwog CiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZTsK LSAgICBnZXN0dXJlLmRlbHRhWSA9IC00MDsgLy8gLVkgbWVhbnMgc2Nyb2xsIGRvd24gLSBpLmUu IGluIHRoZSArWSBkaXJlY3Rpb24uCisgICAgZ2VzdHVyZS5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0 YVkgPSAtNDA7IC8vIC1ZIG1lYW5zIHNjcm9sbCBkb3duIC0gaS5lLiBpbiB0aGUgK1kgZGlyZWN0 aW9uLgogICAgIEVYUEVDVF9DQUxMKG1fbW9ja0NDSW5wdXRIYW5kbGVyQ2xpZW50LCBzY3JvbGxC eSh0ZXN0aW5nOjpfLCB0ZXN0aW5nOjpQcm9wZXJ0eSgmV2ViQ29yZTo6SW50U2l6ZTo6aGVpZ2h0 LCB0ZXN0aW5nOjpHdCgwKSkpKTsKICAgICBtX2lucHV0SGFuZGxlci0+aGFuZGxlSW5wdXRFdmVu dChnZXN0dXJlKTsKIAogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIGdlc3R1 cmUudHlwZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxFbmQ7Ci0gICAgZ2VzdHVyZS5k ZWx0YVkgPSAwOworICAgIGdlc3R1cmUuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZID0gMDsKICAg ICBFWFBFQ1RfQ0FMTChtX21vY2tDQ0lucHV0SGFuZGxlckNsaWVudCwgc2Nyb2xsRW5kKCkpOwog ICAgIG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogfQpAQCAtMjI3 LDEzICsyMjcsMTMgQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwg Z2VzdHVyZVNjcm9sbE9uTWFpblRocmVhZCkKICAgICBWRVJJRllfQU5EX1JFU0VUX01PQ0tTKCk7 CiAKICAgICBnZXN0dXJlLnR5cGUgPSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xsVXBkYXRl OwotICAgIGdlc3R1cmUuZGVsdGFZID0gNDA7CisgICAgZ2VzdHVyZS5kYXRhLnNjcm9sbFVwZGF0 ZS5kZWx0YVkgPSA0MDsKICAgICBtX2lucHV0SGFuZGxlci0+aGFuZGxlSW5wdXRFdmVudChnZXN0 dXJlKTsKIAogICAgIFZFUklGWV9BTkRfUkVTRVRfTU9DS1MoKTsKIAogICAgIGdlc3R1cmUudHlw ZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxFbmQ7Ci0gICAgZ2VzdHVyZS5kZWx0YVkg PSAwOworICAgIGdlc3R1cmUuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZID0gMDsKICAgICBtX2lu cHV0SGFuZGxlci0+aGFuZGxlSW5wdXRFdmVudChnZXN0dXJlKTsKIH0KIApAQCAtMjY2LDcgKzI2 Niw3IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVQ aW5jaCkKICAgICBWRVJJRllfQU5EX1JFU0VUX01PQ0tTKCk7CiAKICAgICBnZXN0dXJlLnR5cGUg PSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlUGluY2hVcGRhdGU7Ci0gICAgZ2VzdHVyZS5kZWx0YVgg PSAxLjU7CisgICAgZ2VzdHVyZS5kYXRhLnBpbmNoVXBkYXRlLnNjYWxlID0gMS41OwogICAgIGdl c3R1cmUueCA9IDc7CiAgICAgZ2VzdHVyZS55ID0gMTM7CiAgICAgRVhQRUNUX0NBTEwobV9tb2Nr Q0NJbnB1dEhhbmRsZXJDbGllbnQsIHBpbmNoR2VzdHVyZVVwZGF0ZSgxLjUsIFdlYkNvcmU6Oklu dFBvaW50KDcsIDEzKSkpOwpAQCAtMjc1LDcgKzI3NSw3IEBAIFRFU1RfRihXZWJDb21wb3NpdG9y SW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVQaW5jaCkKICAgICBWRVJJRllfQU5EX1JFU0VU X01PQ0tTKCk7CiAKICAgICBnZXN0dXJlLnR5cGUgPSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlUGlu Y2hVcGRhdGU7Ci0gICAgZ2VzdHVyZS5kZWx0YVggPSAwLjU7CisgICAgZ2VzdHVyZS5kYXRhLnBp bmNoVXBkYXRlLnNjYWxlID0gMC41OwogICAgIGdlc3R1cmUueCA9IDk7CiAgICAgZ2VzdHVyZS55 ID0gNjsKICAgICBFWFBFQ1RfQ0FMTChtX21vY2tDQ0lucHV0SGFuZGxlckNsaWVudCwgcGluY2hH ZXN0dXJlVXBkYXRlKC41LCBXZWJDb3JlOjpJbnRQb2ludCg5LCA2KSkpOwpAQCAtMjk4LDcgKzI5 OCw3IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVG bGluZ1N0YXJ0ZWQpCiAgICAgICAgIC5XaWxsT25jZSh0ZXN0aW5nOjpSZXR1cm4oV2ViQ29yZTo6 Q0NJbnB1dEhhbmRsZXJDbGllbnQ6OlNjcm9sbFN0YXJ0ZWQpKTsKIAogICAgIGdlc3R1cmUudHlw ZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVGbGluZ1N0YXJ0OwotICAgIGdlc3R1cmUuZGVsdGFY ID0gMTA7CisgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQudmVsb2NpdHlYID0gMTA7CiAgICAg RVhQRUNUX0NBTEwobV9tb2NrQ0NJbnB1dEhhbmRsZXJDbGllbnQsIHNjaGVkdWxlQW5pbWF0aW9u KCkpOwogICAgIG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwogCkBA IC0zNTksOCArMzU5LDggQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVz dCwgZ2VzdHVyZUZsaW5nQW5pbWF0ZXMpCiAgICAgV2ViUG9pbnQgZmxpbmdQb2ludCA9IFdlYlBv aW50KDcsIDEzKTsKICAgICBXZWJQb2ludCBmbGluZ0dsb2JhbFBvaW50ID0gV2ViUG9pbnQoMTcs IDIzKTsKICAgICBpbnQgbW9kaWZpZXJzID0gNzsKLSAgICBnZXN0dXJlLmRlbHRhWCA9IGZsaW5n RGVsdGEueDsKLSAgICBnZXN0dXJlLmRlbHRhWSA9IGZsaW5nRGVsdGEueTsKKyAgICBnZXN0dXJl LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVggPSBmbGluZ0RlbHRhLng7CisgICAgZ2VzdHVyZS5k YXRhLmZsaW5nU3RhcnQudmVsb2NpdHlZID0gZmxpbmdEZWx0YS55OwogICAgIGdlc3R1cmUueCA9 IGZsaW5nUG9pbnQueDsKICAgICBnZXN0dXJlLnkgPSBmbGluZ1BvaW50Lnk7CiAgICAgZ2VzdHVy ZS5nbG9iYWxYID0gZmxpbmdHbG9iYWxQb2ludC54OwpAQCAtNDQzLDggKzQ0Myw4IEBAIFRFU1Rf RihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVGbGluZ1RyYW5zZmVy UmVzZXRzKQogICAgIFdlYlBvaW50IGZsaW5nUG9pbnQgPSBXZWJQb2ludCg3LCAxMyk7CiAgICAg V2ViUG9pbnQgZmxpbmdHbG9iYWxQb2ludCA9IFdlYlBvaW50KDE3LCAyMyk7CiAgICAgaW50IG1v ZGlmaWVycyA9IDE7Ci0gICAgZ2VzdHVyZS5kZWx0YVggPSBmbGluZ0RlbHRhLng7Ci0gICAgZ2Vz dHVyZS5kZWx0YVkgPSBmbGluZ0RlbHRhLnk7CisgICAgZ2VzdHVyZS5kYXRhLmZsaW5nU3RhcnQu dmVsb2NpdHlYID0gZmxpbmdEZWx0YS54OworICAgIGdlc3R1cmUuZGF0YS5mbGluZ1N0YXJ0LnZl bG9jaXR5WSA9IGZsaW5nRGVsdGEueTsKICAgICBnZXN0dXJlLnggPSBmbGluZ1BvaW50Lng7CiAg ICAgZ2VzdHVyZS55ID0gZmxpbmdQb2ludC55OwogICAgIGdlc3R1cmUuZ2xvYmFsWCA9IGZsaW5n R2xvYmFsUG9pbnQueDsKQEAgLTUyMiw4ICs1MjIsOCBAQCBURVNUX0YoV2ViQ29tcG9zaXRvcklu cHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlRmxpbmdUcmFuc2ZlclJlc2V0cykKICAgICBmbGlu Z1BvaW50ID0gV2ViUG9pbnQoOTUsIDg3KTsKICAgICBmbGluZ0dsb2JhbFBvaW50ID0gV2ViUG9p bnQoMzIsIDcxKTsKICAgICBtb2RpZmllcnMgPSAyOwotICAgIGdlc3R1cmUuZGVsdGFYID0gZmxp bmdEZWx0YS54OwotICAgIGdlc3R1cmUuZGVsdGFZID0gZmxpbmdEZWx0YS55OworICAgIGdlc3R1 cmUuZGF0YS5mbGluZ1N0YXJ0LnZlbG9jaXR5WCA9IGZsaW5nRGVsdGEueDsKKyAgICBnZXN0dXJl LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVkgPSBmbGluZ0RlbHRhLnk7CiAgICAgZ2VzdHVyZS54 ID0gZmxpbmdQb2ludC54OwogICAgIGdlc3R1cmUueSA9IGZsaW5nUG9pbnQueTsKICAgICBnZXN0 dXJlLmdsb2JhbFggPSBmbGluZ0dsb2JhbFBvaW50Lng7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjU0NjVhY2QwODA1YWU0ZTFlYmFiMWI1YzIy ODc2MmE1ZDcwZDRhMi4uYTgyNGIxM2IyZGFhOWJjMGExYjkyMjlhYjhkOWEwMTU4YzNjY2I0OSAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDEyLTA4LTMwICBSaWNrIEJ5ZXJzICA8cmJ5ZXJzQGNocm9taXVtLm9yZz4K KworICAgICAgICBVcGRhdGUgY2hyb21pdW0gRHVtcFJlbmRlclRyZWUgZm9yIG5ldyBXZWJHZXN0 dXJlRXZlbnQgZmllbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05NTU3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFVwZGF0ZSBFdmVudFNlbmRlciB0byB3cml0ZSBnZXN0dXJlIGRldGFpbHMgaW50byB0 aGUgYXBwcm9wcmlhdGUKKyAgICAgICAgdHlwZS1zcGVjaWZpYyBXZWJHZXN0dXJlRXZlbnQgZmll bGRzLgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rlc3RSdW5uZXIvRXZlbnRT ZW5kZXIuY3BwOgorICAgICAgICAoRXZlbnRTZW5kZXI6Omdlc3R1cmVFdmVudCk6CisgICAgICAg IChFdmVudFNlbmRlcjo6Z2VzdHVyZUZsaW5nU3RhcnQpOgorCiAyMDEyLTA5LTA0ICBYaWFuemh1 IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtLUFu ZHJvaWRdIEluY2x1ZGUgZGV2aWNlIHNlcmlhbCBudW1iZXIgaW4gQ2hyb21pdW1BbmRyb2lkRHJp dmVyIGxvZyBtZXNzYWdlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vVGVzdFJ1bm5lci9FdmVudFNlbmRlci5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9UZXN0UnVubmVyL0V2ZW50U2VuZGVyLmNwcAppbmRleCBjYWZhY2E5YWNkN2NkODY0ZDcz OTRmZTc1MjY0MTdjNDc0YTI5N2QyLi5kNWVhYWM0YWRhMWRkZTU5NmMwOGE4NjBkOTM1YWYyMmU2 YmI5ZWZjIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9UZXN0UnVu bmVyL0V2ZW50U2VuZGVyLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9U ZXN0UnVubmVyL0V2ZW50U2VuZGVyLmNwcApAQCAtMTE1MywxMiArMTE1MywxMiBAQCB2b2lkIEV2 ZW50U2VuZGVyOjpnZXN0dXJlRXZlbnQoV2ViSW5wdXRFdmVudDo6VHlwZSB0eXBlLCBjb25zdCBD cHBBcmd1bWVudExpc3QmCiAKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIFdlYklucHV0 RXZlbnQ6Okdlc3R1cmVTY3JvbGxVcGRhdGU6Ci0gICAgICAgIGV2ZW50LmRlbHRhWCA9IHN0YXRp Y19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMF0udG9Eb3VibGUoKSk7Ci0gICAgICAgIGV2ZW50LmRl bHRhWSA9IHN0YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMV0udG9Eb3VibGUoKSk7CisgICAg ICAgIGV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWCA9IHN0YXRpY19jYXN0PGZsb2F0Pihh cmd1bWVudHNbMF0udG9Eb3VibGUoKSk7CisgICAgICAgIGV2ZW50LmRhdGEuc2Nyb2xsVXBkYXRl LmRlbHRhWSA9IHN0YXRpY19jYXN0PGZsb2F0Pihhcmd1bWVudHNbMV0udG9Eb3VibGUoKSk7CiAg ICAgICAgIGV2ZW50LnggPSBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueDsKICAgICAgICAgZXZl bnQueSA9IG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi55OwotICAgICAgICBtX2N1cnJlbnRHZXN0 dXJlTG9jYXRpb24ueCA9IG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi54ICsgZXZlbnQuZGVsdGFY OwotICAgICAgICBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueSA9IG1fY3VycmVudEdlc3R1cmVM b2NhdGlvbi55ICsgZXZlbnQuZGVsdGFZOworICAgICAgICBtX2N1cnJlbnRHZXN0dXJlTG9jYXRp b24ueCA9IG1fY3VycmVudEdlc3R1cmVMb2NhdGlvbi54ICsgZXZlbnQuZGF0YS5zY3JvbGxVcGRh dGUuZGVsdGFYOworICAgICAgICBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueSA9IG1fY3VycmVu dEdlc3R1cmVMb2NhdGlvbi55ICsgZXZlbnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZOwogICAg ICAgICBicmVhazsKIAogICAgIGNhc2UgV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbEJlZ2lu OgpAQCAtMTE2NywxNiArMTE2NywxNCBAQCB2b2lkIEV2ZW50U2VuZGVyOjpnZXN0dXJlRXZlbnQo V2ViSW5wdXRFdmVudDo6VHlwZSB0eXBlLCBjb25zdCBDcHBBcmd1bWVudExpc3QmCiAgICAgICAg IGV2ZW50LnkgPSBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueTsKICAgICAgICAgYnJlYWs7CiAg ICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xsRW5kOgotICAgICAgICBldmVudC5k ZWx0YVggPSBzdGF0aWNfY2FzdDxmbG9hdD4oYXJndW1lbnRzWzBdLnRvRG91YmxlKCkpOwotICAg ICAgICBldmVudC5kZWx0YVkgPSBzdGF0aWNfY2FzdDxmbG9hdD4oYXJndW1lbnRzWzFdLnRvRG91 YmxlKCkpOwogICAgICAgICBldmVudC54ID0gbV9jdXJyZW50R2VzdHVyZUxvY2F0aW9uLng7CiAg ICAgICAgIGV2ZW50LnkgPSBtX2N1cnJlbnRHZXN0dXJlTG9jYXRpb24ueTsKICAgICAgICAgYnJl YWs7CiAgICAgY2FzZSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlVGFwOgotICAgICAgICBpZiAoYXJn dW1lbnRzLnNpemUoKSA+PSAzKSB7Ci0gICAgICAgICAgICAvLyBUYXAgY291bnQuCi0gICAgICAg ICAgICBldmVudC5kZWx0YVggPSBzdGF0aWNfY2FzdDxmbG9hdD4oYXJndW1lbnRzWzJdLnRvRG91 YmxlKCkpOwotICAgICAgICB9CisgICAgICAgIGlmIChhcmd1bWVudHMuc2l6ZSgpID49IDMpCisg ICAgICAgICAgICBldmVudC5kYXRhLnRhcC50YXBDb3VudCA9IHN0YXRpY19jYXN0PGZsb2F0Pihh cmd1bWVudHNbMl0udG9Eb3VibGUoKSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICBldmVudC5k YXRhLnRhcC50YXBDb3VudCA9IDE7CiAgICAgICAgIGV2ZW50LnggPSBwb2ludC54OwogICAgICAg ICBldmVudC55ID0gcG9pbnQueTsKICAgICAgICAgYnJlYWs7CkBAIC0xMjMyLDggKzEyMzAsOCBA QCB2b2lkIEV2ZW50U2VuZGVyOjpnZXN0dXJlRmxpbmdTdGFydChjb25zdCBDcHBBcmd1bWVudExp c3QmIGFyZ3VtZW50cywgQ3BwVmFyaWFudAogICAgIGV2ZW50Lmdsb2JhbFggPSBldmVudC54Owog ICAgIGV2ZW50Lmdsb2JhbFkgPSBldmVudC55OwogCi0gICAgZXZlbnQuZGVsdGFYID0gc3RhdGlj X2Nhc3Q8ZmxvYXQ+KGFyZ3VtZW50c1syXS50b0RvdWJsZSgpKTsKLSAgICBldmVudC5kZWx0YVkg PSBzdGF0aWNfY2FzdDxmbG9hdD4oYXJndW1lbnRzWzNdLnRvRG91YmxlKCkpOworICAgIGV2ZW50 LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVggPSBzdGF0aWNfY2FzdDxmbG9hdD4oYXJndW1lbnRz WzJdLnRvRG91YmxlKCkpOworICAgIGV2ZW50LmRhdGEuZmxpbmdTdGFydC52ZWxvY2l0eVkgPSBz dGF0aWNfY2FzdDxmbG9hdD4oYXJndW1lbnRzWzNdLnRvRG91YmxlKCkpOwogICAgIGV2ZW50LnRp bWVTdGFtcFNlY29uZHMgPSBnZXRDdXJyZW50RXZlbnRUaW1lU2VjKCk7CiAgICAgd2Vidmlldygp LT5oYW5kbGVJbnB1dEV2ZW50KGV2ZW50KTsKIH0K