83658 2012-04-10 19:46:00 -0700 [chromium] Add OVERRIDE annotations for cc layer types 2012-04-11 13:20:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 83645 1 jamesr jamesr cc-bugs dbates eric.carlson feature-media-reviews webkit.review.bot oldest_to_newest 599955 0 jamesr 2012-04-10 19:46:00 -0700 [chromium] Add OVERRIDE annotations for cc layer types 599956 1 136611 jamesr 2012-04-10 19:48:03 -0700 Created attachment 136611 Patch 600008 2 136611 dbates 2012-04-10 21:24:44 -0700 Comment on attachment 136611 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136611&action=review > Source/WebKit/chromium/ChangeLog:14 > + * src/WebLayerImpl.cpp: > + * src/WebLayerImpl.h: For your consideration I suggest adding a remark to the right of these files to explain that you are removing the function WebLayerImpl::paintContents() instead of adding an override annotation to it. 600537 3 jamesr 2012-04-11 13:20:08 -0700 Committed r113902: <http://trac.webkit.org/changeset/113902> 136611 2012-04-10 19:48:03 -0700 2012-04-10 21:24:43 -0700 Patch bug-83658-20120410194802.patch text/plain 30998 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzODEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWFlYWM0MDVhOWFkZWJi NjAwY2U2NmYwMTc1NjMyMzY5NjU4ZTcxZC4uNDExMTEzNGQzYzAxZDY2ZmEzZTIwMjliODNhYWJm ZWQ1ODQ5ODQ2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEyLTA0LTEwICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBB ZGQgT1ZFUlJJREUgYW5ub3RhdGlvbnMgZm9yIGNjIGxheWVyIHR5cGVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzY1OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyBPVkVSUklERSBhbm5v dGF0aW9ucyB0byBvdmVycmlkZXMgb2YgZnVuY3Rpb25zIG9uIHRoZXNlIGNsYXNzZXM6CisgICAg ICAgIC0gQ0NMYXllckltcGwKKyAgICAgICAgLSBMYXllckNocm9taXVtCisgICAgICAgIC0gVGls ZWRMYXllckNocm9taXVtCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D YW52YXMyRExheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKENhbnZhczJETGF5ZXJDaHJvbWl1bSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1 bS5oOgorICAgICAgICAoQ2FudmFzTGF5ZXJDaHJvbWl1bSk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKENvbnRl bnRMYXllckNocm9taXVtKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9J bWFnZUxheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKEltYWdlTGF5ZXJDaHJvbWl1bSk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vUGx1Z2luTGF5ZXJDaHJvbWl1bS5oOgor ICAgICAgICAoUGx1Z2luTGF5ZXJDaHJvbWl1bSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vVGlsZWRMYXllckNocm9taXVtLmg6CisgICAgICAgIChUaWxlZExheWVyQ2hy b21pdW0pOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJD aHJvbWl1bS5oOgorICAgICAgICAoVmlkZW9MYXllckNocm9taXVtKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKFdl YkdMTGF5ZXJDaHJvbWl1bSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Y2MvQ0NTY3JvbGxiYXJMYXllckltcGwuaDoKKyAgICAgICAgKENDU2Nyb2xsYmFyTGF5ZXJJbXBs KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1NvbGlkQ29sb3JM YXllckltcGwuaDoKKyAgICAgICAgKENDU29saWRDb2xvckxheWVySW1wbCk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUZXh0dXJlTGF5ZXJJbXBsLmg6CisgICAg ICAgIChDQ1RleHR1cmVMYXllckltcGwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL2NjL0NDVGlsZWRMYXllckltcGwuaDoKKyAgICAgICAgKENDVGlsZWRMYXllckltcGwp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVmlkZW9MYXllcklt cGwuaDoKKyAgICAgICAgKENDVmlkZW9MYXllckltcGwpOgorCiAyMDEyLTA0LTEwICBLZW50IFRh bXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgYSBmdW5jdGlvbiB0byBz ZXQgZW1wdHkgY2xpZW50cyB0byBhIFBhZ2VDbGllbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9n CmluZGV4IDFlODExZDNjODZkNTdjZjEzZTdjYWJjMGY5MWM2NzUzMjBhOGU1MzkuLjNmNGMyN2Qy M2M3YWQ3NWQ0N2EzZTVkY2M3MzJlZjNhOTUyODhlYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCkBAIC0xLDUgKzEsMzAgQEAKIDIwMTItMDQtMTAgIEphbWVzIFJvYmluc29uICA8amFtZXNy QGNocm9taXVtLm9yZz4KIAorICAgICAgICBbY2hyb21pdW1dIEFkZCBPVkVSUklERSBhbm5vdGF0 aW9ucyBmb3IgY2MgbGF5ZXIgdHlwZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTgzNjU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhpcyBhZGRzIE9WRVJSSURFIGFubm90YXRpb25zIHRvIG92ZXJyaWRl cyBvZiBmdW5jdGlvbnMgb24gdGhlc2UgY2xhc3NlczoKKyAgICAgICAgLSBDQ0xheWVySW1wbAor ICAgICAgICAtIExheWVyQ2hyb21pdW0KKyAgICAgICAgLSBUaWxlZExheWVyQ2hyb21pdW0KKwor ICAgICAgICAqIHNyYy9XZWJMYXllckltcGwuY3BwOgorICAgICAgICAqIHNyYy9XZWJMYXllcklt cGwuaDoKKyAgICAgICAgKFdlYkxheWVySW1wbCk6CisgICAgICAgICogdGVzdHMvQ0NMYXllckl0 ZXJhdG9yVGVzdC5jcHA6CisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0Q29tbW9uVGVz dC5jcHA6CisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRlc3QuY3BwOgorICAg ICAgICAqIHRlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3BwOgorICAgICAgICAqIHRlc3RzL0ND T2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwOgorICAgICAgICAqIHRlc3RzL0NDVGlsZWRMYXllclRl c3RDb21tb24uaDoKKyAgICAgICAgKEZha2VUaWxlZExheWVyQ2hyb21pdW0pOgorICAgICAgICAq IHRlc3RzL0xheWVyQ2hyb21pdW1UZXN0LmNwcDoKKyAgICAgICAgKiB0ZXN0cy9UcmVlU3luY2hy b25pemVyVGVzdC5jcHA6CisKKzIwMTItMDQtMTAgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNo cm9taXVtLm9yZz4KKwogICAgICAgICBbY2hyb21pdW1dIEZvbGQgTGF5ZXJDaHJvbWl1bTo6dXBk YXRlQ29tcG9zaXRvclJlc291cmNlcyBpbnRvIG1haW4gdXBkYXRlCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzUzMAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXMyRExheWVyQ2hyb21p dW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJE TGF5ZXJDaHJvbWl1bS5oCmluZGV4IGEyMmY5N2ViZGI3ODE1ZmE0MzNlMDJkOWNjYjQxYjIxMzYx MjY1MDUuLjc1MzIyMmU0NmJjNTg2MzAwOTAxZGVlNzAyYWIzY2UyODU2YjA0MDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhczJETGF5 ZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0NhbnZhczJETGF5ZXJDaHJvbWl1bS5oCkBAIC01MiwxMiArNTIsMTIgQEAgcHVibGljOgog CiAgICAgdm9pZCBzZXRUZXh0dXJlSWQodW5zaWduZWQpOwogCi0gICAgdmlydHVhbCB2b2lkIHNl dE5lZWRzRGlzcGxheVJlY3QoY29uc3QgRmxvYXRSZWN0Jik7CisgICAgdmlydHVhbCB2b2lkIHNl dE5lZWRzRGlzcGxheVJlY3QoY29uc3QgRmxvYXRSZWN0JikgT1ZFUlJJREU7CiAKLSAgICB2aXJ0 dWFsIGJvb2wgZHJhd3NDb250ZW50KCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZShD Q1RleHR1cmVVcGRhdGVyJiwgY29uc3QgQ0NPY2NsdXNpb25UcmFja2VyKik7Ci0gICAgdmlydHVh bCB2b2lkIHB1c2hQcm9wZXJ0aWVzVG8oQ0NMYXllckltcGwqKTsKLSAgICB2aXJ0dWFsIHZvaWQg dW5yZXNlcnZlQ29udGVudHNUZXh0dXJlKCk7CisgICAgdmlydHVhbCBib29sIGRyYXdzQ29udGVu dCgpIGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoQ0NUZXh0dXJlVXBk YXRlciYsIGNvbnN0IENDT2NjbHVzaW9uVHJhY2tlciopIE9WRVJSSURFOworICAgIHZpcnR1YWwg dm9pZCBwdXNoUHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKikgT1ZFUlJJREU7CisgICAgdmlydHVh bCB2b2lkIHVucmVzZXJ2ZUNvbnRlbnRzVGV4dHVyZSgpIE9WRVJSSURFOwogCiAgICAgdm9pZCBz ZXRDYW52YXMoU2tDYW52YXMqKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ2FudmFzTGF5ZXJDaHJvbWl1bS5oCmluZGV4 IDcyMmNjMWE2NjczODliMzU3MTA1ODI1MjhiNmQxY2M3NjNhMzU3NDUuLmFjZTNkMzVmMjY5MzJh NDZhNzVmN2U0MWUxNjc4YjMzN2NiY2I3NTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NhbnZhc0xheWVyQ2hyb21pdW0uaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9DYW52YXNMYXllckNocm9taXVt LmgKQEAgLTQxLDcgKzQxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gQmFzZSBjbGFzcyBm b3IgV2ViR0wgYW5kIGFjY2VsZXJhdGVkIDJkIGNhbnZhc2VzLgogY2xhc3MgQ2FudmFzTGF5ZXJD aHJvbWl1bSA6IHB1YmxpYyBMYXllckNocm9taXVtIHsKIHB1YmxpYzoKLSAgICB2aXJ0dWFsIFBh c3NPd25QdHI8Q0NMYXllckltcGw+IGNyZWF0ZUNDTGF5ZXJJbXBsKCk7CisgICAgdmlydHVhbCBQ YXNzT3duUHRyPENDTGF5ZXJJbXBsPiBjcmVhdGVDQ0xheWVySW1wbCgpIE9WRVJSSURFOwogCiBw cm90ZWN0ZWQ6CiAgICAgQ2FudmFzTGF5ZXJDaHJvbWl1bSgpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hyb21pdW0u aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0NvbnRlbnRMYXll ckNocm9taXVtLmgKaW5kZXggNDczYjM4MGZhZjM1NTAxOGQ3MWRhYTg3MjdkNGJmNjM1ZGExZWJh MC4uMGNkMWQ3OGQ4NTM5YTZmODY3NDBlZGMwMzQyZGFkMjJmMzRjMDA1MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vQ29udGVudExheWVyQ2hy b21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9D b250ZW50TGF5ZXJDaHJvbWl1bS5oCkBAIC01NywxOSArNTcsMTkgQEAgcHVibGljOgogCiAgICAg dm9pZCBjbGVhckRlbGVnYXRlKCkgeyBtX2RlbGVnYXRlID0gMDsgfQogCi0gICAgdmlydHVhbCBi b29sIGRyYXdzQ29udGVudCgpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoQ0NUZXh0 dXJlVXBkYXRlciYsIGNvbnN0IENDT2NjbHVzaW9uVHJhY2tlciopOwotICAgIHZpcnR1YWwgdm9p ZCBpZGxlVXBkYXRlKENDVGV4dHVyZVVwZGF0ZXImLCBjb25zdCBDQ09jY2x1c2lvblRyYWNrZXIq KTsKKyAgICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250ZW50KCkgY29uc3QgT1ZFUlJJREU7CisgICAg dmlydHVhbCB2b2lkIHVwZGF0ZShDQ1RleHR1cmVVcGRhdGVyJiwgY29uc3QgQ0NPY2NsdXNpb25U cmFja2VyKikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGlkbGVVcGRhdGUoQ0NUZXh0dXJl VXBkYXRlciYsIGNvbnN0IENDT2NjbHVzaW9uVHJhY2tlciopIE9WRVJSSURFOwogCi0gICAgdmly dHVhbCB2b2lkIHNldE9wYXF1ZShib29sKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0T3BhcXVlKGJv b2wpIE9WRVJSSURFOwogCiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgQ29udGVudExheWVyQ2hy b21pdW0oQ29udGVudExheWVyRGVsZWdhdGUqKTsKIAogCiBwcml2YXRlOgotICAgIHZpcnR1YWwg TGF5ZXJUZXh0dXJlVXBkYXRlciogdGV4dHVyZVVwZGF0ZXIoKSBjb25zdCB7IHJldHVybiBtX3Rl eHR1cmVVcGRhdGVyLmdldCgpOyB9Ci0gICAgdmlydHVhbCB2b2lkIGNyZWF0ZVRleHR1cmVVcGRh dGVySWZOZWVkZWQoKTsKKyAgICB2aXJ0dWFsIExheWVyVGV4dHVyZVVwZGF0ZXIqIHRleHR1cmVV cGRhdGVyKCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gbV90ZXh0dXJlVXBkYXRlci5nZXQoKTsg fQorICAgIHZpcnR1YWwgdm9pZCBjcmVhdGVUZXh0dXJlVXBkYXRlcklmTmVlZGVkKCkgT1ZFUlJJ REU7CiAKICAgICBDb250ZW50TGF5ZXJEZWxlZ2F0ZSogbV9kZWxlZ2F0ZTsKICAgICBSZWZQdHI8 TGF5ZXJUZXh0dXJlVXBkYXRlcj4gbV90ZXh0dXJlVXBkYXRlcjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlTGF5ZXJDaHJvbWl1bS5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNo cm9taXVtLmgKaW5kZXggNDk0ODhjZDA4MDQyMWQ0YzE4Yjk4OWJjNjk0YjcyMGIyMWI5Njc2Ny4u ZjA4NGQ0Y2I3YjE3ZTQ1ZDAzZDlhYmM5NjMzYjZjMjY4ZjMxZmVkYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VMYXllckNocm9taXVt LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VM YXllckNocm9taXVtLmgKQEAgLTQ4LDkgKzQ4LDkgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNz UmVmUHRyPEltYWdlTGF5ZXJDaHJvbWl1bT4gY3JlYXRlKCk7CiAgICAgdmlydHVhbCB+SW1hZ2VM YXllckNocm9taXVtKCk7CiAKLSAgICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250ZW50KCkgY29uc3Q7 Ci0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZShDQ1RleHR1cmVVcGRhdGVyJiwgY29uc3QgQ0NPY2Ns dXNpb25UcmFja2VyKik7Ci0gICAgdmlydHVhbCBib29sIG5lZWRzQ29udGVudHNTY2FsZSgpIGNv bnN0OworICAgIHZpcnR1YWwgYm9vbCBkcmF3c0NvbnRlbnQoKSBjb25zdCBPVkVSUklERTsKKyAg ICB2aXJ0dWFsIHZvaWQgdXBkYXRlKENDVGV4dHVyZVVwZGF0ZXImLCBjb25zdCBDQ09jY2x1c2lv blRyYWNrZXIqKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wgbmVlZHNDb250ZW50c1NjYWxl KCkgY29uc3QgT1ZFUlJJREU7CiAKICAgICB2b2lkIHNldENvbnRlbnRzKEltYWdlKiBpbWFnZSk7 CiAKQEAgLTU5LDkgKzU5LDkgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0VGlsaW5nT3B0aW9u KFRpbGluZ09wdGlvbik7CiAKLSAgICB2aXJ0dWFsIExheWVyVGV4dHVyZVVwZGF0ZXIqIHRleHR1 cmVVcGRhdGVyKCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIGNyZWF0ZVRleHR1cmVVcGRhdGVy SWZOZWVkZWQoKTsKLSAgICB2aXJ0dWFsIEludFNpemUgY29udGVudEJvdW5kcygpIGNvbnN0Owor ICAgIHZpcnR1YWwgTGF5ZXJUZXh0dXJlVXBkYXRlciogdGV4dHVyZVVwZGF0ZXIoKSBjb25zdCBP VkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlVGV4dHVyZVVwZGF0ZXJJZk5lZWRlZCgp IE9WRVJSSURFOworICAgIHZpcnR1YWwgSW50U2l6ZSBjb250ZW50Qm91bmRzKCkgY29uc3QgT1ZF UlJJREU7CiAKICAgICBOYXRpdmVJbWFnZVB0ciBtX2ltYWdlRm9yQ3VycmVudEZyYW1lOwogICAg IFJlZlB0cjxJbWFnZT4gbV9jb250ZW50czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1BsdWdpbkxheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1BsdWdpbkxheWVyQ2hyb21pdW0uaApp bmRleCBhZjAwNDQ5MzgzMGEzYWE2YjM4NWE0MDc0ODdmZTcyYjExMjIzN2VhLi4yNmI1OGQzMTE4 YTRmM2ZjYmQxMWY4MDBiYmUyNDczMDNmMGI3M2ZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9QbHVnaW5MYXllckNocm9taXVtLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vUGx1Z2luTGF5ZXJDaHJv bWl1bS5oCkBAIC0zOCw3ICszOCw3IEBAIGNsYXNzIFBsdWdpbkxheWVyQ2hyb21pdW0gOiBwdWJs aWMgTGF5ZXJDaHJvbWl1bSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8UGx1Z2lu TGF5ZXJDaHJvbWl1bT4gY3JlYXRlKCk7CiAKLSAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q0NMYXll ckltcGw+IGNyZWF0ZUNDTGF5ZXJJbXBsKCk7CisgICAgdmlydHVhbCBQYXNzT3duUHRyPENDTGF5 ZXJJbXBsPiBjcmVhdGVDQ0xheWVySW1wbCgpIE9WRVJSSURFOwogCiAgICAgLy8gQ29kZSBwYXRo IGZvciBwbHVnaW5zIHdoaWNoIHN1cHBseSB0aGVpciBvd24gdGV4dHVyZSBJRC4KICAgICB2b2lk IHNldFRleHR1cmVJZCh1bnNpZ25lZCB0ZXh0dXJlSWQpOwpAQCAtNTIsNyArNTIsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCBzZXRJT1N1cmZhY2VQcm9wZXJ0aWVzKGludCB3aWR0aCwgaW50IGhlaWdo dCwgdWludDMyX3QgaW9TdXJmYWNlSWQpOwogICAgIHVpbnQzMl90IGdldElPU3VyZmFjZUlkKCkg Y29uc3Q7CiAKLSAgICB2aXJ0dWFsIHZvaWQgcHVzaFByb3BlcnRpZXNUbyhDQ0xheWVySW1wbCop OworICAgIHZpcnR1YWwgdm9pZCBwdXNoUHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKikgT1ZFUlJJ REU7CiAKIHByb3RlY3RlZDoKICAgICBQbHVnaW5MYXllckNocm9taXVtKCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9UaWxlZExheWVyQ2hy b21pdW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVk TGF5ZXJDaHJvbWl1bS5oCmluZGV4IDYwNjA4OTNlY2IzZDI4ZDE1ODcxY2MwNmI4ZDMxMzc1ZTFl OWVlOTYuLjEwMmY1MzJmMGVlNzEzYWJhZjQzN2U5Zjg5NzBlOWNjMWZjODYzMGUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL1RpbGVkTGF5ZXJD aHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L1RpbGVkTGF5ZXJDaHJvbWl1bS5oCkBAIC00MiwyOCArNDIsMjggQEAgcHVibGljOgogCiAgICAg dmlydHVhbCB+VGlsZWRMYXllckNocm9taXVtKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0SXNN YXNrKGJvb2wpOworICAgIHZpcnR1YWwgdm9pZCBzZXRJc01hc2soYm9vbCkgT1ZFUlJJREU7CiAK LSAgICB2aXJ0dWFsIHZvaWQgcHVzaFByb3BlcnRpZXNUbyhDQ0xheWVySW1wbCopOworICAgIHZp cnR1YWwgdm9pZCBwdXNoUHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKikgT1ZFUlJJREU7CiAKLSAg ICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250ZW50KCkgY29uc3Q7Ci0gICAgdmlydHVhbCBib29sIG5l ZWRzQ29udGVudHNTY2FsZSgpIGNvbnN0OworICAgIHZpcnR1YWwgYm9vbCBkcmF3c0NvbnRlbnQo KSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIGJvb2wgbmVlZHNDb250ZW50c1NjYWxlKCkg Y29uc3QgT1ZFUlJJREU7CiAKLSAgICB2aXJ0dWFsIEludFNpemUgY29udGVudEJvdW5kcygpIGNv bnN0OworICAgIHZpcnR1YWwgSW50U2l6ZSBjb250ZW50Qm91bmRzKCkgY29uc3QgT1ZFUlJJREU7 CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNEaXNwbGF5UmVjdChjb25zdCBGbG9hdFJlY3Qm KTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNEaXNwbGF5UmVjdChjb25zdCBGbG9hdFJlY3Qm KSBPVkVSUklERTsKIAotICAgIHZpcnR1YWwgdm9pZCBzZXRJc05vbkNvbXBvc2l0ZWRDb250ZW50 KGJvb2wpOworICAgIHZpcnR1YWwgdm9pZCBzZXRJc05vbkNvbXBvc2l0ZWRDb250ZW50KGJvb2wp IE9WRVJSSURFOwogCi0gICAgdmlydHVhbCB2b2lkIHNldExheWVyVHJlZUhvc3QoQ0NMYXllclRy ZWVIb3N0Kik7CisgICAgdmlydHVhbCB2b2lkIHNldExheWVyVHJlZUhvc3QoQ0NMYXllclRyZWVI b3N0KikgT1ZFUlJJREU7CiAKICAgICAvLyBSZXNlcnZlcyBhbGwgZXhpc3RpbmcgYW5kIHZhbGlk IHRpbGUgdGV4dHVyZXMgdG8gcHJvdGVjdCB0aGVtIGZyb20gYmVpbmcKICAgICAvLyByZWN5Y2xl ZCBieSB0aGUgdGV4dHVyZSBtYW5hZ2VyLgogICAgIHZvaWQgcHJvdGVjdFRpbGVUZXh0dXJlcyhj b25zdCBJbnRSZWN0JiBsYXllclJlY3QpOwogCi0gICAgdmlydHVhbCB2b2lkIHJlc2VydmVUZXh0 dXJlcygpOworICAgIHZpcnR1YWwgdm9pZCByZXNlcnZlVGV4dHVyZXMoKSBPVkVSUklERTsKIAot ICAgIHZpcnR1YWwgUmVnaW9uIHZpc2libGVDb250ZW50T3BhcXVlUmVnaW9uKCkgY29uc3Q7Cisg ICAgdmlydHVhbCBSZWdpb24gdmlzaWJsZUNvbnRlbnRPcGFxdWVSZWdpb24oKSBjb25zdCBPVkVS UklERTsKIAogcHJvdGVjdGVkOgogICAgIFRpbGVkTGF5ZXJDaHJvbWl1bSgpOwpAQCAtMTAwLDEy ICsxMDAsMTMgQEAgcHJvdGVjdGVkOgogCiAgICAgYm9vbCBza2lwc0RyYXcoKSBjb25zdCB7IHJl dHVybiBtX3NraXBzRHJhdzsgfQogCi0gICAgdmlydHVhbCB2b2lkIHByb3RlY3RWaXNpYmxlVGls ZVRleHR1cmVzKCk7CisgICAgdmlydHVhbCB2b2lkIHByb3RlY3RWaXNpYmxlVGlsZVRleHR1cmVz KCkgT1ZFUlJJREU7CiAKKyAgICAvLyBWaXJ0dWFsIGZvciB0ZXN0aW5nCiAgICAgdmlydHVhbCBU ZXh0dXJlTWFuYWdlciogdGV4dHVyZU1hbmFnZXIoKSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICB2 aXJ0dWFsIFBhc3NPd25QdHI8Q0NMYXllckltcGw+IGNyZWF0ZUNDTGF5ZXJJbXBsKCk7CisgICAg dmlydHVhbCBQYXNzT3duUHRyPENDTGF5ZXJJbXBsPiBjcmVhdGVDQ0xheWVySW1wbCgpIE9WRVJS SURFOwogCiAgICAgdm9pZCBjcmVhdGVUaWxlcklmTmVlZGVkKCk7CiAgICAgdm9pZCBzZXRUaWxp bmdPcHRpb24oVGlsaW5nT3B0aW9uKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL1ZpZGVvTGF5ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmgKaW5kZXgg MWYyZTkyMDEyNGZjNGYwMDYyZTJkNjUyNmI2MDJlY2NkNGFjN2JmMy4uYzQ1ZDhmZTNhODQzZmU3 YzJlZTZmMDY4ZGIyZjI2MzE3ZTY5MjliMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vVmlkZW9MYXllckNocm9taXVtLmgK QEAgLTQ4LDcgKzQ4LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFZpZGVvTGF5 ZXJDaHJvbWl1bT4gY3JlYXRlKFZpZGVvRnJhbWVQcm92aWRlciogPSAwKTsKICAgICB2aXJ0dWFs IH5WaWRlb0xheWVyQ2hyb21pdW0oKTsKIAotICAgIHZpcnR1YWwgUGFzc093blB0cjxDQ0xheWVy SW1wbD4gY3JlYXRlQ0NMYXllckltcGwoKTsKKyAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q0NMYXll ckltcGw+IGNyZWF0ZUNDTGF5ZXJJbXBsKCkgT1ZFUlJJREU7CiAKIHByaXZhdGU6CiAgICAgZXhw bGljaXQgVmlkZW9MYXllckNocm9taXVtKFZpZGVvRnJhbWVQcm92aWRlciopOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vV2ViR0xMYXllckNo cm9taXVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJH TExheWVyQ2hyb21pdW0uaAppbmRleCBkYjgyMWQwOTA2NWJmMjg5MjY0YTU1ZTljNzYxMWI1Y2Iz YTc5MTFiLi5mMjk1ZmI4MmRjMzNlYzQ0ODcyYjZjOWJkMDE4NjFhMjRjMTcyOWMzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9XZWJHTExheWVy Q2hyb21pdW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9XZWJHTExheWVyQ2hyb21pdW0uaApAQCAtNDksMTAgKzQ5LDEwIEBAIHB1YmxpYzoKIAogICAg IHZpcnR1YWwgfldlYkdMTGF5ZXJDaHJvbWl1bSgpOwogCi0gICAgdmlydHVhbCBib29sIGRyYXdz Q29udGVudCgpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoQ0NUZXh0dXJlVXBkYXRl ciYsIGNvbnN0IENDT2NjbHVzaW9uVHJhY2tlciopOwotICAgIHZpcnR1YWwgdm9pZCBwdXNoUHJv cGVydGllc1RvKENDTGF5ZXJJbXBsKik7Ci0gICAgdmlydHVhbCB2b2lkIHNldE5lZWRzRGlzcGxh eVJlY3QoY29uc3QgRmxvYXRSZWN0Jik7CisgICAgdmlydHVhbCBib29sIGRyYXdzQ29udGVudCgp IGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoQ0NUZXh0dXJlVXBkYXRl ciYsIGNvbnN0IENDT2NjbHVzaW9uVHJhY2tlciopIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9p ZCBwdXNoUHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKikgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2 b2lkIHNldE5lZWRzRGlzcGxheVJlY3QoY29uc3QgRmxvYXRSZWN0JikgT1ZFUlJJREU7CiAgICAg Ym9vbCBwYWludFJlbmRlcmVkUmVzdWx0c1RvQ2FudmFzKEltYWdlQnVmZmVyKik7CiAKICAgICBH cmFwaGljc0NvbnRleHQzRCogY29udGV4dCgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxiYXJMYXllckltcGwu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU2Nyb2xs YmFyTGF5ZXJJbXBsLmgKaW5kZXggZDBjZGE4ZjY5OGYzZTA0OWZmYzEwMDkwZjExYzQyNjJmNzBi ZDVjMS4uZjdmOTVhYjRmYTY3NzRkOGQ2Y2M4YjY2YmQ4MTUzOWZlZWFmZGZlOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NTY3JvbGxi YXJMYXllckltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9jYy9DQ1Njcm9sbGJhckxheWVySW1wbC5oCkBAIC01OSw5ICs1OSw5IEBAIHB1YmxpYzoK ICAgICBDQ0xheWVySW1wbCogc2Nyb2xsTGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbExh eWVyOyB9CiAgICAgdm9pZCBzZXRTY3JvbGxMYXllcihDQ0xheWVySW1wbCogc2Nyb2xsTGF5ZXIp IHsgbV9zY3JvbGxMYXllciA9IHNjcm9sbExheWVyOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgd2ls bERyYXcoTGF5ZXJSZW5kZXJlckNocm9taXVtKik7Ci0gICAgdmlydHVhbCB2b2lkIGFwcGVuZFF1 YWRzKENDUXVhZEN1bGxlciYsIGNvbnN0IENDU2hhcmVkUXVhZFN0YXRlKiwgYm9vbCYgdXNlZENo ZWNrZXJib2FyZCk7Ci0gICAgdmlydHVhbCB2b2lkIGRpZERyYXcoKTsKKyAgICB2aXJ0dWFsIHZv aWQgd2lsbERyYXcoTGF5ZXJSZW5kZXJlckNocm9taXVtKikgT1ZFUlJJREU7CisgICAgdmlydHVh bCB2b2lkIGFwcGVuZFF1YWRzKENDUXVhZEN1bGxlciYsIGNvbnN0IENDU2hhcmVkUXVhZFN0YXRl KiwgYm9vbCYgdXNlZENoZWNrZXJib2FyZCkgT1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIGRp ZERyYXcoKSBPVkVSUklERTsKIAogcHJvdGVjdGVkOgogICAgIGV4cGxpY2l0IENDU2Nyb2xsYmFy TGF5ZXJJbXBsKGludCBpZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ1NvbGlkQ29sb3JMYXllckltcGwuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU29saWRDb2xvckxheWVySW1wbC5o CmluZGV4IDEwYzZhZGUzZjQ3M2I1NGRiYmE3OTA0NTNmMmMwZGU4YTViNmFjZTkuLjc4ZjdmNzRl OWU2OTZlZDBlMzY3Mjg4YzVhODNjMGExYTk1MzNlZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU29saWRDb2xvckxheWVySW1wbC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDU29s aWRDb2xvckxheWVySW1wbC5oCkBAIC00MSwxNCArNDEsMTQgQEAgcHVibGljOgogICAgIH0KICAg ICB2aXJ0dWFsIH5DQ1NvbGlkQ29sb3JMYXllckltcGwoKTsKIAotICAgIHZpcnR1YWwgVHJhbnNm b3JtYXRpb25NYXRyaXggcXVhZFRyYW5zZm9ybSgpIGNvbnN0OwotICAgIHZpcnR1YWwgdm9pZCBh cHBlbmRRdWFkcyhDQ1F1YWRDdWxsZXImLCBjb25zdCBDQ1NoYXJlZFF1YWRTdGF0ZSosIGJvb2wm IHVzZWRDaGVja2VyYm9hcmQpOworICAgIHZpcnR1YWwgVHJhbnNmb3JtYXRpb25NYXRyaXggcXVh ZFRyYW5zZm9ybSgpIGNvbnN0IE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBhcHBlbmRRdWFk cyhDQ1F1YWRDdWxsZXImLCBjb25zdCBDQ1NoYXJlZFF1YWRTdGF0ZSosIGJvb2wmIHVzZWRDaGVj a2VyYm9hcmQpIE9WRVJSSURFOwogCiBwcm90ZWN0ZWQ6CiAgICAgZXhwbGljaXQgQ0NTb2xpZENv bG9yTGF5ZXJJbXBsKGludCBpZCk7CiAKIHByaXZhdGU6Ci0gICAgdmlydHVhbCBjb25zdCBjaGFy KiBsYXllclR5cGVBc1N0cmluZygpIGNvbnN0IHsgcmV0dXJuICJTb2xpZENvbG9yTGF5ZXIiOyB9 CisgICAgdmlydHVhbCBjb25zdCBjaGFyKiBsYXllclR5cGVBc1N0cmluZygpIGNvbnN0IE9WRVJS SURFIHsgcmV0dXJuICJTb2xpZENvbG9yTGF5ZXIiOyB9CiAKICAgICBjb25zdCBpbnQgbV90aWxl U2l6ZTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9jYy9DQ1RleHR1cmVMYXllckltcGwuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGV4dHVyZUxheWVySW1wbC5oCmluZGV4IDkyZDFhOTBi OWZmY2Q1NDgyMTFiYzhjNjUxOTYxY2RhYjM2N2M5ZjMuLmYzZDc1YjliMzkwYmY2NjU1MDA2ZmJm MjhiN2U5YTFkNDY4M2ZlN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL2NjL0NDVGV4dHVyZUxheWVySW1wbC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGV4dHVyZUxheWVySW1wbC5oCkBA IC00MCw3ICs0MCw3IEBAIHB1YmxpYzoKICAgICB9CiAgICAgdmlydHVhbCB+Q0NUZXh0dXJlTGF5 ZXJJbXBsKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kUXVhZHMoQ0NRdWFkQ3VsbGVyJiwg Y29uc3QgQ0NTaGFyZWRRdWFkU3RhdGUqLCBib29sJiB1c2VkQ2hlY2tlcmJvYXJkKTsKKyAgICB2 aXJ0dWFsIHZvaWQgYXBwZW5kUXVhZHMoQ0NRdWFkQ3VsbGVyJiwgY29uc3QgQ0NTaGFyZWRRdWFk U3RhdGUqLCBib29sJiB1c2VkQ2hlY2tlcmJvYXJkKSBPVkVSUklERTsKIAogICAgIHR5cGVkZWYg UHJvZ3JhbUJpbmRpbmc8VmVydGV4U2hhZGVyUG9zVGV4LCBGcmFnbWVudFNoYWRlclJHQkFUZXhG bGlwQWxwaGE+IFByb2dyYW1GbGlwOwogICAgIHR5cGVkZWYgUHJvZ3JhbUJpbmRpbmc8VmVydGV4 U2hhZGVyUG9zVGV4U3RyZXRjaCwgRnJhZ21lbnRTaGFkZXJSR0JBVGV4QWxwaGE+IFByb2dyYW1T dHJldGNoOwpAQCAtNDgsMTAgKzQ4LDEwIEBAIHB1YmxpYzoKICAgICB0eXBlZGVmIFByb2dyYW1C aW5kaW5nPFZlcnRleFNoYWRlclBvc1RleFRyYW5zZm9ybSwgRnJhZ21lbnRTaGFkZXJSR0JBVGV4 UmVjdEFscGhhPiBUZXhSZWN0UHJvZ3JhbTsKICAgICB0eXBlZGVmIFByb2dyYW1CaW5kaW5nPFZl cnRleFNoYWRlclBvc1RleFRyYW5zZm9ybSwgRnJhZ21lbnRTaGFkZXJSR0JBVGV4UmVjdEZsaXBB bHBoYT4gVGV4UmVjdFByb2dyYW1GbGlwOwogCi0gICAgdmlydHVhbCB2b2lkIHdpbGxEcmF3KExh eWVyUmVuZGVyZXJDaHJvbWl1bSopOwotICAgIHZpcnR1YWwgdm9pZCBkaWRMb3NlQ29udGV4dCgp OworICAgIHZpcnR1YWwgdm9pZCB3aWxsRHJhdyhMYXllclJlbmRlcmVyQ2hyb21pdW0qKSBPVkVS UklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkTG9zZUNvbnRleHQoKSBPVkVSUklERTsKIAotICAg IHZpcnR1YWwgdm9pZCBkdW1wTGF5ZXJQcm9wZXJ0aWVzKFRleHRTdHJlYW0mLCBpbnQgaW5kZW50 KSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgZHVtcExheWVyUHJvcGVydGllcyhUZXh0U3RyZWFt JiwgaW50IGluZGVudCkgY29uc3QgT1ZFUlJJREU7CiAKICAgICB1bnNpZ25lZCB0ZXh0dXJlSWQo KSBjb25zdCB7IHJldHVybiBtX3RleHR1cmVJZDsgfQogICAgIHZvaWQgc2V0VGV4dHVyZUlkKHVu c2lnbmVkIGlkKSB7IG1fdGV4dHVyZUlkID0gaWQ7IH0KQEAgLTY1LDcgKzY1LDcgQEAgcHVibGlj OgogcHJpdmF0ZToKICAgICBleHBsaWNpdCBDQ1RleHR1cmVMYXllckltcGwoaW50KTsKIAotICAg IHZpcnR1YWwgY29uc3QgY2hhciogbGF5ZXJUeXBlQXNTdHJpbmcoKSBjb25zdCB7IHJldHVybiAi VGV4dHVyZUxheWVyIjsgfQorICAgIHZpcnR1YWwgY29uc3QgY2hhciogbGF5ZXJUeXBlQXNTdHJp bmcoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiAiVGV4dHVyZUxheWVyIjsgfQogCiAgICAgdW5z aWduZWQgbV90ZXh0dXJlSWQ7CiAgICAgYm9vbCBtX2hhc0FscGhhOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaWxlZExheWVySW1w bC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NUaWxl ZExheWVySW1wbC5oCmluZGV4IDM3OTBmYWU1YTY2ODU4YjI4YzBlNjRlNDI3NmM0MDVkMWMyNjcz MDYuLjk0Njc2OGYwYzBjMDg4ODZlNDA2MTUzMmMyOTFhODVmMTg4ZmQ2MDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVGlsZWRMYXll ckltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9j Yy9DQ1RpbGVkTGF5ZXJJbXBsLmgKQEAgLTQzLDExICs0MywxMSBAQCBwdWJsaWM6CiAgICAgfQog ICAgIHZpcnR1YWwgfkNDVGlsZWRMYXllckltcGwoKTsKIAotICAgIHZpcnR1YWwgdm9pZCBhcHBl bmRRdWFkcyhDQ1F1YWRDdWxsZXImLCBjb25zdCBDQ1NoYXJlZFF1YWRTdGF0ZSosIGJvb2wmIHVz ZWRDaGVja2VyYm9hcmQpOworICAgIHZpcnR1YWwgdm9pZCBhcHBlbmRRdWFkcyhDQ1F1YWRDdWxs ZXImLCBjb25zdCBDQ1NoYXJlZFF1YWRTdGF0ZSosIGJvb2wmIHVzZWRDaGVja2VyYm9hcmQpIE9W RVJSSURFOwogCi0gICAgdmlydHVhbCB2b2lkIGJpbmRDb250ZW50c1RleHR1cmUoTGF5ZXJSZW5k ZXJlckNocm9taXVtKik7CisgICAgdmlydHVhbCB2b2lkIGJpbmRDb250ZW50c1RleHR1cmUoTGF5 ZXJSZW5kZXJlckNocm9taXVtKikgT1ZFUlJJREU7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZHVtcExh eWVyUHJvcGVydGllcyhUZXh0U3RyZWFtJiwgaW50IGluZGVudCkgY29uc3Q7CisgICAgdmlydHVh bCB2b2lkIGR1bXBMYXllclByb3BlcnRpZXMoVGV4dFN0cmVhbSYsIGludCBpbmRlbnQpIGNvbnN0 IE9WRVJSSURFOwogCiAgICAgdm9pZCBzZXRTa2lwc0RyYXcoYm9vbCBza2lwc0RyYXcpIHsgbV9z a2lwc0RyYXcgPSBza2lwc0RyYXc7IH0KICAgICB2b2lkIHNldFRpbGluZ0RhdGEoY29uc3QgQ0NM YXllclRpbGluZ0RhdGEmIHRpbGVyKTsKQEAgLTU2LDcgKzU2LDcgQEAgcHVibGljOgogICAgIHZv aWQgc2V0Q29udGVudHNTd2l6emxlZChib29sIGNvbnRlbnRzU3dpenpsZWQpIHsgbV9jb250ZW50 c1N3aXp6bGVkID0gY29udGVudHNTd2l6emxlZDsgfQogICAgIGJvb2wgY29udGVudHNTd2l6emxl ZCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudHNTd2l6emxlZDsgfQogCi0gICAgdmlydHVhbCBS ZWdpb24gdmlzaWJsZUNvbnRlbnRPcGFxdWVSZWdpb24oKSBjb25zdDsKKyAgICB2aXJ0dWFsIFJl Z2lvbiB2aXNpYmxlQ29udGVudE9wYXF1ZVJlZ2lvbigpIGNvbnN0IE9WRVJSSURFOwogCiAgICAg dHlwZWRlZiBQcm9ncmFtQmluZGluZzxWZXJ0ZXhTaGFkZXJUaWxlLCBGcmFnbWVudFNoYWRlclJH QkFUZXhBbHBoYT4gUHJvZ3JhbTsKICAgICAvLyBTaGFkZXIgcHJvZ3JhbSB0aGF0IHN3YXBzIHJl ZCBhbmQgYmx1ZSBjb21wb25lbnRzIG9mIHRleHR1cmUuCkBAIC03NywxMSArNzcsMTEgQEAgcHJv dGVjdGVkOgogICAgIGJvb2wgaGFzVGlsZUF0KGludCwgaW50KSBjb25zdDsKICAgICBib29sIGhh c1RleHR1cmVJZEZvclRpbGVBdChpbnQsIGludCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIFRyYW5z Zm9ybWF0aW9uTWF0cml4IHF1YWRUcmFuc2Zvcm0oKSBjb25zdDsKKyAgICB2aXJ0dWFsIFRyYW5z Zm9ybWF0aW9uTWF0cml4IHF1YWRUcmFuc2Zvcm0oKSBjb25zdCBPVkVSUklERTsKIAogcHJpdmF0 ZToKIAotICAgIHZpcnR1YWwgY29uc3QgY2hhciogbGF5ZXJUeXBlQXNTdHJpbmcoKSBjb25zdCB7 IHJldHVybiAiQ29udGVudExheWVyIjsgfQorICAgIHZpcnR1YWwgY29uc3QgY2hhciogbGF5ZXJU eXBlQXNTdHJpbmcoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiAiQ29udGVudExheWVyIjsgfQog CiAgICAgRHJhd2FibGVUaWxlKiB0aWxlQXQoaW50LCBpbnQpIGNvbnN0OwogICAgIERyYXdhYmxl VGlsZSogY3JlYXRlVGlsZShpbnQsIGludCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1ZpZGVvTGF5ZXJJbXBsLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ1ZpZGVvTGF5ZXJJbXBsLmgK aW5kZXggZGRiMjc5YzgzYWZlZmQ4N2RmMzY2NzYxZTExY2U2YTg5ZjdhZTNhMi4uMmRhNDIyMWJk MzQzMzU0ZTc3NDNhMDgwNTZmYmEyM2RkMTczODlkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NWaWRlb0xheWVySW1wbC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDVmlkZW9MYXll ckltcGwuaApAQCAtNDksMTYgKzQ5LDE2IEBAIHB1YmxpYzoKICAgICB9CiAgICAgdmlydHVhbCB+ Q0NWaWRlb0xheWVySW1wbCgpOwogCi0gICAgdmlydHVhbCB2b2lkIHdpbGxEcmF3KExheWVyUmVu ZGVyZXJDaHJvbWl1bSopOwotICAgIHZpcnR1YWwgdm9pZCBhcHBlbmRRdWFkcyhDQ1F1YWRDdWxs ZXImLCBjb25zdCBDQ1NoYXJlZFF1YWRTdGF0ZSosIGJvb2wmIHVzZWRDaGVja2VyYm9hcmQpOwot ICAgIHZpcnR1YWwgdm9pZCBkaWREcmF3KCk7CisgICAgdmlydHVhbCB2b2lkIHdpbGxEcmF3KExh eWVyUmVuZGVyZXJDaHJvbWl1bSopIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBhcHBlbmRR dWFkcyhDQ1F1YWRDdWxsZXImLCBjb25zdCBDQ1NoYXJlZFF1YWRTdGF0ZSosIGJvb2wmIHVzZWRD aGVja2VyYm9hcmQpIE9WRVJSSURFOworICAgIHZpcnR1YWwgdm9pZCBkaWREcmF3KCkgT1ZFUlJJ REU7CiAKICAgICB0eXBlZGVmIFByb2dyYW1CaW5kaW5nPFZlcnRleFNoYWRlclBvc1RleFRyYW5z Zm9ybSwgRnJhZ21lbnRTaGFkZXJSR0JBVGV4RmxpcEFscGhhPiBSR0JBUHJvZ3JhbTsKICAgICB0 eXBlZGVmIFByb2dyYW1CaW5kaW5nPFZlcnRleFNoYWRlclBvc1RleFlVVlN0cmV0Y2gsIEZyYWdt ZW50U2hhZGVyWVVWVmlkZW8+IFlVVlByb2dyYW07CiAgICAgdHlwZWRlZiBQcm9ncmFtQmluZGlu ZzxWZXJ0ZXhTaGFkZXJQb3NUZXhUcmFuc2Zvcm0sIEZyYWdtZW50U2hhZGVyUkdCQVRleEZsaXBB bHBoYT4gTmF0aXZlVGV4dHVyZVByb2dyYW07CiAgICAgdHlwZWRlZiBQcm9ncmFtQmluZGluZzxW ZXJ0ZXhTaGFkZXJWaWRlb1RyYW5zZm9ybSwgRnJhZ21lbnRTaGFkZXJPRVNJbWFnZUV4dGVybmFs PiBTdHJlYW1UZXh0dXJlUHJvZ3JhbTsKIAotICAgIHZpcnR1YWwgdm9pZCBkdW1wTGF5ZXJQcm9w ZXJ0aWVzKFRleHRTdHJlYW0mLCBpbnQgaW5kZW50KSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQg ZHVtcExheWVyUHJvcGVydGllcyhUZXh0U3RyZWFtJiwgaW50IGluZGVudCkgY29uc3QgT1ZFUlJJ REU7CiAKICAgICBNdXRleCYgcHJvdmlkZXJNdXRleCgpIHsgcmV0dXJuIG1fcHJvdmlkZXJNdXRl eDsgfQogICAgIFZpZGVvRnJhbWVQcm92aWRlciogcHJvdmlkZXIoKSBjb25zdCB7IHJldHVybiBt X3Byb3ZpZGVyOyB9CkBAIC04NCw3ICs4NCw3IEBAIHByaXZhdGU6CiAgICAgZXhwbGljaXQgQ0NW aWRlb0xheWVySW1wbChpbnQsIFZpZGVvRnJhbWVQcm92aWRlciopOwogCiAgICAgc3RhdGljIElu dFNpemUgY29tcHV0ZVZpc2libGVTaXplKGNvbnN0IFZpZGVvRnJhbWVDaHJvbWl1bSosIHVuc2ln bmVkIHBsYW5lKTsKLSAgICB2aXJ0dWFsIGNvbnN0IGNoYXIqIGxheWVyVHlwZUFzU3RyaW5nKCkg Y29uc3QgeyByZXR1cm4gIlZpZGVvTGF5ZXIiOyB9CisgICAgdmlydHVhbCBjb25zdCBjaGFyKiBs YXllclR5cGVBc1N0cmluZygpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuICJWaWRlb0xheWVyIjsg fQogCiAgICAgYm9vbCByZXNlcnZlVGV4dHVyZXMoY29uc3QgVmlkZW9GcmFtZUNocm9taXVtKiwg R0MzRGVudW0gZm9ybWF0LCBMYXllclJlbmRlcmVyQ2hyb21pdW0qKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTGF5ZXJJbXBsLmNwcCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkxheWVySW1wbC5jcHAKaW5kZXggMTM3MjFiZTBjYzVhNWMzN2Yx NjM5Y2FiN2E1MWY5NDYwYzRkNTRlOS4uMTZlMTIwNmNhMzM1YzNlOTgxNGRlYmVjYjRlZDhiYjJi MDJlYjc3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTGF5ZXJJ bXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJMYXllckltcGwuY3Bw CkBAIC00Nyw4ICs0Nyw0IEBAIFdlYkxheWVySW1wbDo6fldlYkxheWVySW1wbCgpCiB7CiB9CiAK LXZvaWQgV2ViTGF5ZXJJbXBsOjpwYWludENvbnRlbnRzKEdyYXBoaWNzQ29udGV4dCYsIGNvbnN0 IEludFJlY3QmIGNsaXApCi17Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTGF5ZXJJbXBsLmggYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3NyYy9XZWJMYXllckltcGwuaAppbmRleCAzODg0YzQyYmNmYWY0Y2ZiNWMx MzNmOGUwZTMyMTZhZTk5ODkxODlkLi43ZTRlNzUwNjI0OGY0Y2E1ZWU2N2U3NTFjMzhlOGViZjRj MTljMTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJMYXllcklt cGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJMYXllckltcGwuaApAQCAt MzgsNyArMzgsNiBAQCBwdWJsaWM6CiBwcm90ZWN0ZWQ6CiAgICAgV2ViTGF5ZXJJbXBsKCk7CiAg ICAgdmlydHVhbCB+V2ViTGF5ZXJJbXBsKCk7Ci0gICAgdmlydHVhbCB2b2lkIHBhaW50Q29udGVu dHMoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgY2xp cCk7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllckl0ZXJhdG9yVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJJdGVyYXRvclRlc3QuY3BwCmluZGV4IDJmNWE3YTI1ZDll ZDE2ZjJjYzQxOTgxY2JjNGEyZTY1NjUyODcxMDguLmY1ZWFlN2Y4NGRkNTEyNWM4MDk5NWI5Y2Q0 MjliOTliY2JmNjkzMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv Q0NMYXllckl0ZXJhdG9yVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0 cy9DQ0xheWVySXRlcmF0b3JUZXN0LmNwcApAQCAtNDcsNyArNDcsNyBAQCBwdWJsaWM6CiAgICAg aW50IG1fY291bnRSZXByZXNlbnRpbmdDb250cmlidXRpbmdTdXJmYWNlOwogICAgIGludCBtX2Nv dW50UmVwcmVzZW50aW5nSXRzZWxmOwogCi0gICAgdmlydHVhbCBib29sIGRyYXdzQ29udGVudCgp IGNvbnN0IHsgcmV0dXJuIG1fZHJhd3NDb250ZW50OyB9CisgICAgdmlydHVhbCBib29sIGRyYXdz Q29udGVudCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIG1fZHJhd3NDb250ZW50OyB9CiAgICAg dm9pZCBzZXREcmF3c0NvbnRlbnQoYm9vbCBkcmF3c0NvbnRlbnQpIHsgbV9kcmF3c0NvbnRlbnQg PSBkcmF3c0NvbnRlbnQ7IH0KIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdC5jcHAgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdENvbW1vblRlc3QuY3BwCmluZGV4IGM5 ZDRkZmM0YTE3NTA5ZTEzYzQzZTI4Zjg2MGEwM2Q0MmEwNGYxMWMuLjM0YjdkOTEzZDk4MjJjMjJm MzMxNjJhMDJlODVhNmUxNjlkYzk4MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0Q29tbW9uVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RDb21tb25UZXN0LmNwcApAQCAtODEsNyAr ODEsNyBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KIAotICAgIHZpcnR1YWwgYm9vbCBkcmF3c0Nv bnRlbnQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CisgICAgdmlydHVhbCBib29sIGRyYXdzQ29u dGVudCgpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KIH07CiAKIFRFU1QoQ0NMYXll clRyZWVIb3N0Q29tbW9uVGVzdCwgdmVyaWZ5VHJhbnNmb3Jtc0Zvck5vT3BMYXllcikKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0SW1wbFRl c3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBs VGVzdC5jcHAKaW5kZXggYzlmMzhhMDFmZGUxZTc5NTIyYTg3ODVmOWMwZGU5MjA3ZDk5Mjc4MC4u ZDJlMTczMmVkMTA0MWFlN2FhN2ZjYTRkOWI3MzdiZTk5ZWE1NDhhZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhvc3RJbXBsVGVzdC5j cHAKQEAgLTU4Nyw3ICs1ODcsNyBAQCBjbGFzcyBCbGVuZFN0YXRlQ2hlY2tMYXllciA6IHB1Ymxp YyBDQ0xheWVySW1wbCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NPd25QdHI8QmxlbmRTdGF0 ZUNoZWNrTGF5ZXI+IGNyZWF0ZShpbnQgaWQpIHsgcmV0dXJuIGFkb3B0UHRyKG5ldyBCbGVuZFN0 YXRlQ2hlY2tMYXllcihpZCkpOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgYXBwZW5kUXVhZHMoQ0NR dWFkQ3VsbGVyJiBxdWFkTGlzdCwgY29uc3QgQ0NTaGFyZWRRdWFkU3RhdGUqIHNoYXJlZFF1YWRT dGF0ZSwgYm9vbCYpCisgICAgdmlydHVhbCB2b2lkIGFwcGVuZFF1YWRzKENDUXVhZEN1bGxlciYg cXVhZExpc3QsIGNvbnN0IENDU2hhcmVkUXVhZFN0YXRlKiBzaGFyZWRRdWFkU3RhdGUsIGJvb2wm KSBPVkVSUklERQogICAgIHsKICAgICAgICAgbV9xdWFkc0FwcGVuZGVkID0gdHJ1ZTsKIApAQCAt MTA2Niw3ICsxMDY2LDcgQEAgY2xhc3MgQ29udGV4dExvc3ROb3RpZmljYXRpb25DaGVja0xheWVy IDogcHVibGljIENDTGF5ZXJJbXBsIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc093blB0cjxD b250ZXh0TG9zdE5vdGlmaWNhdGlvbkNoZWNrTGF5ZXI+IGNyZWF0ZShpbnQgaWQpIHsgcmV0dXJu IGFkb3B0UHRyKG5ldyBDb250ZXh0TG9zdE5vdGlmaWNhdGlvbkNoZWNrTGF5ZXIoaWQpKTsgfQog Ci0gICAgdmlydHVhbCB2b2lkIGRpZExvc2VDb250ZXh0KCkKKyAgICB2aXJ0dWFsIHZvaWQgZGlk TG9zZUNvbnRleHQoKSBPVkVSUklERQogICAgIHsKICAgICAgICAgbV9kaWRMb3NlQ29udGV4dENh bGxlZCA9IHRydWU7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9DQ0xheWVyVHJlZUhvc3RUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NMYXllclRyZWVIb3N0VGVzdC5jcHAKaW5kZXggNjdjNmU5YTlmODZjMTZkMjgxOWJiZTIy MGYxMDgxMDQzNTQ3YmFmMC4uM2I5ZjMxZWFhMmE3YTJhOTRiMDU1MTNjNDI3MzZjMmY5MzlkMzMy NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyVHJlZUhv c3RUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVl SG9zdFRlc3QuY3BwCkBAIC0xNDMwLDEzICsxNDMwLDEzIEBAIHB1YmxpYzoKICAgICBpbnQgaWRs ZVBhaW50Q29udGVudHNDb3VudCgpIHsgcmV0dXJuIG1faWRsZVBhaW50Q29udGVudHNDb3VudDsg fQogICAgIHZvaWQgcmVzZXRQYWludENvbnRlbnRzQ291bnQoKSB7IG1fcGFpbnRDb250ZW50c0Nv dW50ID0gMDsgbV9pZGxlUGFpbnRDb250ZW50c0NvdW50ID0gMDt9CiAKLSAgICB2aXJ0dWFsIHZv aWQgdXBkYXRlKENDVGV4dHVyZVVwZGF0ZXImIHVwZGF0ZXIsIGNvbnN0IENDT2NjbHVzaW9uVHJh Y2tlciogb2NjbHVzaW9uKQorICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoQ0NUZXh0dXJlVXBkYXRl ciYgdXBkYXRlciwgY29uc3QgQ0NPY2NsdXNpb25UcmFja2VyKiBvY2NsdXNpb24pIE9WRVJSSURF CiAgICAgewogICAgICAgICBDb250ZW50TGF5ZXJDaHJvbWl1bTo6dXBkYXRlKHVwZGF0ZXIsIG9j Y2x1c2lvbik7CiAgICAgICAgIG1fcGFpbnRDb250ZW50c0NvdW50Kys7CiAgICAgfQogCi0gICAg dmlydHVhbCB2b2lkIGlkbGVVcGRhdGUoQ0NUZXh0dXJlVXBkYXRlciYgdXBkYXRlciwgY29uc3Qg Q0NPY2NsdXNpb25UcmFja2VyKiBvY2NsdXNpb24pCisgICAgdmlydHVhbCB2b2lkIGlkbGVVcGRh dGUoQ0NUZXh0dXJlVXBkYXRlciYgdXBkYXRlciwgY29uc3QgQ0NPY2NsdXNpb25UcmFja2VyKiBv Y2NsdXNpb24pIE9WRVJSSURFCiAgICAgewogICAgICAgICBDb250ZW50TGF5ZXJDaHJvbWl1bTo6 aWRsZVVwZGF0ZSh1cGRhdGVyLCBvY2NsdXNpb24pOwogICAgICAgICBtX2lkbGVQYWludENvbnRl bnRzQ291bnQrKzsKQEAgLTE3NzgsMTQgKzE3NzgsMTQgQEAgY2xhc3MgVGVzdExheWVyQ2hyb21p dW0gOiBwdWJsaWMgTGF5ZXJDaHJvbWl1bSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQ dHI8VGVzdExheWVyQ2hyb21pdW0+IGNyZWF0ZSgpIHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBUZXN0 TGF5ZXJDaHJvbWl1bSgpKTsgfQogCi0gICAgdmlydHVhbCB2b2lkIHVwZGF0ZShDQ1RleHR1cmVV cGRhdGVyJiwgY29uc3QgQ0NPY2NsdXNpb25UcmFja2VyKiBvY2NsdXNpb24pCisgICAgdmlydHVh bCB2b2lkIHVwZGF0ZShDQ1RleHR1cmVVcGRhdGVyJiwgY29uc3QgQ0NPY2NsdXNpb25UcmFja2Vy KiBvY2NsdXNpb24pIE9WRVJSSURFCiAgICAgewogICAgICAgICAvLyBHYWluIGFjY2VzcyB0byBp bnRlcm5hbHMgb2YgdGhlIENDT2NjbHVzaW9uVHJhY2tlci4KICAgICAgICAgY29uc3QgVGVzdEND T2NjbHVzaW9uVHJhY2tlciogdGVzdE9jY2x1c2lvbiA9IHN0YXRpY19jYXN0PGNvbnN0IFRlc3RD Q09jY2x1c2lvblRyYWNrZXIqPihvY2NsdXNpb24pOwogICAgICAgICBtX29jY2x1ZGVkU2NyZWVu U3BhY2UgPSB0ZXN0T2NjbHVzaW9uID8gdGVzdE9jY2x1c2lvbi0+b2NjbHVzaW9uSW5TY3JlZW5T cGFjZSgpIDogUmVnaW9uKCk7CiAgICAgfQogCi0gICAgdmlydHVhbCBib29sIGRyYXdzQ29udGVu dCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KKyAgICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250ZW50 KCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAgY29uc3QgUmVnaW9uJiBv Y2NsdWRlZFNjcmVlblNwYWNlKCkgY29uc3QgeyByZXR1cm4gbV9vY2NsdWRlZFNjcmVlblNwYWNl OyB9CiAgICAgdm9pZCBjbGVhck9jY2x1ZGVkU2NyZWVuU3BhY2UoKSB7IG1fb2NjbHVkZWRTY3Jl ZW5TcGFjZSA9IFJlZ2lvbigpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0NDT2NjbHVzaW9uVHJhY2tlclRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90ZXN0cy9DQ09jY2x1c2lvblRyYWNrZXJUZXN0LmNwcAppbmRleCAwZWIxZjdkODZjNjEyNGFk NDA3YmNmZjVkZmYwN2E3MDg0MGNkMmEyLi5mZDNmMTRmZjI2ODg3ZTBjNDlkNmMzZmNlNGZkMjZj ZWJkNWRjYjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDT2Nj bHVzaW9uVHJhY2tlclRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv Q0NPY2NsdXNpb25UcmFja2VyVGVzdC5jcHAKQEAgLTYwLDggKzYwLDggQEAgcHVibGljOgogICAg IHsKICAgICB9CiAKLSAgICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250ZW50KCkgY29uc3QgeyByZXR1 cm4gdHJ1ZTsgfQotICAgIHZpcnR1YWwgUmVnaW9uIHZpc2libGVDb250ZW50T3BhcXVlUmVnaW9u KCkgY29uc3QKKyAgICB2aXJ0dWFsIGJvb2wgZHJhd3NDb250ZW50KCkgY29uc3QgT1ZFUlJJREUg eyByZXR1cm4gdHJ1ZTsgfQorICAgIHZpcnR1YWwgUmVnaW9uIHZpc2libGVDb250ZW50T3BhcXVl UmVnaW9uKCkgY29uc3QgT1ZFUlJJREUKICAgICB7CiAgICAgICAgIGlmIChtX292ZXJyaWRlT3Bh cXVlQ29udGVudHNSZWN0KQogICAgICAgICAgICAgcmV0dXJuIGludGVyc2VjdGlvbihtX29wYXF1 ZUNvbnRlbnRzUmVjdCwgdmlzaWJsZUxheWVyUmVjdCgpKTsKQEAgLTg3LDcgKzg3LDcgQEAgcHVi bGljOgogICAgICAgICBzZXREcmF3c0NvbnRlbnQodHJ1ZSk7CiAgICAgfQogCi0gICAgdmlydHVh bCBSZWdpb24gdmlzaWJsZUNvbnRlbnRPcGFxdWVSZWdpb24oKSBjb25zdAorICAgIHZpcnR1YWwg UmVnaW9uIHZpc2libGVDb250ZW50T3BhcXVlUmVnaW9uKCkgY29uc3QgT1ZFUlJJREUKICAgICB7 CiAgICAgICAgIGlmIChtX292ZXJyaWRlT3BhcXVlQ29udGVudHNSZWN0KQogICAgICAgICAgICAg cmV0dXJuIGludGVyc2VjdGlvbihtX29wYXF1ZUNvbnRlbnRzUmVjdCwgdmlzaWJsZUxheWVyUmVj dCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NUaWxlZExh eWVyVGVzdENvbW1vbi5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ1RpbGVkTGF5 ZXJUZXN0Q29tbW9uLmgKaW5kZXggMjk3NGRhZmFiMWRmZWI4NmM4YjkyYWJiMWJlYjgyZTQ1NTgw OTkxOS4uOTdhMTMwNDgzZGU0MjU3MDcxN2I0NjZiNzgxZDg5YzZlNmMwZDEyZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ1RpbGVkTGF5ZXJUZXN0Q29tbW9uLmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ1RpbGVkTGF5ZXJUZXN0Q29tbW9u LmgKQEAgLTExNywxOSArMTE3LDE5IEBAIHB1YmxpYzoKICAgICB1c2luZyBXZWJDb3JlOjpUaWxl ZExheWVyQ2hyb21pdW06Om51bVBhaW50ZWRUaWxlczsKICAgICB1c2luZyBXZWJDb3JlOjpUaWxl ZExheWVyQ2hyb21pdW06OmlkbGVQYWludFJlY3Q7CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0TmVl ZHNEaXNwbGF5UmVjdChjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKKyAgICB2aXJ0dWFsIHZv aWQgc2V0TmVlZHNEaXNwbGF5UmVjdChjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKSBPVkVSUklE RTsKICAgICBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGxhc3ROZWVkc0Rpc3BsYXlSZWN0KCkg Y29uc3QgeyByZXR1cm4gbV9sYXN0TmVlZHNEaXNwbGF5UmVjdDsgfQogCiAgICAgLy8gVXBkYXRl cyB0aGUgdmlzaWJsZUxheWVyUmVjdCgpLgotICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoV2ViQ29y ZTo6Q0NUZXh0dXJlVXBkYXRlciYsIGNvbnN0IFdlYkNvcmU6OkNDT2NjbHVzaW9uVHJhY2tlciop OworICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoV2ViQ29yZTo6Q0NUZXh0dXJlVXBkYXRlciYsIGNv bnN0IFdlYkNvcmU6OkNDT2NjbHVzaW9uVHJhY2tlciopIE9WRVJSSURFOwogCi0gICAgdmlydHVh bCBXZWJDb3JlOjpUZXh0dXJlTWFuYWdlciogdGV4dHVyZU1hbmFnZXIoKSBjb25zdCB7IHJldHVy biBtX3RleHR1cmVNYW5hZ2VyOyB9CisgICAgdmlydHVhbCBXZWJDb3JlOjpUZXh0dXJlTWFuYWdl ciogdGV4dHVyZU1hbmFnZXIoKSBjb25zdCBPVkVSUklERSB7IHJldHVybiBtX3RleHR1cmVNYW5h Z2VyOyB9CiAgICAgRmFrZUxheWVyVGV4dHVyZVVwZGF0ZXIqIGZha2VMYXllclRleHR1cmVVcGRh dGVyKCkgeyByZXR1cm4gbV9mYWtlVGV4dHVyZVVwZGF0ZXIuZ2V0KCk7IH0KICAgICBXZWJDb3Jl OjpGbG9hdFJlY3QgdXBkYXRlUmVjdCgpIHsgcmV0dXJuIG1fdXBkYXRlUmVjdDsgfQogCiBwcml2 YXRlOgotICAgIHZpcnR1YWwgV2ViQ29yZTo6TGF5ZXJUZXh0dXJlVXBkYXRlciogdGV4dHVyZVVw ZGF0ZXIoKSBjb25zdCB7IHJldHVybiBtX2Zha2VUZXh0dXJlVXBkYXRlci5nZXQoKTsgfQotICAg IHZpcnR1YWwgdm9pZCBjcmVhdGVUZXh0dXJlVXBkYXRlcklmTmVlZGVkKCkgeyB9CisgICAgdmly dHVhbCBXZWJDb3JlOjpMYXllclRleHR1cmVVcGRhdGVyKiB0ZXh0dXJlVXBkYXRlcigpIGNvbnN0 IE9WRVJSSURFIHsgcmV0dXJuIG1fZmFrZVRleHR1cmVVcGRhdGVyLmdldCgpOyB9CisgICAgdmly dHVhbCB2b2lkIGNyZWF0ZVRleHR1cmVVcGRhdGVySWZOZWVkZWQoKSBPVkVSUklERSB7IH0KIAog ICAgIFJlZlB0cjxGYWtlTGF5ZXJUZXh0dXJlVXBkYXRlcj4gbV9mYWtlVGV4dHVyZVVwZGF0ZXI7 CiAgICAgV2ViQ29yZTo6VGV4dHVyZU1hbmFnZXIqIG1fdGV4dHVyZU1hbmFnZXI7CkBAIC0xNDEs NyArMTQxLDcgQEAgcHVibGljOgogICAgIGV4cGxpY2l0IEZha2VUaWxlZExheWVyV2l0aFNjYWxl ZEJvdW5kcyhXZWJDb3JlOjpUZXh0dXJlTWFuYWdlciopOwogCiAgICAgdm9pZCBzZXRDb250ZW50 Qm91bmRzKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIGNvbnRlbnRCb3VuZHMpIHsgbV9mb3JjZWRD b250ZW50Qm91bmRzID0gY29udGVudEJvdW5kczsgfQotICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50 U2l6ZSBjb250ZW50Qm91bmRzKCkgY29uc3QgeyByZXR1cm4gbV9mb3JjZWRDb250ZW50Qm91bmRz OyB9CisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRTaXplIGNvbnRlbnRCb3VuZHMoKSBjb25zdCBP VkVSUklERSB7IHJldHVybiBtX2ZvcmNlZENvbnRlbnRCb3VuZHM7IH0KIAogcHJvdGVjdGVkOgog ICAgIFdlYkNvcmU6OkludFNpemUgbV9mb3JjZWRDb250ZW50Qm91bmRzOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9MYXllckNocm9taXVtVGVzdC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0xheWVyQ2hyb21pdW1UZXN0LmNwcAppbmRleCBiMzM2 MmVlZDAxZWU5OWIzMThmMzk4ZGM3NzE1MGVjOGRjZjNlMjM4Li5jZjQ2ZmQ5YWM1NzAyNjkzMzIx MDQ5ZmZlMGFkMDdhOTU0Mzc4N2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0xheWVyQ2hyb21pdW1UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0xheWVyQ2hyb21pdW1UZXN0LmNwcApAQCAtNTYwLDEyICs1NjAsMTIgQEAgcHVibGlj OgogICAgIHsKICAgICB9CiAKLSAgICB2aXJ0dWFsIGJvb2wgbmVlZHNDb250ZW50c1NjYWxlKCkg Y29uc3QKKyAgICB2aXJ0dWFsIGJvb2wgbmVlZHNDb250ZW50c1NjYWxlKCkgY29uc3QgT1ZFUlJJ REUKICAgICB7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAotICAgIHZpcnR1YWwgdm9p ZCBzZXROZWVkc0Rpc3BsYXlSZWN0KGNvbnN0IEZsb2F0UmVjdCYgZGlydHlSZWN0KQorICAgIHZp cnR1YWwgdm9pZCBzZXROZWVkc0Rpc3BsYXlSZWN0KGNvbnN0IEZsb2F0UmVjdCYgZGlydHlSZWN0 KSBPVkVSUklERQogICAgIHsKICAgICAgICAgbV9sYXN0TmVlZHNEaXNwbGF5UmVjdCA9IGRpcnR5 UmVjdDsKICAgICAgICAgTGF5ZXJDaHJvbWl1bTo6c2V0TmVlZHNEaXNwbGF5UmVjdChkaXJ0eVJl Y3QpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9UcmVlU3luY2hy b25pemVyVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RyZWVTeW5jaHJv bml6ZXJUZXN0LmNwcAppbmRleCAzYTk1YWVjNzg2MTI0Y2Y2ZGFjZDU5MDFjMmI0NjVlYTZkNzQy Y2M1Li43NTZhZWMwMzBiMTkxMDgzNjBhMDQyMGM2OWI0OTNlZTY1MjA0NTM2IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RyZWVTeW5jaHJvbml6ZXJUZXN0LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1RyZWVTeW5jaHJvbml6ZXJUZXN0LmNw cApAQCAtNzMsMTIgKzczLDEyIEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgfk1vY2tMYXllckNo cm9taXVtKCkgeyB9CiAKLSAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q0NMYXllckltcGw+IGNyZWF0 ZUNDTGF5ZXJJbXBsKCkKKyAgICB2aXJ0dWFsIFBhc3NPd25QdHI8Q0NMYXllckltcGw+IGNyZWF0 ZUNDTGF5ZXJJbXBsKCkgT1ZFUlJJREUKICAgICB7CiAgICAgICAgIHJldHVybiBNb2NrQ0NMYXll ckltcGw6OmNyZWF0ZShtX2xheWVySWQpOwogICAgIH0KIAotICAgIHZpcnR1YWwgdm9pZCBwdXNo UHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKiBjY0xheWVyKQorICAgIHZpcnR1YWwgdm9pZCBwdXNo UHJvcGVydGllc1RvKENDTGF5ZXJJbXBsKiBjY0xheWVyKSBPVkVSUklERQogICAgIHsKICAgICAg ICAgTGF5ZXJDaHJvbWl1bTo6cHVzaFByb3BlcnRpZXNUbyhjY0xheWVyKTsKIAo=