111465 2013-03-05 12:39:12 -0800 [chromium] Scroll deltas should be floats 2013-03-05 17:32:00 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aelias aelias abarth aelias dglazkov fishd jamesr rjkroege tkent+wkapi webkit.review.bot oldest_to_newest 847925 0 aelias 2013-03-05 12:39:12 -0800 [chromium] Scroll deltas should be floats 847936 1 191540 aelias 2013-03-05 12:44:20 -0800 Created attachment 191540 Patch 847944 2 webkit.review.bot 2013-03-05 12:49:17 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 847949 3 aelias 2013-03-05 12:52:31 -0800 Hi James, this is something we had put off due to WebKit roll pain. I wrangled the API so that the roll should be clean if the WebKit side lands first. 848303 4 191540 webkit.review.bot 2013-03-05 17:31:56 -0800 Comment on attachment 191540 Patch Clearing flags on attachment: 191540 Committed r144856: <http://trac.webkit.org/changeset/144856> 848304 5 webkit.review.bot 2013-03-05 17:32:00 -0800 All reviewed patches have been landed. Closing bug. 191540 2013-03-05 12:44:20 -0800 2013-03-05 17:31:56 -0800 Patch bug-111465-20130305124026.patch text/plain 23024 aelias U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCBhNzc5YmFkYmFmZjAz YWIxNjc2YjdiNjA5ODE1MDFmMzVjMjkyY2ZhLi5hMWYzODA2NzYxOGRhOTZiNTk1YzNiMjFmNjUx Y2YzYWYwMmM1NzcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMy0wMy0wNSAg QWxleGFuZHJlIEVsaWFzICA8YWVsaWFzQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21p dW1dIFNjcm9sbCBkZWx0YXMgc2hvdWxkIGJlIGZsb2F0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNDY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjb252ZXJ0cyB0aGUgcmVtYWluaW5nIHNj cm9sbCBkZWx0YSBmaWVsZHMgdG8gZmxvYXRzIHNvIHRoYXQKKyAgICAgICAgd2Ugbm8gbG9uZ2Vy IGxvc2UgcHJlY2lzaW9uIGR1ZSB0byBESVAgY29udmVyc2lvbi4gVGhlIG5hdHVyYWwKKyAgICAg ICAgdHlwZSBmb3IgZGVsdGFzIGlzIFdlYkZsb2F0U2l6ZSwgd2hpY2ggd2FzIG1pc3NpbmcsIHNv IEkgYWxzbyBjcmVhdGVkCisgICAgICAgIHRoYXQgdHlwZSBiYXNlZCBvbiB0aGUgZXhpc3Rpbmcg V2ViU2l6ZSBoZWFkZXIuCisKKyAgICAgICAgKiBQbGF0Zm9ybS5neXBpOgorICAgICAgICAqIGNo cm9taXVtL3B1YmxpYy9XZWJGbG9hdFNpemUuaDogQWRkZWQuCisgICAgICAgIChXZWJLaXQpOgor ICAgICAgICAoV2ViRmxvYXRTaXplKToKKyAgICAgICAgKFdlYktpdDo6V2ViRmxvYXRTaXplOjpp c0VtcHR5KToKKyAgICAgICAgKFdlYktpdDo6V2ViRmxvYXRTaXplOjpXZWJGbG9hdFNpemUpOgor ICAgICAgICAoV2ViS2l0OjpXZWJGbG9hdFNpemU6Om9wZXJhdG9yPSk6CisgICAgICAgIChXZWJL aXQ6OldlYkZsb2F0U2l6ZTo6b3BlcmF0b3IgV2ViQ29yZTo6RmxvYXRTaXplKToKKyAgICAgICAg KFdlYktpdDo6V2ViRmxvYXRTaXplOjpvcGVyYXRvciBnZng6OlNpemVGKToKKyAgICAgICAgKFdl YktpdDo6V2ViRmxvYXRTaXplOjpvcGVyYXRvciBnZng6OlZlY3RvcjJkRik6CisgICAgICAgIChX ZWJLaXQ6Om9wZXJhdG9yPT0pOgorICAgICAgICAoV2ViS2l0OjpvcGVyYXRvciE9KToKKyAgICAg ICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViR2VzdHVyZUN1cnZlVGFyZ2V0Lmg6CisgICAgICAgIChX ZWJLaXQ6OldlYkdlc3R1cmVDdXJ2ZVRhcmdldDo6c2Nyb2xsQnkpOgorICAgICAgICAoV2ViR2Vz dHVyZUN1cnZlVGFyZ2V0KToKKyAgICAgICAgKiBjaHJvbWl1bS9wdWJsaWMvV2ViSW5wdXRIYW5k bGVyQ2xpZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYklucHV0SGFuZGxlckNsaWVudDo6c2Ny b2xsQnlJZlBvc3NpYmxlKToKKyAgICAgICAgKFdlYklucHV0SGFuZGxlckNsaWVudCk6CisKIDIw MTMtMDItMjYgIFpoZW55YW8gTW8gIDx6bW9AZ29vZ2xlLmNvbT4KIAogICAgICAgICBFWFRfZHJh d19idWZmZXJzIG5lZWRzIGltcGxlbWVudGF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmlu ZGV4IGZiZTNlMDEyMzA5MTE4YzY2NDgxNzY4NjdjMWQwNzI0ZmM2NTIwYmMuLjI0MjkxN2VlNjVl NjFkZDBlZDUyMGNmYjkzYzQ5NDIzNjc1Njc0MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjkgQEAKKzIwMTMtMDMtMDUgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBTY3JvbGwgZGVsdGFzIHNob3VsZCBi ZSBmbG9hdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTExMTQ2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgY29udmVydHMgdGhlIHJlbWFpbmluZyBzY3JvbGwgZGVsdGEgZmllbGRzIHRvIGZsb2F0 cyBzbyB0aGF0CisgICAgICAgIHdlIG5vIGxvbmdlciBsb3NlIHByZWNpc2lvbiBkdWUgdG8gRElQ IGNvbnZlcnNpb24uIFRoZSBuYXR1cmFsCisgICAgICAgIHR5cGUgZm9yIGRlbHRhcyBpcyBXZWJG bG9hdFNpemUsIHdoaWNoIHdhcyBtaXNzaW5nLCBzbyBJIGFsc28gY3JlYXRlZAorICAgICAgICB0 aGF0IHR5cGUgYmFzZWQgb24gdGhlIGV4aXN0aW5nIFdlYlNpemUgaGVhZGVyLgorCisgICAgICAg ICogc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsLmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OmhhbmRsZUlucHV0RXZlbnRJbnRlcm5h bCk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjp0b3Vj aHBhZEZsaW5nU2Nyb2xsKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29tcG9zaXRvcklucHV0SGFu ZGxlckltcGw6OnNjcm9sbEJ5KToKKyAgICAgICAgKiBzcmMvV2ViQ29tcG9zaXRvcklucHV0SGFu ZGxlckltcGwuaDoKKyAgICAgICAgKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsKToKKyAg ICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1w bDo6c2Nyb2xsQnkpOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5oOgorICAgICAgICAoV2Vi Vmlld0ltcGwpOgorICAgICAgICAqIHRlc3RzL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBs VGVzdC5jcHA6CisgICAgICAgIChNb2NrV2ViSW5wdXRIYW5kbGVyQ2xpZW50KToKKyAgICAgICAg KFdlYktpdDo6VEVTVF9GKToKKwogMjAxMy0wMy0wNCAgQW5kcmV5IEx1c2huaWtvdiAgPGx1c2hu aWtvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIEFjZSBlZGl0 b3IgZXhwZXJpbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1BsYXRmb3JtL1BsYXRmb3JtLmd5cGkg Yi9Tb3VyY2UvUGxhdGZvcm0vUGxhdGZvcm0uZ3lwaQppbmRleCAzMzQ0NDliZGI3NTU0N2Y1ZjJi NDg0ZmUzYjlkZjE1NzBjMjdlZGQ1Li44ZmYxMTI3ZTM4ZTk3YTkwYTcwYjE0OTA1Y2MyYzY1NjJj ODEyYTUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vUGxhdGZvcm0uZ3lwaQorKysgYi9T b3VyY2UvUGxhdGZvcm0vUGxhdGZvcm0uZ3lwaQpAQCAtNjUsNiArNjUsNyBAQAogICAgICAgICAg ICAgJ2Nocm9taXVtL3B1YmxpYy9XZWJGbG9hdEtleWZyYW1lLmgnLAogICAgICAgICAgICAgJ2No cm9taXVtL3B1YmxpYy9XZWJGbG9hdFBvaW50LmgnLAogICAgICAgICAgICAgJ2Nocm9taXVtL3B1 YmxpYy9XZWJGbG9hdFF1YWQuaCcsCisgICAgICAgICAgICAnY2hyb21pdW0vcHVibGljL1dlYkZs b2F0U2l6ZS5oJywKICAgICAgICAgICAgICdjaHJvbWl1bS9wdWJsaWMvV2ViRmxvYXRSZWN0Lmgn LAogICAgICAgICAgICAgJ2Nocm9taXVtL3B1YmxpYy9XZWJHYW1lcGFkLmgnLAogICAgICAgICAg ICAgJ2Nocm9taXVtL3B1YmxpYy9XZWJHYW1lcGFkcy5oJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9Q bGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViRmxvYXRTaXplLmggYi9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1dlYkZsb2F0U2l6ZS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjVkZTk0OTUwMmE2ZWE5 ODg5ZDFjMTk4Njg3YWFkYmM1YTYyZTMxMmIKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvUGxh dGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkZsb2F0U2l6ZS5oCkBAIC0wLDAgKzEsMTMzIEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDEzIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu CisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMgYXJlCisgKiBtZXQ6CisgKgorICogICAg ICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyAqICAgICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUKKyAqIGNvcHlyaWdodCBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIKKyAqIGluIHRoZSBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUKKyAq IGRpc3RyaWJ1dGlvbi4KKyAqICAgICAqIE5laXRoZXIgdGhlIG5hbWUgb2YgR29vZ2xlIEluYy4g bm9yIHRoZSBuYW1lcyBvZiBpdHMKKyAqIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRv cnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCisgKiB0aGlzIHNvZnR3YXJlIHdp dGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNzaW9uLgorICoKKyAqIFRISVMgU09G VFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRP UlMKKyAqICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UCisgKiBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9G IE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NF IEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hUCisgKiBPV05F UiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5D SURFTlRBTCwKKyAqIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VT IChJTkNMVURJTkcsIEJVVCBOT1QKKyAqIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNU SVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAorICogREFUQSwgT1IgUFJPRklU UzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZCisg KiBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklM SVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklT SU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2lm bmRlZiBXZWJGbG9hdFNpemVfaAorI2RlZmluZSBXZWJGbG9hdFNpemVfaAorCisjaW5jbHVkZSAi V2ViQ29tbW9uLmgiCisKKyNpZiBXRUJLSVRfSU1QTEVNRU5UQVRJT04KKyNpbmNsdWRlICJGbG9h dFNpemUuaCIKKyNlbHNlCisjaW5jbHVkZSA8Y21hdGg+CisjaW5jbHVkZSA8dWkvZ2Z4L3NpemVf Zi5oPgorI2luY2x1ZGUgPHVpL2dmeC92ZWN0b3IyZF9mLmg+CisjZW5kaWYKKworbmFtZXNwYWNl IFdlYktpdCB7CisKK3N0cnVjdCBXZWJGbG9hdFNpemUgeworICAgIGZsb2F0IHdpZHRoOworICAg IGZsb2F0IGhlaWdodDsKKworICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIHdpZHRo IDw9IDAgfHwgaGVpZ2h0IDw9IDA7IH0KKworICAgIFdlYkZsb2F0U2l6ZSgpCisgICAgICAgIDog d2lkdGgoMCkKKyAgICAgICAgLCBoZWlnaHQoMCkKKyAgICB7CisgICAgfQorCisgICAgV2ViRmxv YXRTaXplKGZsb2F0IHdpZHRoLCBmbG9hdCBoZWlnaHQpCisgICAgICAgIDogd2lkdGgod2lkdGgp CisgICAgICAgICwgaGVpZ2h0KGhlaWdodCkKKyAgICB7CisgICAgfQorCisjaWYgV0VCS0lUX0lN UExFTUVOVEFUSU9OCisgICAgV2ViRmxvYXRTaXplKGNvbnN0IFdlYkNvcmU6OkZsb2F0U2l6ZSYg cykKKyAgICAgICAgOiB3aWR0aChzLndpZHRoKCkpCisgICAgICAgICwgaGVpZ2h0KHMuaGVpZ2h0 KCkpCisgICAgeworICAgIH0KKworICAgIFdlYkZsb2F0U2l6ZSYgb3BlcmF0b3I9KGNvbnN0IFdl YkNvcmU6OkZsb2F0U2l6ZSYgcykKKyAgICB7CisgICAgICAgIHdpZHRoID0gcy53aWR0aCgpOwor ICAgICAgICBoZWlnaHQgPSBzLmhlaWdodCgpOworICAgICAgICByZXR1cm4gKnRoaXM7CisgICAg fQorCisgICAgb3BlcmF0b3IgV2ViQ29yZTo6RmxvYXRTaXplKCkgY29uc3QKKyAgICB7CisgICAg ICAgIHJldHVybiBXZWJDb3JlOjpGbG9hdFNpemUod2lkdGgsIGhlaWdodCk7CisgICAgfQorI2Vs c2UKKyAgICBXZWJGbG9hdFNpemUoY29uc3QgZ2Z4OjpTaXplRiYgcykKKyAgICAgICAgOiB3aWR0 aChzLndpZHRoKCkpCisgICAgICAgICwgaGVpZ2h0KHMuaGVpZ2h0KCkpCisgICAgeworICAgIH0K KworICAgIFdlYkZsb2F0U2l6ZShjb25zdCBnZng6OlZlY3RvcjJkRiYgdikKKyAgICAgICAgOiB3 aWR0aCh2LngoKSkKKyAgICAgICAgLCBoZWlnaHQodi55KCkpCisgICAgeworICAgIH0KKworICAg IFdlYkZsb2F0U2l6ZSYgb3BlcmF0b3I9KGNvbnN0IGdmeDo6U2l6ZUYmIHMpCisgICAgeworICAg ICAgICB3aWR0aCA9IHMud2lkdGgoKTsKKyAgICAgICAgaGVpZ2h0ID0gcy5oZWlnaHQoKTsKKyAg ICAgICAgcmV0dXJuICp0aGlzOworICAgIH0KKworICAgIFdlYkZsb2F0U2l6ZSYgb3BlcmF0b3I9 KGNvbnN0IGdmeDo6VmVjdG9yMmRGJiB2KQorICAgIHsKKyAgICAgICAgd2lkdGggPSB2LngoKTsK KyAgICAgICAgaGVpZ2h0ID0gdi55KCk7CisgICAgICAgIHJldHVybiAqdGhpczsKKyAgICB9CisK KyAgICBvcGVyYXRvciBnZng6OlNpemVGKCkgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiBn Zng6OlNpemVGKHN0ZDo6bWF4KDAuZiwgd2lkdGgpLCBzdGQ6Om1heCgwLmYsIGhlaWdodCkpOwor ICAgIH0KKworICAgIG9wZXJhdG9yIGdmeDo6VmVjdG9yMmRGKCkgY29uc3QKKyAgICB7CisgICAg ICAgIHJldHVybiBnZng6OlZlY3RvcjJkRih3aWR0aCwgaGVpZ2h0KTsKKyAgICB9CisjZW5kaWYK K307CisKK2lubGluZSBib29sIG9wZXJhdG9yPT0oY29uc3QgV2ViRmxvYXRTaXplJiBhLCBjb25z dCBXZWJGbG9hdFNpemUmIGIpCit7CisgICAgcmV0dXJuIGEud2lkdGggPT0gYi53aWR0aCAmJiBh LmhlaWdodCA9PSBiLmhlaWdodDsKK30KKworaW5saW5lIGJvb2wgb3BlcmF0b3IhPShjb25zdCBX ZWJGbG9hdFNpemUmIGEsIGNvbnN0IFdlYkZsb2F0U2l6ZSYgYikKK3sKKyAgICByZXR1cm4gIShh ID09IGIpOworfQorCit9IC8vIG5hbWVzcGFjZSBXZWJLaXQKKworI2VuZGlmCmRpZmYgLS1naXQg YS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkdlc3R1cmVDdXJ2ZVRhcmdldC5o IGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9XZWJHZXN0dXJlQ3VydmVUYXJnZXQu aAppbmRleCBhNDRiZmJmYjk2OWYyOTg2MjlkNDdjYTkwN2RhMzI1ZGZkNzBmMmVhLi5jZmMyYTgy NTM5ZDRhMzE2YjBjNmQ2YzE3MjY0ZDM2ODlhZGNhN2Q0IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxh dGZvcm0vY2hyb21pdW0vcHVibGljL1dlYkdlc3R1cmVDdXJ2ZVRhcmdldC5oCisrKyBiL1NvdXJj ZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvV2ViR2VzdHVyZUN1cnZlVGFyZ2V0LmgKQEAgLTI1 LDEzICsyNSwxNyBAQAogI2lmbmRlZiBXZWJHZXN0dXJlQ3VydmVUYXJnZXRfaAogI2RlZmluZSBX ZWJHZXN0dXJlQ3VydmVUYXJnZXRfaAogCi1uYW1lc3BhY2UgV2ViS2l0IHsKKyNpbmNsdWRlICJX ZWJGbG9hdFNpemUuaCIKKyNpbmNsdWRlICJXZWJQb2ludC5oIgogCi1zdHJ1Y3QgV2ViUG9pbnQ7 CituYW1lc3BhY2UgV2ViS2l0IHsKIAogY2xhc3MgV2ViR2VzdHVyZUN1cnZlVGFyZ2V0IHsKIHB1 YmxpYzoKLSAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsQnkoY29uc3QgV2ViUG9pbnQmKSA9IDA7Cisg ICAgdmlydHVhbCB2b2lkIHNjcm9sbEJ5KGNvbnN0IFdlYkZsb2F0U2l6ZSYgZGVsdGEpIHsgc2Ny b2xsQnkoV2ViUG9pbnQoZGVsdGEud2lkdGgsIGRlbHRhLmhlaWdodCkpOyB9CisKKyAgICAvLyBU T0RPKGFlbGlhcyk6IERlbGV0ZSB0aGlzIGFmdGVyIFdlYktpdCByb2xsLgorICAgIHZpcnR1YWwg dm9pZCBzY3JvbGxCeShjb25zdCBXZWJQb2ludCYgZGVsdGEpIHsgc2Nyb2xsQnkoV2ViRmxvYXRT aXplKGRlbHRhLngsIGRlbHRhLnkpKTsgfQogCiBwcm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB+V2Vi R2VzdHVyZUN1cnZlVGFyZ2V0KCkgeyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0vY2hy b21pdW0vcHVibGljL1dlYklucHV0SGFuZGxlckNsaWVudC5oIGIvU291cmNlL1BsYXRmb3JtL2No cm9taXVtL3B1YmxpYy9XZWJJbnB1dEhhbmRsZXJDbGllbnQuaAppbmRleCBiYWVjZmJkNjJmOTFk NTI1NGVhODRmZGNiYWFmZjkzMWVhNDZmMTVhLi4wMjZiYTBhMWI1N2IxZDkxMTc2ZTFkOWU0MjU4 YWU2ZDBhNmRmMWYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVibGlj L1dlYklucHV0SGFuZGxlckNsaWVudC5oCisrKyBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9w dWJsaWMvV2ViSW5wdXRIYW5kbGVyQ2xpZW50LmgKQEAgLTI1LDYgKzI1LDcgQEAKICNkZWZpbmUg V2ViSW5wdXRIYW5kbGVyQ2xpZW50X2gKIAogI2luY2x1ZGUgIldlYkNvbW1vbi5oIgorI2luY2x1 ZGUgIldlYkZsb2F0U2l6ZS5oIgogI2luY2x1ZGUgIldlYlBvaW50LmgiCiAjaW5jbHVkZSAiV2Vi U2l6ZS5oIgogCkBAIC01NSw3ICs1NiwxMCBAQCBwdWJsaWM6CiAgICAgLy8gYW5jZXN0b3IgbGF5 ZXIgdGhhdCBjYW4gYmUgc2Nyb2xsZWQgd2lsbCBiZSBtb3ZlZCBpbnN0ZWFkLiBJZiB0aGVyZSBp cyBubwogICAgIC8vIHN1Y2ggbGF5ZXIgdG8gYmUgbW92ZWQsIHRoaXMgcmV0dXJucyBmYWxzZS4g UmV0dXJucyB0cnVlIG90aGVyd2lzZS4KICAgICAvLyBTaG91bGQgb25seSBiZSBjYWxsZWQgaWYg c2Nyb2xsQmVnaW4oKSByZXR1cm5lZCBTY3JvbGxTdGFydGVkLgotICAgIHZpcnR1YWwgYm9vbCBz Y3JvbGxCeUlmUG9zc2libGUoV2ViUG9pbnQsIFdlYlNpemUpID0gMDsKKyAgICB2aXJ0dWFsIGJv b2wgc2Nyb2xsQnlJZlBvc3NpYmxlKFdlYlBvaW50IG9yaWdpbiwgV2ViRmxvYXRTaXplIGRlbHRh KSB7IHJldHVybiBzY3JvbGxCeUlmUG9zc2libGUob3JpZ2luLCBXZWJTaXplKGRlbHRhLndpZHRo LCBkZWx0YS5oZWlnaHQpKTsgfQorCisgICAgLy8gVE9ETyhhZWxpYXMpOiBEZWxldGUgdGhpcyBh ZnRlciBXZWJLaXQgcm9sbC4KKyAgICB2aXJ0dWFsIGJvb2wgc2Nyb2xsQnlJZlBvc3NpYmxlKFdl YlBvaW50IG9yaWdpbiwgV2ViU2l6ZSBkZWx0YSkgeyByZXR1cm4gc2Nyb2xsQnlJZlBvc3NpYmxl KG9yaWdpbiwgV2ViRmxvYXRTaXplKGRlbHRhLndpZHRoLCBkZWx0YS5oZWlnaHQpKTsgfQogCiAg ICAgLy8gU3RvcCBzY3JvbGxpbmcgdGhlIHNlbGVjdGVkIGxheWVyLiBTaG91bGQgb25seSBiZSBj YWxsZWQgaWYgc2Nyb2xsQmVnaW4oKQogICAgIC8vIHJldHVybmVkIFNjcm9sbFN0YXJ0ZWQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9ySW5wdXRI YW5kbGVySW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9y SW5wdXRIYW5kbGVySW1wbC5jcHAKaW5kZXggOWFmODk3OWMzNDJiZGNkNDJmYzkxMzFiMmI3YmM0 YjA4MzEyZDRmMy4uZDYyNzcyMDc3N2NmZjc5ZTRkNGIwZGI3ZjY5MzU0OWYzNjQxNzcwOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ29tcG9zaXRvcklucHV0SGFu ZGxlckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0 b3JJbnB1dEhhbmRsZXJJbXBsLmNwcApAQCAtMTIzLDcgKzEyMyw3IEBAIFdlYkNvbXBvc2l0b3JJ bnB1dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0aW9uIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRs ZXJJbXBsOjpoCiAgICAgICAgIHN3aXRjaCAoc2Nyb2xsU3RhdHVzKSB7CiAgICAgICAgIGNhc2Ug V2ViSW5wdXRIYW5kbGVyQ2xpZW50OjpTY3JvbGxTdGF0dXNTdGFydGVkOiB7CiAgICAgICAgICAg ICBUUkFDRV9FVkVOVF9JTlNUQU5UMigid2Via2l0IiwgIldlYkNvbXBvc2l0b3JJbnB1dEhhbmRs ZXJJbXBsOjpoYW5kbGVJbnB1dCB3aGVlbCBzY3JvbGwiLCAiZGVsdGFYIiwgLXdoZWVsRXZlbnQu ZGVsdGFYLCAiZGVsdGFZIiwgLXdoZWVsRXZlbnQuZGVsdGFZKTsKLSAgICAgICAgICAgIGJvb2wg ZGlkU2Nyb2xsID0gbV9pbnB1dEhhbmRsZXJDbGllbnQtPnNjcm9sbEJ5SWZQb3NzaWJsZShXZWJQ b2ludCh3aGVlbEV2ZW50LngsIHdoZWVsRXZlbnQueSksIEludFNpemUoLXdoZWVsRXZlbnQuZGVs dGFYLCAtd2hlZWxFdmVudC5kZWx0YVkpKTsKKyAgICAgICAgICAgIGJvb2wgZGlkU2Nyb2xsID0g bV9pbnB1dEhhbmRsZXJDbGllbnQtPnNjcm9sbEJ5SWZQb3NzaWJsZShXZWJQb2ludCh3aGVlbEV2 ZW50LngsIHdoZWVsRXZlbnQueSksIFdlYkZsb2F0U2l6ZSgtd2hlZWxFdmVudC5kZWx0YVgsIC13 aGVlbEV2ZW50LmRlbHRhWSkpOwogICAgICAgICAgICAgbV9pbnB1dEhhbmRsZXJDbGllbnQtPnNj cm9sbEVuZCgpOwogICAgICAgICAgICAgcmV0dXJuIGRpZFNjcm9sbCA/IERpZEhhbmRsZSA6IERy b3BFdmVudDsKICAgICAgICAgfQpAQCAtMTU5LDcgKzE1OSw3IEBAIFdlYkNvbXBvc2l0b3JJbnB1 dEhhbmRsZXJJbXBsOjpFdmVudERpc3Bvc2l0aW9uIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJ bXBsOjpoCiAKICAgICAgICAgY29uc3QgV2ViR2VzdHVyZUV2ZW50JiBnZXN0dXJlRXZlbnQgPSAq c3RhdGljX2Nhc3Q8Y29uc3QgV2ViR2VzdHVyZUV2ZW50Kj4oJmV2ZW50KTsKICAgICAgICAgYm9v bCBkaWRTY3JvbGwgPSBtX2lucHV0SGFuZGxlckNsaWVudC0+c2Nyb2xsQnlJZlBvc3NpYmxlKFdl YlBvaW50KGdlc3R1cmVFdmVudC54LCBnZXN0dXJlRXZlbnQueSksCi0gICAgICAgICAgICBJbnRT aXplKC1nZXN0dXJlRXZlbnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFYLCAtZ2VzdHVyZUV2ZW50 LmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSkpOworICAgICAgICAgICAgV2ViRmxvYXRTaXplKC1n ZXN0dXJlRXZlbnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFYLCAtZ2VzdHVyZUV2ZW50LmRhdGEu c2Nyb2xsVXBkYXRlLmRlbHRhWSkpOwogICAgICAgICByZXR1cm4gZGlkU2Nyb2xsID8gRGlkSGFu ZGxlIDogRHJvcEV2ZW50OwogICAgIH0gZWxzZSBpZiAoZXZlbnQudHlwZSA9PSBXZWJJbnB1dEV2 ZW50OjpHZXN0dXJlU2Nyb2xsRW5kKSB7CiAgICAgICAgIEFTU0VSVChtX2V4cGVjdFNjcm9sbFVw ZGF0ZUVuZCk7CkBAIC0yOTQsMTIgKzI5NCwxMiBAQCBib29sIFdlYkNvbXBvc2l0b3JJbnB1dEhh bmRsZXJJbXBsOjpjYW5jZWxDdXJyZW50RmxpbmcoKQogICAgIHJldHVybiBoYWRGbGluZ0FuaW1h dGlvbjsKIH0KIAotYm9vbCBXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbDo6dG91Y2hwYWRG bGluZ1Njcm9sbChjb25zdCBXZWJQb2ludCYgaW5jcmVtZW50KQorYm9vbCBXZWJDb21wb3NpdG9y SW5wdXRIYW5kbGVySW1wbDo6dG91Y2hwYWRGbGluZ1Njcm9sbChjb25zdCBXZWJGbG9hdFNpemUm IGluY3JlbWVudCkKIHsKICAgICBXZWJNb3VzZVdoZWVsRXZlbnQgc3ludGhldGljV2hlZWw7CiAg ICAgc3ludGhldGljV2hlZWwudHlwZSA9IFdlYklucHV0RXZlbnQ6Ok1vdXNlV2hlZWw7Ci0gICAg c3ludGhldGljV2hlZWwuZGVsdGFYID0gaW5jcmVtZW50Lng7Ci0gICAgc3ludGhldGljV2hlZWwu ZGVsdGFZID0gaW5jcmVtZW50Lnk7CisgICAgc3ludGhldGljV2hlZWwuZGVsdGFYID0gaW5jcmVt ZW50LndpZHRoOworICAgIHN5bnRoZXRpY1doZWVsLmRlbHRhWSA9IGluY3JlbWVudC5oZWlnaHQ7 CiAgICAgc3ludGhldGljV2hlZWwuaGFzUHJlY2lzZVNjcm9sbGluZ0RlbHRhcyA9IHRydWU7CiAg ICAgc3ludGhldGljV2hlZWwueCA9IG1fZmxpbmdQYXJhbWV0ZXJzLnBvaW50Lng7CiAgICAgc3lu dGhldGljV2hlZWwueSA9IG1fZmxpbmdQYXJhbWV0ZXJzLnBvaW50Lnk7CkBAIC0zMzAsMTIgKzMz MCwxMiBAQCBib29sIFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsOjp0b3VjaHBhZEZsaW5n U2Nyb2xsKGNvbnN0IFdlYlBvaW50JiBpbmNyZW1lbgogICAgIHJldHVybiBmYWxzZTsKIH0KIAot dm9pZCBXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbDo6c2Nyb2xsQnkoY29uc3QgV2ViUG9p bnQmIGluY3JlbWVudCkKK3ZvaWQgV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OnNjcm9s bEJ5KGNvbnN0IFdlYkZsb2F0U2l6ZSYgaW5jcmVtZW50KQogewotICAgIGlmIChpbmNyZW1lbnQg PT0gV2ViUG9pbnQoKSkKKyAgICBpZiAoaW5jcmVtZW50ID09IFdlYkZsb2F0U2l6ZSgpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBUUkFDRV9FVkVOVDIoIndlYmtpdCIsICJXZWJDb21wb3NpdG9y SW5wdXRIYW5kbGVySW1wbDo6c2Nyb2xsQnkiLCAieCIsIGluY3JlbWVudC54LCAieSIsIGluY3Jl bWVudC55KTsKKyAgICBUUkFDRV9FVkVOVDIoIndlYmtpdCIsICJXZWJDb21wb3NpdG9ySW5wdXRI YW5kbGVySW1wbDo6c2Nyb2xsQnkiLCAieCIsIGluY3JlbWVudC53aWR0aCwgInkiLCBpbmNyZW1l bnQuaGVpZ2h0KTsKIAogICAgIGJvb2wgZGlkU2Nyb2xsID0gZmFsc2U7CiAKQEAgLTM0NCwxMyAr MzQ0LDEzIEBAIHZvaWQgV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGw6OnNjcm9sbEJ5KGNv bnN0IFdlYlBvaW50JiBpbmNyZW1lbnQpCiAgICAgICAgIGRpZFNjcm9sbCA9IHRvdWNocGFkRmxp bmdTY3JvbGwoaW5jcmVtZW50KTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXZWJHZXN0dXJl RXZlbnQ6OlRvdWNoc2NyZWVuOgotICAgICAgICBkaWRTY3JvbGwgPSBtX2lucHV0SGFuZGxlckNs aWVudC0+c2Nyb2xsQnlJZlBvc3NpYmxlKG1fZmxpbmdQYXJhbWV0ZXJzLnBvaW50LCBJbnRTaXpl KC1pbmNyZW1lbnQueCwgLWluY3JlbWVudC55KSk7CisgICAgICAgIGRpZFNjcm9sbCA9IG1faW5w dXRIYW5kbGVyQ2xpZW50LT5zY3JvbGxCeUlmUG9zc2libGUobV9mbGluZ1BhcmFtZXRlcnMucG9p bnQsIFdlYkZsb2F0U2l6ZSgtaW5jcmVtZW50LndpZHRoLCAtaW5jcmVtZW50LmhlaWdodCkpOwog ICAgICAgICBicmVhazsKICAgICB9CiAKICAgICBpZiAoZGlkU2Nyb2xsKSB7Ci0gICAgICAgIG1f ZmxpbmdQYXJhbWV0ZXJzLmN1bXVsYXRpdmVTY3JvbGwud2lkdGggKz0gaW5jcmVtZW50Lng7Ci0g ICAgICAgIG1fZmxpbmdQYXJhbWV0ZXJzLmN1bXVsYXRpdmVTY3JvbGwuaGVpZ2h0ICs9IGluY3Jl bWVudC55OworICAgICAgICBtX2ZsaW5nUGFyYW1ldGVycy5jdW11bGF0aXZlU2Nyb2xsLndpZHRo ICs9IGluY3JlbWVudC53aWR0aDsKKyAgICAgICAgbV9mbGluZ1BhcmFtZXRlcnMuY3VtdWxhdGl2 ZVNjcm9sbC5oZWlnaHQgKz0gaW5jcmVtZW50LmhlaWdodDsKICAgICB9CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJ bXBsLmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJDb21wb3NpdG9ySW5wdXRIYW5k bGVySW1wbC5oCmluZGV4IDlkZmFkNjAyYWExODZiMzI0MDBjZDJjMzViYjFkM2JiOGNlYmNlZGUu LjcyOTJmZjVhMjFmNjkyMGQ1ZjkwMTg2MGEzMDFjM2Q1MTIzNmNlN2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsLmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViQ29tcG9zaXRvcklucHV0SGFuZGxl ckltcGwuaApAQCAtNjYsNyArNjYsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIG1haW5U aHJlYWRIYXNTdG9wcGVkRmxpbmdpbmcoKTsKIAogICAgIC8vIFdlYkdlc3R1cmVDdXJ2ZVRhcmdl dCBpbXBsZW1lbnRhdGlvbi4KLSAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsQnkoY29uc3QgV2ViUG9p bnQmKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsQnkoY29uc3QgV2ViRmxvYXRTaXplJik7CiAK ICAgICBpbnQgaWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1faWRlbnRpZmllcjsgfQogCkBA IC04MCw3ICs4MCw3IEBAIHByaXZhdGU6CiAgICAgRXZlbnREaXNwb3NpdGlvbiBoYW5kbGVHZXN0 dXJlRmxpbmcoY29uc3QgV2ViR2VzdHVyZUV2ZW50Jik7CiAKICAgICAvLyBSZXR1cm5zIHRydWUg aWYgd2Ugc2Nyb2xsZWQgYnkgdGhlIGluY3JlbWVudC4KLSAgICBib29sIHRvdWNocGFkRmxpbmdT Y3JvbGwoY29uc3QgV2ViUG9pbnQmIGluY3JlbWVudCk7CisgICAgYm9vbCB0b3VjaHBhZEZsaW5n U2Nyb2xsKGNvbnN0IFdlYkZsb2F0U2l6ZSYgaW5jcmVtZW50KTsKIAogICAgIC8vIFJldHVybnMg dHJ1ZSBpZiB3ZSBhY3R1YWxseSBoYWQgYW4gYWN0aXZlIGZsaW5nIHRvIGNhbmNlbC4KICAgICBi b29sIGNhbmNlbEN1cnJlbnRGbGluZygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuY3BwCmluZGV4IDljZmQ2YjljNzFiNTk0M2E4ZTRmNGMxNTJjZTA1MDVlNWJhYzA4 YTIuLmZlMGQxZGNhNTc2N2ZiNzU3OTEwODIwMGM3YWZiNmU1N2UzZTQ5YWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTY1OCwxNiArNjU4LDE2IEBA IGJvb2wgV2ViVmlld0ltcGw6OmhhbmRsZU1vdXNlV2hlZWwoRnJhbWUmIG1haW5GcmFtZSwgY29u c3QgV2ViTW91c2VXaGVlbEV2ZW50JiBlCiAgICAgcmV0dXJuIFBhZ2VXaWRnZXRFdmVudEhhbmRs ZXI6OmhhbmRsZU1vdXNlV2hlZWwobWFpbkZyYW1lLCBldmVudCk7CiB9CiAKLXZvaWQgV2ViVmll d0ltcGw6OnNjcm9sbEJ5KGNvbnN0IFdlYlBvaW50JiBkZWx0YSkKK3ZvaWQgV2ViVmlld0ltcGw6 OnNjcm9sbEJ5KGNvbnN0IFdlYkZsb2F0U2l6ZSYgZGVsdGEpCiB7CiAgICAgaWYgKG1fZmxpbmdT b3VyY2VEZXZpY2UgPT0gV2ViR2VzdHVyZUV2ZW50OjpUb3VjaHBhZCkgewogICAgICAgICBXZWJN b3VzZVdoZWVsRXZlbnQgc3ludGhldGljV2hlZWw7CiAgICAgICAgIGNvbnN0IGZsb2F0IHRpY2tE aXZpc29yID0gV2ViQ29yZTo6V2hlZWxFdmVudDo6VGlja011bHRpcGxpZXI7CiAKLSAgICAgICAg c3ludGhldGljV2hlZWwuZGVsdGFYID0gZGVsdGEueDsKLSAgICAgICAgc3ludGhldGljV2hlZWwu ZGVsdGFZID0gZGVsdGEueTsKLSAgICAgICAgc3ludGhldGljV2hlZWwud2hlZWxUaWNrc1ggPSBk ZWx0YS54IC8gdGlja0Rpdmlzb3I7Ci0gICAgICAgIHN5bnRoZXRpY1doZWVsLndoZWVsVGlja3NZ ID0gZGVsdGEueSAvIHRpY2tEaXZpc29yOworICAgICAgICBzeW50aGV0aWNXaGVlbC5kZWx0YVgg PSBkZWx0YS53aWR0aDsKKyAgICAgICAgc3ludGhldGljV2hlZWwuZGVsdGFZID0gZGVsdGEuaGVp Z2h0OworICAgICAgICBzeW50aGV0aWNXaGVlbC53aGVlbFRpY2tzWCA9IGRlbHRhLndpZHRoIC8g dGlja0Rpdmlzb3I7CisgICAgICAgIHN5bnRoZXRpY1doZWVsLndoZWVsVGlja3NZID0gZGVsdGEu aGVpZ2h0IC8gdGlja0Rpdmlzb3I7CiAgICAgICAgIHN5bnRoZXRpY1doZWVsLmhhc1ByZWNpc2VT Y3JvbGxpbmdEZWx0YXMgPSB0cnVlOwogICAgICAgICBzeW50aGV0aWNXaGVlbC54ID0gbV9wb3Np dGlvbk9uRmxpbmdTdGFydC54OwogICAgICAgICBzeW50aGV0aWNXaGVlbC55ID0gbV9wb3NpdGlv bk9uRmxpbmdTdGFydC55OwpAQCAtNjgxLDggKzY4MSw4IEBAIHZvaWQgV2ViVmlld0ltcGw6OnNj cm9sbEJ5KGNvbnN0IFdlYlBvaW50JiBkZWx0YSkKICAgICAgICAgV2ViR2VzdHVyZUV2ZW50IHN5 bnRoZXRpY0dlc3R1cmVFdmVudDsKIAogICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZlbnQudHlw ZSA9IFdlYklucHV0RXZlbnQ6Okdlc3R1cmVTY3JvbGxVcGRhdGVXaXRob3V0UHJvcGFnYXRpb247 Ci0gICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5kYXRhLnNjcm9sbFVwZGF0ZS5kZWx0YVgg PSBkZWx0YS54OwotICAgICAgICBzeW50aGV0aWNHZXN0dXJlRXZlbnQuZGF0YS5zY3JvbGxVcGRh dGUuZGVsdGFZID0gZGVsdGEueTsKKyAgICAgICAgc3ludGhldGljR2VzdHVyZUV2ZW50LmRhdGEu c2Nyb2xsVXBkYXRlLmRlbHRhWCA9IGRlbHRhLndpZHRoOworICAgICAgICBzeW50aGV0aWNHZXN0 dXJlRXZlbnQuZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZID0gZGVsdGEuaGVpZ2h0OwogICAgICAg ICBzeW50aGV0aWNHZXN0dXJlRXZlbnQueCA9IG1fcG9zaXRpb25PbkZsaW5nU3RhcnQueDsKICAg ICAgICAgc3ludGhldGljR2VzdHVyZUV2ZW50LnkgPSBtX3Bvc2l0aW9uT25GbGluZ1N0YXJ0Lnk7 CiAgICAgICAgIHN5bnRoZXRpY0dlc3R1cmVFdmVudC5nbG9iYWxYID0gbV9nbG9iYWxQb3NpdGlv bk9uRmxpbmdTdGFydC54OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViVmlld0ltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgK aW5kZXggZDQ2YTM3NWIzOWE3OWFlYzhmY2RiMDE3NTIxOWE2MzUwZmZjMTVhYy4uNGY1YmQyYmNh N2EyOGI4YmVjNzI3NDBkZmRhMWY1MGY3YjQ1ZjUwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5oCkBAIC00MDQsNyArNDA0LDcgQEAgcHVibGljOgogICAgIHZvaWQg aGFzVG91Y2hFdmVudEhhbmRsZXJzKGJvb2wpOwogCiAgICAgLy8gV2ViR2VzdHVyZUN1cnZlVGFy Z2V0IGltcGxlbWVudGF0aW9uIGZvciBmbGluZy4KLSAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsQnko Y29uc3QgV2ViUG9pbnQmKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsQnkoY29uc3QgV2ViRmxv YXRTaXplJik7CiAKICAgICAvLyBIYW5kbGVzIGNvbnRleHQgbWVudSBldmVudHMgb3JpZ25hdGVk IHZpYSB0aGUgdGhlIGtleWJvYXJkLiBUaGVzZQogICAgIC8vIGluY2x1ZGUgdGhlIFZLX0FQUFMg dmlydHVhbCBrZXkgYW5kIHRoZSBTaGlmdCtGMTAgY29tYmluZS4gQ29kZSBpcwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVy SW1wbFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJDb21wb3NpdG9y SW5wdXRIYW5kbGVySW1wbFRlc3QuY3BwCmluZGV4IDU4MjFjOTE4MDY5MDYxOTk4Mjg5YzNlOGU2 NmU4MjkxODdhNDAxMjAuLmRhYzMxNGNjODU5N2Q0ZDkzNGMzOWZkYjViNDU4YTliMGQ5ZWY4OTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvV2ViQ29tcG9zaXRvcklu cHV0SGFuZGxlckltcGxUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L1dlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAK ICNpbmNsdWRlIDxnbW9jay9nbW9jay5oPgogI2luY2x1ZGUgPGd0ZXN0L2d0ZXN0Lmg+CiAjaW5j bHVkZSA8cHVibGljL1dlYkZsb2F0UG9pbnQuaD4KKyNpbmNsdWRlIDxwdWJsaWMvV2ViRmxvYXRT aXplLmg+CiAjaW5jbHVkZSA8cHVibGljL1dlYklucHV0SGFuZGxlci5oPgogI2luY2x1ZGUgPHB1 YmxpYy9XZWJJbnB1dEhhbmRsZXJDbGllbnQuaD4KICNpbmNsdWRlIDxwdWJsaWMvV2ViUG9pbnQu aD4KQEAgLTYxLDcgKzYyLDcgQEAgcHVibGljOgogICAgIE1PQ0tfTUVUSE9EMShoYXZlVG91Y2hF dmVudEhhbmRsZXJzQXQsIGJvb2woV2ViUG9pbnQpKTsKIAogICAgIE1PQ0tfTUVUSE9EMihzY3Jv bGxCZWdpbiwgU2Nyb2xsU3RhdHVzKFdlYlBvaW50LCBXZWJJbnB1dEhhbmRsZXJDbGllbnQ6OlNj cm9sbElucHV0VHlwZSkpOwotICAgIE1PQ0tfTUVUSE9EMihzY3JvbGxCeUlmUG9zc2libGUsIGJv b2woV2ViUG9pbnQsIFdlYlNpemUpKTsKKyAgICBNT0NLX01FVEhPRDIoc2Nyb2xsQnlJZlBvc3Np YmxlLCBib29sKFdlYlBvaW50LCBXZWJGbG9hdFNpemUpKTsKICAgICBNT0NLX01FVEhPRDAoc2Ny b2xsRW5kLCB2b2lkKCkpOwogCiAgICAgTU9DS19NRVRIT0QwKGRpZFJlY2VpdmVMYXN0SW5wdXRF dmVudEZvclZTeW5jLCB2b2lkKCkpOwpAQCAtMTY1LDcgKzE2Niw3IEBAIFRFU1RfRihXZWJDb21w b3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVTY3JvbGxTdGFydGVkKQogCiAgICAg Z2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNjcm9sbFVwZGF0ZTsKICAgICBn ZXN0dXJlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9IC00MDsgLy8gLVkgbWVhbnMgc2Nyb2xs IGRvd24gLSBpLmUuIGluIHRoZSArWSBkaXJlY3Rpb24uCi0gICAgRVhQRUNUX0NBTEwobV9tb2Nr SW5wdXRIYW5kbGVyQ2xpZW50LCBzY3JvbGxCeUlmUG9zc2libGUodGVzdGluZzo6XywgdGVzdGlu Zzo6RmllbGQoJldlYlNpemU6OmhlaWdodCwgdGVzdGluZzo6R3QoMCkpKSkKKyAgICBFWFBFQ1Rf Q0FMTChtX21vY2tJbnB1dEhhbmRsZXJDbGllbnQsIHNjcm9sbEJ5SWZQb3NzaWJsZSh0ZXN0aW5n OjpfLCB0ZXN0aW5nOjpGaWVsZCgmV2ViRmxvYXRTaXplOjpoZWlnaHQsIHRlc3Rpbmc6Okd0KDAp KSkpCiAgICAgICAgIC5XaWxsT25jZSh0ZXN0aW5nOjpSZXR1cm4oZmFsc2UpKTsKICAgICBtX2lu cHV0SGFuZGxlci0+aGFuZGxlSW5wdXRFdmVudChnZXN0dXJlKTsKIApAQCAtMTc1LDcgKzE3Niw3 IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRlc3QsIGdlc3R1cmVTY3Jv bGxTdGFydGVkKQogCiAgICAgZ2VzdHVyZS50eXBlID0gV2ViSW5wdXRFdmVudDo6R2VzdHVyZVNj cm9sbFVwZGF0ZTsKICAgICBnZXN0dXJlLmRhdGEuc2Nyb2xsVXBkYXRlLmRlbHRhWSA9IC00MDsg Ly8gLVkgbWVhbnMgc2Nyb2xsIGRvd24gLSBpLmUuIGluIHRoZSArWSBkaXJlY3Rpb24uCi0gICAg RVhQRUNUX0NBTEwobV9tb2NrSW5wdXRIYW5kbGVyQ2xpZW50LCBzY3JvbGxCeUlmUG9zc2libGUo dGVzdGluZzo6XywgdGVzdGluZzo6RmllbGQoJldlYlNpemU6OmhlaWdodCwgdGVzdGluZzo6R3Qo MCkpKSkKKyAgICBFWFBFQ1RfQ0FMTChtX21vY2tJbnB1dEhhbmRsZXJDbGllbnQsIHNjcm9sbEJ5 SWZQb3NzaWJsZSh0ZXN0aW5nOjpfLCB0ZXN0aW5nOjpGaWVsZCgmV2ViRmxvYXRTaXplOjpoZWln aHQsIHRlc3Rpbmc6Okd0KDApKSkpCiAgICAgICAgIC5XaWxsT25jZSh0ZXN0aW5nOjpSZXR1cm4o dHJ1ZSkpOwogICAgIG1faW5wdXRIYW5kbGVyLT5oYW5kbGVJbnB1dEV2ZW50KGdlc3R1cmUpOwog CkBAIC0zMDMsNyArMzA0LDcgQEAgVEVTVF9GKFdlYkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBs VGVzdCwgZ2VzdHVyZVBpbmNoQWZ0ZXJTY3JvbGxPbk1haW5UaHJlYWQpCiAKICAgICBnZXN0dXJl LnR5cGUgPSBXZWJJbnB1dEV2ZW50OjpHZXN0dXJlU2Nyb2xsVXBkYXRlOwogICAgIGdlc3R1cmUu ZGF0YS5zY3JvbGxVcGRhdGUuZGVsdGFZID0gLTQwOyAvLyAtWSBtZWFucyBzY3JvbGwgZG93biAt IGkuZS4gaW4gdGhlICtZIGRpcmVjdGlvbi4KLSAgICBFWFBFQ1RfQ0FMTChtX21vY2tJbnB1dEhh bmRsZXJDbGllbnQsIHNjcm9sbEJ5SWZQb3NzaWJsZSh0ZXN0aW5nOjpfLCB0ZXN0aW5nOjpGaWVs ZCgmV2ViU2l6ZTo6aGVpZ2h0LCB0ZXN0aW5nOjpHdCgwKSkpKQorICAgIEVYUEVDVF9DQUxMKG1f bW9ja0lucHV0SGFuZGxlckNsaWVudCwgc2Nyb2xsQnlJZlBvc3NpYmxlKHRlc3Rpbmc6Ol8sIHRl c3Rpbmc6OkZpZWxkKCZXZWJGbG9hdFNpemU6OmhlaWdodCwgdGVzdGluZzo6R3QoMCkpKSkKICAg ICAgICAgLldpbGxPbmNlKHRlc3Rpbmc6OlJldHVybih0cnVlKSk7CiAgICAgbV9pbnB1dEhhbmRs ZXItPmhhbmRsZUlucHV0RXZlbnQoZ2VzdHVyZSk7CiAKQEAgLTQ0MCw3ICs0NDEsNyBAQCBURVNU X0YoV2ViQ29tcG9zaXRvcklucHV0SGFuZGxlckltcGxUZXN0LCBnZXN0dXJlRmxpbmdBbmltYXRl c1RvdWNocGFkKQogICAgIEVYUEVDVF9DQUxMKG1fbW9ja0lucHV0SGFuZGxlckNsaWVudCwgc2No ZWR1bGVBbmltYXRpb24oKSk7CiAgICAgRVhQRUNUX0NBTEwobV9tb2NrSW5wdXRIYW5kbGVyQ2xp ZW50LCBzY3JvbGxCZWdpbih0ZXN0aW5nOjpfLCB0ZXN0aW5nOjpfKSkKICAgICAgICAgLldpbGxP bmNlKHRlc3Rpbmc6OlJldHVybihXZWJJbnB1dEhhbmRsZXJDbGllbnQ6OlNjcm9sbFN0YXR1c1N0 YXJ0ZWQpKTsKLSAgICBFWFBFQ1RfQ0FMTChtX21vY2tJbnB1dEhhbmRsZXJDbGllbnQsIHNjcm9s bEJ5SWZQb3NzaWJsZSh0ZXN0aW5nOjpfLCB0ZXN0aW5nOjpGaWVsZCgmV2ViU2l6ZTo6d2lkdGgs IHRlc3Rpbmc6Okx0KDApKSkpCisgICAgRVhQRUNUX0NBTEwobV9tb2NrSW5wdXRIYW5kbGVyQ2xp ZW50LCBzY3JvbGxCeUlmUG9zc2libGUodGVzdGluZzo6XywgdGVzdGluZzo6RmllbGQoJldlYkZs b2F0U2l6ZTo6d2lkdGgsIHRlc3Rpbmc6Okx0KDApKSkpCiAgICAgICAgIC5XaWxsT25jZSh0ZXN0 aW5nOjpSZXR1cm4odHJ1ZSkpOwogICAgIEVYUEVDVF9DQUxMKG1fbW9ja0lucHV0SGFuZGxlckNs aWVudCwgc2Nyb2xsRW5kKCkpOwogICAgIG1faW5wdXRIYW5kbGVyLT5hbmltYXRlKDEwLjEpOwpA QCAtNTI0LDcgKzUyNSw3IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1wbFRl c3QsIGdlc3R1cmVGbGluZ1RyYW5zZmVyUmVzZXRzVG91Y2hwYWQpCiAgICAgRVhQRUNUX0NBTEwo bV9tb2NrSW5wdXRIYW5kbGVyQ2xpZW50LCBzY2hlZHVsZUFuaW1hdGlvbigpKTsKICAgICBFWFBF Q1RfQ0FMTChtX21vY2tJbnB1dEhhbmRsZXJDbGllbnQsIHNjcm9sbEJlZ2luKHRlc3Rpbmc6Ol8s IHRlc3Rpbmc6Ol8pKQogICAgICAgICAuV2lsbE9uY2UodGVzdGluZzo6UmV0dXJuKFdlYklucHV0 SGFuZGxlckNsaWVudDo6U2Nyb2xsU3RhdHVzU3RhcnRlZCkpOwotICAgIEVYUEVDVF9DQUxMKG1f bW9ja0lucHV0SGFuZGxlckNsaWVudCwgc2Nyb2xsQnlJZlBvc3NpYmxlKHRlc3Rpbmc6Ol8sIHRl c3Rpbmc6OkZpZWxkKCZXZWJTaXplOjp3aWR0aCwgdGVzdGluZzo6THQoMCkpKSkKKyAgICBFWFBF Q1RfQ0FMTChtX21vY2tJbnB1dEhhbmRsZXJDbGllbnQsIHNjcm9sbEJ5SWZQb3NzaWJsZSh0ZXN0 aW5nOjpfLCB0ZXN0aW5nOjpGaWVsZCgmV2ViRmxvYXRTaXplOjp3aWR0aCwgdGVzdGluZzo6THQo MCkpKSkKICAgICAgICAgLldpbGxPbmNlKHRlc3Rpbmc6OlJldHVybih0cnVlKSk7CiAgICAgRVhQ RUNUX0NBTEwobV9tb2NrSW5wdXRIYW5kbGVyQ2xpZW50LCBzY3JvbGxFbmQoKSk7CiAgICAgbV9p bnB1dEhhbmRsZXItPmFuaW1hdGUoMTAuMSk7CkBAIC02MDcsNyArNjA4LDcgQEAgVEVTVF9GKFdl YkNvbXBvc2l0b3JJbnB1dEhhbmRsZXJJbXBsVGVzdCwgZ2VzdHVyZUZsaW5nVHJhbnNmZXJSZXNl dHNUb3VjaHBhZCkKICAgICBFWFBFQ1RfQ0FMTChtX21vY2tJbnB1dEhhbmRsZXJDbGllbnQsIHNj aGVkdWxlQW5pbWF0aW9uKCkpOwogICAgIEVYUEVDVF9DQUxMKG1fbW9ja0lucHV0SGFuZGxlckNs aWVudCwgc2Nyb2xsQmVnaW4odGVzdGluZzo6XywgdGVzdGluZzo6XykpCiAgICAgICAgIC5XaWxs T25jZSh0ZXN0aW5nOjpSZXR1cm4oV2ViSW5wdXRIYW5kbGVyQ2xpZW50OjpTY3JvbGxTdGF0dXNT dGFydGVkKSk7Ci0gICAgRVhQRUNUX0NBTEwobV9tb2NrSW5wdXRIYW5kbGVyQ2xpZW50LCBzY3Jv bGxCeUlmUG9zc2libGUodGVzdGluZzo6XywgdGVzdGluZzo6RmllbGQoJldlYlNpemU6OmhlaWdo dCwgdGVzdGluZzo6R3QoMCkpKSkKKyAgICBFWFBFQ1RfQ0FMTChtX21vY2tJbnB1dEhhbmRsZXJD bGllbnQsIHNjcm9sbEJ5SWZQb3NzaWJsZSh0ZXN0aW5nOjpfLCB0ZXN0aW5nOjpGaWVsZCgmV2Vi RmxvYXRTaXplOjpoZWlnaHQsIHRlc3Rpbmc6Okd0KDApKSkpCiAgICAgICAgIC5XaWxsT25jZSh0 ZXN0aW5nOjpSZXR1cm4odHJ1ZSkpOwogICAgIEVYUEVDVF9DQUxMKG1fbW9ja0lucHV0SGFuZGxl ckNsaWVudCwgc2Nyb2xsRW5kKCkpOwogICAgIG1faW5wdXRIYW5kbGVyLT5hbmltYXRlKDMwLjEp OwpAQCAtNzM3LDcgKzczOCw3IEBAIFRFU1RfRihXZWJDb21wb3NpdG9ySW5wdXRIYW5kbGVySW1w bFRlc3QsIGdlc3R1cmVGbGluZ0FuaW1hdGVzVG91Y2hzY3JlZW4pCiAKICAgICAvLyBUaGUgc2Vj b25kIGNhbGwgc2hvdWxkIHN0YXJ0IHNjcm9sbGluZyBpbiB0aGUgLVggZGlyZWN0aW9uLgogICAg IEVYUEVDVF9DQUxMKG1fbW9ja0lucHV0SGFuZGxlckNsaWVudCwgc2NoZWR1bGVBbmltYXRpb24o KSk7Ci0gICAgRVhQRUNUX0NBTEwobV9tb2NrSW5wdXRIYW5kbGVyQ2xpZW50LCBzY3JvbGxCeUlm UG9zc2libGUodGVzdGluZzo6XywgdGVzdGluZzo6RmllbGQoJldlYlNpemU6OndpZHRoLCB0ZXN0 aW5nOjpMdCgwKSkpKQorICAgIEVYUEVDVF9DQUxMKG1fbW9ja0lucHV0SGFuZGxlckNsaWVudCwg c2Nyb2xsQnlJZlBvc3NpYmxlKHRlc3Rpbmc6Ol8sIHRlc3Rpbmc6OkZpZWxkKCZXZWJGbG9hdFNp emU6OndpZHRoLCB0ZXN0aW5nOjpMdCgwKSkpKQogICAgICAgICAuV2lsbE9uY2UodGVzdGluZzo6 UmV0dXJuKHRydWUpKTsKICAgICBtX2lucHV0SGFuZGxlci0+YW5pbWF0ZSgxMC4xKTsKIAo=