137555 2014-10-09 05:00:20 -0700 [CSSRegions] Make RenderFlowThread::regionAtBlockOffset const 2014-10-09 23:45:43 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mihnea webkit-unassigned commit-queue esprehn+autocc glenn hyatt kondapallykalyan WebkitBugTracker oldest_to_newest 1040523 0 mihnea 2014-10-09 05:00:20 -0700 Make RenderFlowThread::regionAtBlockOffset const 1040524 1 239528 mihnea 2014-10-09 05:04:33 -0700 Created attachment 239528 Patch 1040559 2 239528 hyatt 2014-10-09 09:05:00 -0700 Comment on attachment 239528 Patch Good cleanup. Yeah columns are doing that a different way than originally planned. 1040823 3 239528 commit-queue 2014-10-09 23:45:39 -0700 Comment on attachment 239528 Patch Clearing flags on attachment: 239528 Committed r174562: <http://trac.webkit.org/changeset/174562> 1040824 4 commit-queue 2014-10-09 23:45:43 -0700 All reviewed patches have been landed. Closing bug. 239528 2014-10-09 05:04:33 -0700 2014-10-09 23:45:38 -0700 Patch 137555.patch text/plain 16845 mihnea ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA5ZTZhNWVjLi42YjAzMjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTQtMTAtMDkgIE1paG5lYSBPdmlkZW5pZSAgPG1paG5lYUBhZG9iZS5jb20+CisKKyAg ICAgICAgW0NTU1JlZ2lvbnNdIE1ha2UgUmVuZGVyRmxvd1RocmVhZDo6cmVnaW9uQXRCbG9ja09m ZnNldCBjb25zdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM3NTU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTWFrZSB0aGUgbWV0aG9kIGNvbnN0IGFuZCByZW1vdmUgYXV0b0dlbmVyYXRlUmVnaW9uc1Rv QmxvY2tPZmZzZXQgbWV0aG9kIGFzIGl0CisgICAgICAgIGlzIG5vdCB1c2VkIGJ5IHJlZ2lvbi1i YXNlZCBtdWx0aWNvbHVtbiBjb2RlLiBBbHNvIHJlbW92ZWQgdGhlIFJlZ2lvbkF1dG9HZW5lcmF0 aW9uUG9saWN5CisgICAgICAgIHBhcmFtZXRlciBpbiB0aGUgcHJvY2VzcyBhbmQgdGhlIGNhbGwg c2l0ZXMuIE1ha2UgY29uc3Qgc29tZSBvZiB0aGUgbWV0aG9kcyB0aGF0IGNhbGwKKyAgICAgICAg cmVnaW9uQXRCbG9ja09mZnNldC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbG93VGhy ZWFkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OnJlZ2lvbkZvckNv bXBvc2l0ZWRMYXllcik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhyZWFkOjpyZWdp b25BdEJsb2NrT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OmFk anVzdGVkUG9zaXRpb25SZWxhdGl2ZVRvT2Zmc2V0UGFyZW50KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckZsb3dUaHJlYWQ6OnBhZ2VMb2dpY2FsVG9wRm9yT2Zmc2V0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckZsb3dUaHJlYWQ6OnBhZ2VMb2dpY2FsV2lkdGhGb3JPZmZzZXQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6cGFnZUxvZ2ljYWxIZWlnaHRGb3JPZmZz ZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVhZDo6cGFnZVJlbWFpbmluZ0xv Z2ljYWxIZWlnaHRGb3JPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxvd1RocmVh ZDo6bWFwRnJvbUZsb3dUb1JlZ2lvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbG93VGhy ZWFkOjpjb21wdXRlZFJlZ2lvblJhbmdlRm9yQm94KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyRmxvd1RocmVhZC5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZs b3dUaHJlYWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5GbG93VGhy ZWFkOjpyZWdpb25BdEJsb2NrT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRp Q29sdW1uRmxvd1RocmVhZDo6bWFwRnJvbUZsb3dUb1JlZ2lvbik6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OnBoeXNpY2FsVHJhbnNsYXRpb25Gcm9tRmxv d1RvUmVnaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVh ZDo6YXV0b0dlbmVyYXRlUmVnaW9uc1RvQmxvY2tPZmZzZXQpOiBEZWxldGVkLgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuaDoKKwogMjAxNC0xMC0wNyAg R3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxd IENhbGwgcmVxdWVzdFNjcm9sbFBvc2l0aW9uVXBkYXRlKCkgaW5zdGVhZCBvZiBkZWxlZ2F0ZWRT Y3JvbGxSZXF1ZXN0ZWQoKSBpbiBTY3JvbGxWaWV3OjpzY3JvbGxUbygpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5jcHAKaW5kZXggZjFmNWIzMi4uNjliZmE0 MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmNwcApA QCAtMjMyLDcgKzIzMiw3IEBAIGNvbnN0IFJlbmRlckxheWVyTGlzdCogUmVuZGVyRmxvd1RocmVh ZDo6Z2V0TGF5ZXJMaXN0Rm9yUmVnaW9uKFJlbmRlck5hbWVkRmxvd0ZyCiAgICAgcmV0dXJuIGl0 ZXJhdG9yID09IG1fcmVnaW9uVG9MYXllckxpc3RNYXAtPmVuZCgpID8gbnVsbHB0ciA6ICZpdGVy YXRvci0+dmFsdWU7CiB9CiAKLVJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KiBSZW5kZXJGbG93VGhy ZWFkOjpyZWdpb25Gb3JDb21wb3NpdGVkTGF5ZXIoUmVuZGVyTGF5ZXImIGNoaWxkTGF5ZXIpCitS ZW5kZXJOYW1lZEZsb3dGcmFnbWVudCogUmVuZGVyRmxvd1RocmVhZDo6cmVnaW9uRm9yQ29tcG9z aXRlZExheWVyKFJlbmRlckxheWVyJiBjaGlsZExheWVyKSBjb25zdAogewogICAgIGlmIChjaGls ZExheWVyLnJlbmRlcmVyKCkuZml4ZWRQb3NpdGlvbmVkV2l0aE5hbWVkRmxvd0NvbnRhaW5pbmdC bG9jaygpKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTI0Niw3ICsyNDYsNyBAQCBSZW5k ZXJOYW1lZEZsb3dGcmFnbWVudCogUmVuZGVyRmxvd1RocmVhZDo6cmVnaW9uRm9yQ29tcG9zaXRl ZExheWVyKFJlbmRlckxheWVyJgogCiAgICAgLy8gRklYTUU6IHJlbW92ZSB0aGlzIHdoZW4gd2Un bGwgaGF2ZSByZWdpb24gcmFuZ2VzIGZvciBpbmxpbmVzIGFzIHdlbGwuCiAgICAgTGF5b3V0UG9p bnQgZmxvd1RocmVhZE9mZnNldCA9IGZsb29yZWRMYXlvdXRQb2ludChjaGlsZExheWVyLnJlbmRl cmVyKCkubG9jYWxUb0NvbnRhaW5lclBvaW50KExheW91dFBvaW50KCksIHRoaXMsIEFwcGx5Q29u dGFpbmVyRmxpcCkpOwotICAgIHJldHVybiB0b1JlbmRlck5hbWVkRmxvd0ZyYWdtZW50KHJlZ2lv bkF0QmxvY2tPZmZzZXQoMCwgZmxpcEZvcldyaXRpbmdNb2RlKGlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlKCkgPyBmbG93VGhyZWFkT2Zmc2V0LnkoKSA6IGZsb3dUaHJlYWRPZmZzZXQueCgpKSwgdHJ1 ZSwgRGlzYWxsb3dSZWdpb25BdXRvR2VuZXJhdGlvbikpOworICAgIHJldHVybiB0b1JlbmRlck5h bWVkRmxvd0ZyYWdtZW50KHJlZ2lvbkF0QmxvY2tPZmZzZXQoMCwgZmxpcEZvcldyaXRpbmdNb2Rl KGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBmbG93VGhyZWFkT2Zmc2V0LnkoKSA6IGZsb3dU aHJlYWRPZmZzZXQueCgpKSwgdHJ1ZSkpOwogfQogCiBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCog UmVuZGVyRmxvd1RocmVhZDo6Y2FjaGVkUmVnaW9uRm9yQ29tcG9zaXRlZExheWVyKFJlbmRlckxh eWVyJiBjaGlsZExheWVyKSBjb25zdApAQCAtMzk2LDEzICszOTYsMTAgQEAgdm9pZCBSZW5kZXJG bG93VGhyZWFkOjpyZXBhaW50UmVjdGFuZ2xlSW5SZWdpb25zKGNvbnN0IExheW91dFJlY3QmIHJl cGFpbnRSZWN0KQogICAgICAgICByZWdpb24tPnJlcGFpbnRGbG93VGhyZWFkQ29udGVudChyZXBh aW50UmVjdCk7CiB9CiAKLVJlbmRlclJlZ2lvbiogUmVuZGVyRmxvd1RocmVhZDo6cmVnaW9uQXRC bG9ja09mZnNldChjb25zdCBSZW5kZXJCb3gqIGNsYW1wQm94LCBMYXlvdXRVbml0IG9mZnNldCwg Ym9vbCBleHRlbmRMYXN0UmVnaW9uLCBSZWdpb25BdXRvR2VuZXJhdGlvblBvbGljeSBhdXRvR2Vu ZXJhdGlvblBvbGljeSkKK1JlbmRlclJlZ2lvbiogUmVuZGVyRmxvd1RocmVhZDo6cmVnaW9uQXRC bG9ja09mZnNldChjb25zdCBSZW5kZXJCb3gqIGNsYW1wQm94LCBMYXlvdXRVbml0IG9mZnNldCwg Ym9vbCBleHRlbmRMYXN0UmVnaW9uKSBjb25zdAogewogICAgIEFTU0VSVCghbV9yZWdpb25zSW52 YWxpZGF0ZWQpOwogCi0gICAgaWYgKGF1dG9HZW5lcmF0aW9uUG9saWN5ID09IEFsbG93UmVnaW9u QXV0b0dlbmVyYXRpb24pCi0gICAgICAgIGF1dG9HZW5lcmF0ZVJlZ2lvbnNUb0Jsb2NrT2Zmc2V0 KG9mZnNldCk7Ci0KICAgICBpZiAobV9yZWdpb25MaXN0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0 dXJuIG51bGxwdHI7CiAKQEAgLTQyNiw3ICs0MjMsNyBAQCBSZW5kZXJSZWdpb24qIFJlbmRlckZs b3dUaHJlYWQ6OnJlZ2lvbkF0QmxvY2tPZmZzZXQoY29uc3QgUmVuZGVyQm94KiBjbGFtcEJveCwg TAogICAgIHJldHVybiByZWdpb24gPyBjbGFtcEJveC0+Y2xhbXBUb1N0YXJ0QW5kRW5kUmVnaW9u cyhyZWdpb24pIDogbnVsbHB0cjsKIH0KIAotTGF5b3V0UG9pbnQgUmVuZGVyRmxvd1RocmVhZDo6 YWRqdXN0ZWRQb3NpdGlvblJlbGF0aXZlVG9PZmZzZXRQYXJlbnQoY29uc3QgUmVuZGVyQm94TW9k ZWxPYmplY3QmIGJveE1vZGVsT2JqZWN0LCBjb25zdCBMYXlvdXRQb2ludCYgc3RhcnRQb2ludCkK K0xheW91dFBvaW50IFJlbmRlckZsb3dUaHJlYWQ6OmFkanVzdGVkUG9zaXRpb25SZWxhdGl2ZVRv T2Zmc2V0UGFyZW50KGNvbnN0IFJlbmRlckJveE1vZGVsT2JqZWN0JiBib3hNb2RlbE9iamVjdCwg Y29uc3QgTGF5b3V0UG9pbnQmIHN0YXJ0UG9pbnQpIGNvbnN0CiB7CiAgICAgTGF5b3V0UG9pbnQg cmVmZXJlbmNlUG9pbnQgPSBzdGFydFBvaW50OwogICAgIApAQCAtNTA3LDMwICs1MDQsMzAgQEAg TGF5b3V0UG9pbnQgUmVuZGVyRmxvd1RocmVhZDo6YWRqdXN0ZWRQb3NpdGlvblJlbGF0aXZlVG9P ZmZzZXRQYXJlbnQoY29uc3QgUmVuZGUKICAgICByZXR1cm4gcmVmZXJlbmNlUG9pbnQ7CiB9CiAK LUxheW91dFVuaXQgUmVuZGVyRmxvd1RocmVhZDo6cGFnZUxvZ2ljYWxUb3BGb3JPZmZzZXQoTGF5 b3V0VW5pdCBvZmZzZXQpCitMYXlvdXRVbml0IFJlbmRlckZsb3dUaHJlYWQ6OnBhZ2VMb2dpY2Fs VG9wRm9yT2Zmc2V0KExheW91dFVuaXQgb2Zmc2V0KSBjb25zdAogewotICAgIFJlbmRlclJlZ2lv biogcmVnaW9uID0gcmVnaW9uQXRCbG9ja09mZnNldCgwLCBvZmZzZXQsIGZhbHNlLCBBbGxvd1Jl Z2lvbkF1dG9HZW5lcmF0aW9uKTsKKyAgICBSZW5kZXJSZWdpb24qIHJlZ2lvbiA9IHJlZ2lvbkF0 QmxvY2tPZmZzZXQoMCwgb2Zmc2V0LCBmYWxzZSk7CiAgICAgcmV0dXJuIHJlZ2lvbiA/IHJlZ2lv bi0+cGFnZUxvZ2ljYWxUb3BGb3JPZmZzZXQob2Zmc2V0KSA6IExheW91dFVuaXQoKTsKIH0KIAot TGF5b3V0VW5pdCBSZW5kZXJGbG93VGhyZWFkOjpwYWdlTG9naWNhbFdpZHRoRm9yT2Zmc2V0KExh eW91dFVuaXQgb2Zmc2V0KQorTGF5b3V0VW5pdCBSZW5kZXJGbG93VGhyZWFkOjpwYWdlTG9naWNh bFdpZHRoRm9yT2Zmc2V0KExheW91dFVuaXQgb2Zmc2V0KSBjb25zdAogewotICAgIFJlbmRlclJl Z2lvbiogcmVnaW9uID0gcmVnaW9uQXRCbG9ja09mZnNldCgwLCBvZmZzZXQsIHRydWUsIEFsbG93 UmVnaW9uQXV0b0dlbmVyYXRpb24pOworICAgIFJlbmRlclJlZ2lvbiogcmVnaW9uID0gcmVnaW9u QXRCbG9ja09mZnNldCgwLCBvZmZzZXQsIHRydWUpOwogICAgIHJldHVybiByZWdpb24gPyByZWdp b24tPnBhZ2VMb2dpY2FsV2lkdGgoKSA6IGNvbnRlbnRMb2dpY2FsV2lkdGgoKTsKIH0KIAotTGF5 b3V0VW5pdCBSZW5kZXJGbG93VGhyZWFkOjpwYWdlTG9naWNhbEhlaWdodEZvck9mZnNldChMYXlv dXRVbml0IG9mZnNldCkKK0xheW91dFVuaXQgUmVuZGVyRmxvd1RocmVhZDo6cGFnZUxvZ2ljYWxI ZWlnaHRGb3JPZmZzZXQoTGF5b3V0VW5pdCBvZmZzZXQpIGNvbnN0CiB7Ci0gICAgUmVuZGVyUmVn aW9uKiByZWdpb24gPSByZWdpb25BdEJsb2NrT2Zmc2V0KDAsIG9mZnNldCwgZmFsc2UsIEFsbG93 UmVnaW9uQXV0b0dlbmVyYXRpb24pOworICAgIFJlbmRlclJlZ2lvbiogcmVnaW9uID0gcmVnaW9u QXRCbG9ja09mZnNldCgwLCBvZmZzZXQsIGZhbHNlKTsKICAgICBpZiAoIXJlZ2lvbikKICAgICAg ICAgcmV0dXJuIDA7CiAKICAgICByZXR1cm4gcmVnaW9uLT5wYWdlTG9naWNhbEhlaWdodCgpOwog fQogCi1MYXlvdXRVbml0IFJlbmRlckZsb3dUaHJlYWQ6OnBhZ2VSZW1haW5pbmdMb2dpY2FsSGVp Z2h0Rm9yT2Zmc2V0KExheW91dFVuaXQgb2Zmc2V0LCBQYWdlQm91bmRhcnlSdWxlIHBhZ2VCb3Vu ZGFyeVJ1bGUpCitMYXlvdXRVbml0IFJlbmRlckZsb3dUaHJlYWQ6OnBhZ2VSZW1haW5pbmdMb2dp Y2FsSGVpZ2h0Rm9yT2Zmc2V0KExheW91dFVuaXQgb2Zmc2V0LCBQYWdlQm91bmRhcnlSdWxlIHBh Z2VCb3VuZGFyeVJ1bGUpIGNvbnN0CiB7Ci0gICAgUmVuZGVyUmVnaW9uKiByZWdpb24gPSByZWdp b25BdEJsb2NrT2Zmc2V0KDAsIG9mZnNldCwgZmFsc2UsIEFsbG93UmVnaW9uQXV0b0dlbmVyYXRp b24pOworICAgIFJlbmRlclJlZ2lvbiogcmVnaW9uID0gcmVnaW9uQXRCbG9ja09mZnNldCgwLCBv ZmZzZXQsIGZhbHNlKTsKICAgICBpZiAoIXJlZ2lvbikKICAgICAgICAgcmV0dXJuIDA7CiAKQEAg LTU1Nyw3ICs1NTQsNyBAQCBSZW5kZXJSZWdpb24qIFJlbmRlckZsb3dUaHJlYWQ6Om1hcEZyb21G bG93VG9SZWdpb24oVHJhbnNmb3JtU3RhdGUmIHRyYW5zZm9ybVN0YQogICAgICAgICBmbGlwRm9y V3JpdGluZ01vZGUoYm94UmVjdCk7CiAKICAgICAgICAgTGF5b3V0UG9pbnQgY2VudGVyID0gYm94 UmVjdC5jZW50ZXIoKTsKLSAgICAgICAgcmVuZGVyUmVnaW9uID0gY29uc3RfY2FzdDxSZW5kZXJG bG93VGhyZWFkKj4odGhpcyktPnJlZ2lvbkF0QmxvY2tPZmZzZXQodGhpcywgaXNIb3Jpem9udGFs V3JpdGluZ01vZGUoKSA/IGNlbnRlci55KCkgOiBjZW50ZXIueCgpLCB0cnVlLCBEaXNhbGxvd1Jl Z2lvbkF1dG9HZW5lcmF0aW9uKTsKKyAgICAgICAgcmVuZGVyUmVnaW9uID0gcmVnaW9uQXRCbG9j a09mZnNldCh0aGlzLCBpc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gY2VudGVyLnkoKSA6IGNl bnRlci54KCksIHRydWUpOwogICAgICAgICBpZiAoIXJlbmRlclJlZ2lvbikKICAgICAgICAgICAg IHJldHVybiBudWxscHRyOwogICAgIH0KQEAgLTgzNCw3ICs4MzEsNyBAQCBib29sIFJlbmRlckZs b3dUaHJlYWQ6OmNvbXB1dGVkUmVnaW9uUmFuZ2VGb3JCb3goY29uc3QgUmVuZGVyQm94KiBib3gs IFJlbmRlclJlZwogICAgICAgICAvLyBJZiBhIGJveCBkb2Vzbid0IGhhdmUgYSBjYWNoZWQgcmVn aW9uIHJhbmdlIGl0IHVzdWFsbHkgbWVhbnMgdGhlIGJveCBiZWxvbmdzIHRvIGEgbGluZSBzbyBz dGFydFJlZ2lvbiBzaG91bGQgYmUgZXF1YWwgd2l0aCBlbmRSZWdpb24uCiAgICAgICAgIC8vIEZJ WE1FOiBGaW5kIHRoZSBjYXNlcyB3aGVuIHRoaXMgc3RhcnRSZWdpb24gc2hvdWxkIG5vdCBiZSBl cXVhbCB3aXRoIGVuZFJlZ2lvbiBhbmQgbWFrZSBzdXJlIHRoZXNlIGJveGVzIGhhdmUgY2FjaGVk IHJlZ2lvbiByYW5nZXMuCiAgICAgICAgIGlmIChoYXNDYWNoZWRSZWdpb25SYW5nZUZvckJveChj YikpIHsKLSAgICAgICAgICAgIHN0YXJ0UmVnaW9uID0gZW5kUmVnaW9uID0gY29uc3RfY2FzdDxS ZW5kZXJGbG93VGhyZWFkKj4odGhpcyktPnJlZ2lvbkF0QmxvY2tPZmZzZXQoY2IsIGJveC0+b2Zm c2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSgpLCB0cnVlLCBEaXNhbGxvd1JlZ2lvbkF1dG9H ZW5lcmF0aW9uKTsKKyAgICAgICAgICAgIHN0YXJ0UmVnaW9uID0gZW5kUmVnaW9uID0gcmVnaW9u QXRCbG9ja09mZnNldChjYiwgYm94LT5vZmZzZXRGcm9tTG9naWNhbFRvcE9mRmlyc3RQYWdlKCks IHRydWUpOwogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1RocmVhZC5oIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsb3dUaHJlYWQuaAppbmRleCBiOWVkM2I0Li5i YjUxNmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxvd1Ro cmVhZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbG93VGhyZWFkLmgK QEAgLTEwNywyMiArMTA3LDE3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgcmVwYWludFJlY3Rhbmds ZUluUmVnaW9ucyhjb25zdCBMYXlvdXRSZWN0JikgY29uc3Q7CiAgICAgCi0gICAgTGF5b3V0UG9p bnQgYWRqdXN0ZWRQb3NpdGlvblJlbGF0aXZlVG9PZmZzZXRQYXJlbnQoY29uc3QgUmVuZGVyQm94 TW9kZWxPYmplY3QmLCBjb25zdCBMYXlvdXRQb2ludCYpOworICAgIExheW91dFBvaW50IGFkanVz dGVkUG9zaXRpb25SZWxhdGl2ZVRvT2Zmc2V0UGFyZW50KGNvbnN0IFJlbmRlckJveE1vZGVsT2Jq ZWN0JiwgY29uc3QgTGF5b3V0UG9pbnQmKSBjb25zdDsKIAotICAgIExheW91dFVuaXQgcGFnZUxv Z2ljYWxUb3BGb3JPZmZzZXQoTGF5b3V0VW5pdCk7Ci0gICAgTGF5b3V0VW5pdCBwYWdlTG9naWNh bFdpZHRoRm9yT2Zmc2V0KExheW91dFVuaXQpOwotICAgIExheW91dFVuaXQgcGFnZUxvZ2ljYWxI ZWlnaHRGb3JPZmZzZXQoTGF5b3V0VW5pdCk7Ci0gICAgTGF5b3V0VW5pdCBwYWdlUmVtYWluaW5n TG9naWNhbEhlaWdodEZvck9mZnNldChMYXlvdXRVbml0LCBQYWdlQm91bmRhcnlSdWxlID0gSW5j bHVkZVBhZ2VCb3VuZGFyeSk7CisgICAgTGF5b3V0VW5pdCBwYWdlTG9naWNhbFRvcEZvck9mZnNl dChMYXlvdXRVbml0KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IHBhZ2VMb2dpY2FsV2lkdGhGb3JP ZmZzZXQoTGF5b3V0VW5pdCkgY29uc3Q7CisgICAgTGF5b3V0VW5pdCBwYWdlTG9naWNhbEhlaWdo dEZvck9mZnNldChMYXlvdXRVbml0KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IHBhZ2VSZW1haW5p bmdMb2dpY2FsSGVpZ2h0Rm9yT2Zmc2V0KExheW91dFVuaXQsIFBhZ2VCb3VuZGFyeVJ1bGUgPSBJ bmNsdWRlUGFnZUJvdW5kYXJ5KSBjb25zdDsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRQYWdlQnJl YWsoY29uc3QgUmVuZGVyQmxvY2sqLCBMYXlvdXRVbml0IC8qb2Zmc2V0Ki8sIExheW91dFVuaXQg LypzcGFjZVNob3J0YWdlKi8pIHsgfQogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVNaW5pbXVtUGFn ZUhlaWdodChjb25zdCBSZW5kZXJCbG9jayosIExheW91dFVuaXQgLypvZmZzZXQqLywgTGF5b3V0 VW5pdCAvKm1pbkhlaWdodCovKSB7IH0KIAotICAgIGVudW0gUmVnaW9uQXV0b0dlbmVyYXRpb25Q b2xpY3kgewotICAgICAgICBBbGxvd1JlZ2lvbkF1dG9HZW5lcmF0aW9uLAotICAgICAgICBEaXNh bGxvd1JlZ2lvbkF1dG9HZW5lcmF0aW9uLAotICAgIH07Ci0KLSAgICB2aXJ0dWFsIFJlbmRlclJl Z2lvbiogcmVnaW9uQXRCbG9ja09mZnNldChjb25zdCBSZW5kZXJCb3gqLCBMYXlvdXRVbml0LCBi b29sIGV4dGVuZExhc3RSZWdpb24gPSBmYWxzZSwgUmVnaW9uQXV0b0dlbmVyYXRpb25Qb2xpY3kg PSBBbGxvd1JlZ2lvbkF1dG9HZW5lcmF0aW9uKTsKKyAgICB2aXJ0dWFsIFJlbmRlclJlZ2lvbiog cmVnaW9uQXRCbG9ja09mZnNldChjb25zdCBSZW5kZXJCb3gqLCBMYXlvdXRVbml0LCBib29sIGV4 dGVuZExhc3RSZWdpb24gPSBmYWxzZSkgY29uc3Q7CiAKICAgICBib29sIHJlZ2lvbnNIYXZlVW5p Zm9ybUxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVnaW9uc0hhdmVVbmlmb3JtTG9n aWNhbFdpZHRoOyB9CiAgICAgYm9vbCByZWdpb25zSGF2ZVVuaWZvcm1Mb2dpY2FsSGVpZ2h0KCkg Y29uc3QgeyByZXR1cm4gbV9yZWdpb25zSGF2ZVVuaWZvcm1Mb2dpY2FsSGVpZ2h0OyB9CkBAIC0y MDAsNyArMTk1LDcgQEAgcHVibGljOgogCiAgICAgY29uc3QgUmVuZGVyTGF5ZXJMaXN0KiBnZXRM YXllckxpc3RGb3JSZWdpb24oUmVuZGVyTmFtZWRGbG93RnJhZ21lbnQqKSBjb25zdDsKIAotICAg IFJlbmRlck5hbWVkRmxvd0ZyYWdtZW50KiByZWdpb25Gb3JDb21wb3NpdGVkTGF5ZXIoUmVuZGVy TGF5ZXImKTsgLy8gQnkgbWVhbnMgb2YgZ2V0UmVnaW9uUmFuZ2VGb3JCb3ggb3IgcmVnaW9uQXRC bG9ja09mZnNldC4KKyAgICBSZW5kZXJOYW1lZEZsb3dGcmFnbWVudCogcmVnaW9uRm9yQ29tcG9z aXRlZExheWVyKFJlbmRlckxheWVyJikgY29uc3Q7IC8vIEJ5IG1lYW5zIG9mIGdldFJlZ2lvblJh bmdlRm9yQm94IG9yIHJlZ2lvbkF0QmxvY2tPZmZzZXQuCiAgICAgUmVuZGVyTmFtZWRGbG93RnJh Z21lbnQqIGNhY2hlZFJlZ2lvbkZvckNvbXBvc2l0ZWRMYXllcihSZW5kZXJMYXllciYpIGNvbnN0 OwogCiAgICAgdmlydHVhbCBib29sIGNvbGxlY3RzR3JhcGhpY3NMYXllcnNVbmRlclJlZ2lvbnMo KSBjb25zdDsKQEAgLTI3MSw4ICsyNjYsNiBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIGluaXRp YWxpemVSZWdpb25zQ29tcHV0ZWRBdXRvSGVpZ2h0KFJlbmRlclJlZ2lvbiogPSAwKTsKIAotICAg IHZpcnR1YWwgdm9pZCBhdXRvR2VuZXJhdGVSZWdpb25zVG9CbG9ja09mZnNldChMYXlvdXRVbml0 KSB7IH07Ci0KICAgICBpbmxpbmUgYm9vbCBoYXNDYWNoZWRPZmZzZXRGcm9tTG9naWNhbFRvcE9m Rmlyc3RSZWdpb24oY29uc3QgUmVuZGVyQm94KikgY29uc3Q7CiAgICAgaW5saW5lIExheW91dFVu aXQgY2FjaGVkT2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UmVnaW9uKGNvbnN0IFJlbmRlckJv eCopIGNvbnN0OwogICAgIGlubGluZSB2b2lkIHNldE9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJz dFJlZ2lvbihjb25zdCBSZW5kZXJCb3gqLCBMYXlvdXRVbml0KTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKaW5k ZXggN2RmZTgzNi4uZjFlNmY1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5jcHAKQEAgLTQ4NSwzMyArNDg1LDYg QEAgTGF5b3V0VW5pdCBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6OmluaXRpYWxMb2dpY2Fs V2lkdGgoKSBjb25zdAogICAgIHJldHVybiBjb2x1bW5XaWR0aCgpOwogfQogCi12b2lkIFJlbmRl ck11bHRpQ29sdW1uRmxvd1RocmVhZDo6YXV0b0dlbmVyYXRlUmVnaW9uc1RvQmxvY2tPZmZzZXQo TGF5b3V0VW5pdCBvZmZzZXQpCi17Ci0gICAgLy8gVGhpcyBmdW5jdGlvbiBlbnN1cmVzIHdlIGhh dmUgdGhlIGNvcnJlY3QgY29sdW1uIHNldCBpbmZvcm1hdGlvbiBhdCBhbGwgdGltZXMuCi0gICAg Ly8gRm9yIGEgc2ltcGxlIG11bHRpLWNvbHVtbiBsYXlvdXQgaW4gY29udGludW91cyBtZWRpYSwg b25seSBvbmUgY29sdW1uIHNldCBjaGlsZCBpcyByZXF1aXJlZC4KLSAgICAvLyBPbmNlIGEgY29s dW1uIGlzIG5lc3RlZCBpbnNpZGUgYW4gZW5jbG9zaW5nIHBhZ2luYXRpb24gY29udGV4dCwgdGhl IG51bWJlciBvZiBjb2x1bW4gc2V0cwotICAgIC8vIHJlcXVpcmVkIGJlY29tZXMgMm4tMSwgd2hl cmUgbiBpcyB0aGUgdG90YWwgbnVtYmVyIG9mIG5lc3RlZCBwYWdpbmF0aW9uIGNvbnRleHRzLiBG b3IgZXhhbXBsZToKLSAgICAvLwotICAgIC8vIENvbHVtbiBsYXlvdXQgd2l0aCBubyBlbmNsb3Np bmcgcGFnaW5hdGlvbiBtb2RlbCA9IDIgKiAxIC0gMSA9IDEgY29sdW1uIHNldC4KLSAgICAvLyBD b2x1bW5zIGluc2lkZSBwYWdlcyA9IDIgKiAyIC0gMSA9IDMgY29sdW1uIHNldHMgKGJvdHRvbSBv ZiBmaXJzdCBwYWdlLCBhbGwgdGhlIHN1YnNlcXVlbnQgcGFnZXMsIHRoZW4gdGhlIGxhc3QgcGFn ZSkuCi0gICAgLy8gQ29sdW1ucyBpbnNpZGUgY29sdW1ucyBpbnNpZGUgcGFnZXMgPSAyICogMyAt IDEgPSA1IGNvbHVtbiBzZXRzLgotICAgIC8vCi0gICAgLy8gSW4gYWRkaXRpb24sIGNvbHVtbiBz cGFucyB3aWxsIGZvcmNlIGEgY29sdW1uIHNldCB0byAic3BsaXQiIGludG8gYmVmb3JlL2FmdGVy IHNldHMgYXJvdW5kIHRoZSBzcGFubmluZyBlbGVtZW50LgotICAgIC8vCi0gICAgLy8gRmluYWxs eSwgd2Ugd2lsbCBuZWVkIHRvIGRlYWwgd2l0aCBjb2x1bW5zIGluc2lkZSByZWdpb25zLiBJZiBy ZWdpb25zIGhhdmUgdmFyaWFibGUgd2lkdGhzLCB0aGVuIHRoZXJlIHdpbGwgbmVlZAotICAgIC8v IHRvIGJlIHVuaXF1ZSBjb2x1bW4gc2V0cyBjcmVhdGVkIGluc2lkZSBhbnkgcmVnaW9uIHdob3Nl IHdpZHRoIGlzIGRpZmZlcmVudCBmcm9tIGl0cyBzdXJyb3VuZGluZyByZWdpb25zLiBUaGlzIGlz Ci0gICAgLy8gYWN0dWFsbHkgcHJldHR5IHNpbWlsYXIgdG8gdGhlIHNwYW5uaW5nIGNhc2UsIGlu IHRoYXQgd2UgYnJlYWsgdXAgdGhlIGNvbHVtbiBzZXRzIHdoZW5ldmVyIHRoZSB3aWR0aCB2YXJp ZXMuCi0gICAgLy8KLSAgICAvLyBGSVhNRTogUGFyZW50IGZyYWdtZW50YXRpb24gY29udGV4dHMg bWlnaHQgcmVxdWlyZSB1cyB0byBpbnNlcnQgYWRkaXRpb25hbCBjb2x1bW4gc2V0cyBoZXJlLAot ICAgIC8vIGJ1dCB3ZSBkb24ndCB3b3JyeSBhYm91dCBpdCBmb3Igbm93LiBUaGlzIG1hdGNoZXMg dGhlIG9sZCBtdWx0aS1jb2x1bW4gY29kZS4gUmlnaHQgbm93IG91cgotICAgIC8vIGdvYWwgaXMg anVzdCBmZWF0dXJlIHBhcml0eSB3aXRoIHRoZSBvbGQgbXVsdGktY29sdW1uIGNvZGUgc28gdGhh dCB3ZSBjYW4gc3dpdGNoIG92ZXIgdG8gdGhlCi0gICAgLy8gbmV3IGNvZGUgYXMgc29vbiBhcyBw b3NzaWJsZS4gVGhlIG9uZSBjb2x1bW4gc2V0IHRoYXQgd2UgbmVlZCBoYXMgYWxyZWFkeSBiZWVu IG1hZGUgZHVyaW5nCi0gICAgLy8gcmVuZGVyIHRyZWUgY3JlYXRpb24sIHNvIHRoZXJlJ3Mgbm90 aGluZyB0byBkbyBoZXJlLCBmb3IgdGhlIHRpbWUgYmVpbmcuCi0KLSAgICAodm9pZClvZmZzZXQ7 IC8vIGhpZGUgd2FybmluZwotICAgIEFTU0VSVCh0b1JlbmRlck11bHRpQ29sdW1uU2V0KHJlZ2lv bkF0QmxvY2tPZmZzZXQoMCwgb2Zmc2V0LCB0cnVlLCBEaXNhbGxvd1JlZ2lvbkF1dG9HZW5lcmF0 aW9uKSkpOwotfQotCiB2b2lkIFJlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZDo6c2V0UGFnZUJy ZWFrKGNvbnN0IFJlbmRlckJsb2NrKiBibG9jaywgTGF5b3V0VW5pdCBvZmZzZXQsIExheW91dFVu aXQgc3BhY2VTaG9ydGFnZSkKIHsKICAgICBpZiAoUmVuZGVyTXVsdGlDb2x1bW5TZXQqIG11bHRp Y29sU2V0ID0gdG9SZW5kZXJNdWx0aUNvbHVtblNldChyZWdpb25BdEJsb2NrT2Zmc2V0KGJsb2Nr LCBvZmZzZXQpKSkKQEAgLTUyNCwxMCArNDk3LDEwIEBAIHZvaWQgUmVuZGVyTXVsdGlDb2x1bW5G bG93VGhyZWFkOjp1cGRhdGVNaW5pbXVtUGFnZUhlaWdodChjb25zdCBSZW5kZXJCbG9jayogYmxv CiAgICAgICAgIG11bHRpY29sU2V0LT51cGRhdGVNaW5pbXVtQ29sdW1uSGVpZ2h0KG1pbkhlaWdo dCk7CiB9CiAKLVJlbmRlclJlZ2lvbiogUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFkOjpyZWdp b25BdEJsb2NrT2Zmc2V0KGNvbnN0IFJlbmRlckJveCogYm94LCBMYXlvdXRVbml0IG9mZnNldCwg Ym9vbCBleHRlbmRMYXN0UmVnaW9uLCBSZWdpb25BdXRvR2VuZXJhdGlvblBvbGljeSBhdXRvR2Vu ZXJhdGlvblBvbGljeSkKK1JlbmRlclJlZ2lvbiogUmVuZGVyTXVsdGlDb2x1bW5GbG93VGhyZWFk OjpyZWdpb25BdEJsb2NrT2Zmc2V0KGNvbnN0IFJlbmRlckJveCogYm94LCBMYXlvdXRVbml0IG9m ZnNldCwgYm9vbCBleHRlbmRMYXN0UmVnaW9uKSBjb25zdAogewogICAgIGlmICghbV9pbkxheW91 dCkKLSAgICAgICAgcmV0dXJuIFJlbmRlckZsb3dUaHJlYWQ6OnJlZ2lvbkF0QmxvY2tPZmZzZXQo Ym94LCBvZmZzZXQsIGV4dGVuZExhc3RSZWdpb24sIGF1dG9HZW5lcmF0aW9uUG9saWN5KTsKKyAg ICAgICAgcmV0dXJuIFJlbmRlckZsb3dUaHJlYWQ6OnJlZ2lvbkF0QmxvY2tPZmZzZXQoYm94LCBv ZmZzZXQsIGV4dGVuZExhc3RSZWdpb24pOwogCiAgICAgLy8gTGF5b3V0IGluIHByb2dyZXNzLiBX ZSBhcmUgY2FsY3VsYXRpbmcgdGhlIHNldCBoZWlnaHRzIGFzIHdlIHNwZWFrLCBzbyB0aGUgcmVn aW9uIHJhbmdlCiAgICAgLy8gaW5mb3JtYXRpb24gaXMgbm90IHVwLXRvLWRhdGUuCkBAIC03MTAs NyArNjgzLDcgQEAgUmVuZGVyUmVnaW9uKiBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQ6Om1h cEZyb21GbG93VG9SZWdpb24oVHJhbnNmb3JtU3RhdGUmIHQKICAgICAvLyBmb3Igbm93IHdlIGp1 c3QgdGFrZSB0aGUgY2VudGVyIG9mIHRoZSBtYXBwZWQgZW5jbG9zaW5nIGJveCBhbmQgbWFwIGl0 IHRvIGEgY29sdW1uLgogICAgIExheW91dFBvaW50IGNlbnRlclBvaW50ID0gYm94UmVjdC5jZW50 ZXIoKTsKICAgICBMYXlvdXRVbml0IGNlbnRlckxvZ2ljYWxPZmZzZXQgPSBpc0hvcml6b250YWxX cml0aW5nTW9kZSgpID8gY2VudGVyUG9pbnQueSgpIDogY2VudGVyUG9pbnQueCgpOwotICAgIFJl bmRlclJlZ2lvbiogcmVuZGVyUmVnaW9uID0gY29uc3RfY2FzdDxSZW5kZXJNdWx0aUNvbHVtbkZs b3dUaHJlYWQqPih0aGlzKS0+cmVnaW9uQXRCbG9ja09mZnNldCh0aGlzLCBjZW50ZXJMb2dpY2Fs T2Zmc2V0LCB0cnVlLCBEaXNhbGxvd1JlZ2lvbkF1dG9HZW5lcmF0aW9uKTsKKyAgICBSZW5kZXJS ZWdpb24qIHJlbmRlclJlZ2lvbiA9IHJlZ2lvbkF0QmxvY2tPZmZzZXQodGhpcywgY2VudGVyTG9n aWNhbE9mZnNldCwgdHJ1ZSk7CiAgICAgaWYgKCFyZW5kZXJSZWdpb24pCiAgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIHRyYW5zZm9ybVN0YXRlLm1vdmUocGh5c2ljYWxUcmFuc2xhdGlvbk9m ZnNldEZyb21GbG93VG9SZWdpb24ocmVuZGVyUmVnaW9uLCBjZW50ZXJMb2dpY2FsT2Zmc2V0KSk7 CkBAIC03NTMsNyArNzI2LDcgQEAgUmVuZGVyUmVnaW9uKiBSZW5kZXJNdWx0aUNvbHVtbkZsb3dU aHJlYWQ6OnBoeXNpY2FsVHJhbnNsYXRpb25Gcm9tRmxvd1RvUmVnaW9uKEwKICAgICAKICAgICAv LyBOb3cgZ2V0IHRoZSByZWdpb24gdGhhdCB3ZSBhcmUgaW4uCiAgICAgTGF5b3V0VW5pdCBsb2dp Y2FsT2Zmc2V0ID0gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IGxvZ2ljYWxQb2ludC55KCkg OiBsb2dpY2FsUG9pbnQueCgpOwotICAgIFJlbmRlclJlZ2lvbiogcmVuZGVyUmVnaW9uID0gY29u c3RfY2FzdDxSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQqPih0aGlzKS0+cmVnaW9uQXRCbG9j a09mZnNldCh0aGlzLCBsb2dpY2FsT2Zmc2V0LCB0cnVlLCBEaXNhbGxvd1JlZ2lvbkF1dG9HZW5l cmF0aW9uKTsKKyAgICBSZW5kZXJSZWdpb24qIHJlbmRlclJlZ2lvbiA9IHJlZ2lvbkF0QmxvY2tP ZmZzZXQodGhpcywgbG9naWNhbE9mZnNldCwgdHJ1ZSk7CiAgICAgaWYgKCFyZW5kZXJSZWdpb24p CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvd1RocmVhZC5oCmluZGV4IDdmNzRlNzIu LjU0MjU5NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0 aUNvbHVtbkZsb3dUaHJlYWQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TXVsdGlDb2x1bW5GbG93VGhyZWFkLmgKQEAgLTEyNCwxMCArMTI0LDkgQEAgcHJpdmF0ZToKICAg ICB2aXJ0dWFsIHZvaWQgZmxvd1RocmVhZERlc2NlbmRhbnRCb3hMYWlkT3V0KFJlbmRlckJveCop IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlTG9naWNhbEhlaWdodChMYXlvdXRV bml0IGxvZ2ljYWxIZWlnaHQsIExheW91dFVuaXQgbG9naWNhbFRvcCwgTG9naWNhbEV4dGVudENv bXB1dGVkVmFsdWVzJikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBMYXlvdXRVbml0IGlu aXRpYWxMb2dpY2FsV2lkdGgoKSBjb25zdCBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgYXV0 b0dlbmVyYXRlUmVnaW9uc1RvQmxvY2tPZmZzZXQoTGF5b3V0VW5pdCkgb3ZlcnJpZGU7CiAgICAg dmlydHVhbCB2b2lkIHNldFBhZ2VCcmVhayhjb25zdCBSZW5kZXJCbG9jayosIExheW91dFVuaXQg b2Zmc2V0LCBMYXlvdXRVbml0IHNwYWNlU2hvcnRhZ2UpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwg dm9pZCB1cGRhdGVNaW5pbXVtUGFnZUhlaWdodChjb25zdCBSZW5kZXJCbG9jayosIExheW91dFVu aXQgb2Zmc2V0LCBMYXlvdXRVbml0IG1pbkhlaWdodCkgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCBS ZW5kZXJSZWdpb24qIHJlZ2lvbkF0QmxvY2tPZmZzZXQoY29uc3QgUmVuZGVyQm94KiwgTGF5b3V0 VW5pdCwgYm9vbCBleHRlbmRMYXN0UmVnaW9uID0gZmFsc2UsIFJlZ2lvbkF1dG9HZW5lcmF0aW9u UG9saWN5ID0gQWxsb3dSZWdpb25BdXRvR2VuZXJhdGlvbikgb3ZlcnJpZGU7CisgICAgdmlydHVh bCBSZW5kZXJSZWdpb24qIHJlZ2lvbkF0QmxvY2tPZmZzZXQoY29uc3QgUmVuZGVyQm94KiwgTGF5 b3V0VW5pdCwgYm9vbCBleHRlbmRMYXN0UmVnaW9uID0gZmFsc2UpIGNvbnN0IG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgdm9pZCBzZXRSZWdpb25SYW5nZUZvckJveChjb25zdCBSZW5kZXJCb3gqLCBS ZW5kZXJSZWdpb24qLCBSZW5kZXJSZWdpb24qKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGJvb2wg YWRkRm9yY2VkUmVnaW9uQnJlYWsoY29uc3QgUmVuZGVyQmxvY2sqLCBMYXlvdXRVbml0LCBSZW5k ZXJCb3gqIGJyZWFrQ2hpbGQsIGJvb2wgaXNCZWZvcmUsIExheW91dFVuaXQqIG9mZnNldEJyZWFr QWRqdXN0bWVudCA9IDApIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgYm9vbCBpc1BhZ2VMb2dpY2Fs SGVpZ2h0S25vd24oKSBjb25zdCBvdmVycmlkZTsK