115256 2013-04-26 06:35:03 -0700 Use the complete block as the context for Dictionary lookups 2013-05-30 01:28:35 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 0 deniau webkit-unassigned commit-queue enrica graouts jiapu.mail rniwa thorton webkit-bug-importer oldest_to_newest 881858 0 deniau 2013-04-26 06:35:03 -0700 Use the complete block as the context for Dictionary lookups 881862 1 199826 deniau 2013-04-26 06:47:34 -0700 Created attachment 199826 Patch 881863 2 webkit-bug-importer 2013-04-26 06:50:06 -0700 <rdar://problem/13747883> 881865 3 deniau 2013-04-26 06:52:23 -0700 When computing the context we give when looking up a word in the Dictionary, use startOfBlock/endOfBlock instead of startOfParagraph/endOfParagraph so that the context doesn't stop at line breaks. 881982 4 199826 rniwa 2013-04-26 11:39:32 -0700 Comment on attachment 199826 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199826&action=review > Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:510 > + // A "paragraph" is not enough as it may stop at a <br> and Lookup sometimes needs several lines of context. If paragraph isn’t good enough, then block is probably not good enough either. You realize that we can have each paragraph being isolated by a div, right? 881995 5 199826 deniau 2013-04-26 12:35:54 -0700 Comment on attachment 199826 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199826&action=review >> Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:510 >> + // A "paragraph" is not enough as it may stop at a <br> and Lookup sometimes needs several lines of context. > > If paragraph isn’t good enough, then block is probably not good enough either. > You realize that we can have each paragraph being isolated by a div, right? I do. This is of course best-effort and there's no solution that can work with all the web pages out there. My take is that a good Web author will put any related information (that Lookup cares about) in the same block. If that doesn't work, Lookup will do its best given the partial context. The user can select text manually if that's not enough... 882003 6 199826 rniwa 2013-04-26 13:02:43 -0700 Comment on attachment 199826 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199826&action=review >>> Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm:510 >>> + // A "paragraph" is not enough as it may stop at a <br> and Lookup sometimes needs several lines of context. >> >> If paragraph isn’t good enough, then block is probably not good enough either. >> You realize that we can have each paragraph being isolated by a div, right? > > I do. This is of course best-effort and there's no solution that can work with all the web pages out there. My take is that a good Web author will put any related information (that Lookup cares about) in the same block. If that doesn't work, Lookup will do its best given the partial context. The user can select text manually if that's not enough... Why don’t we get 3 paragraphs around the word instead? 892894 7 202717 deniau 2013-05-23 08:21:58 -0700 Created attachment 202717 Patch 893414 8 202717 commit-queue 2013-05-24 12:41:17 -0700 Comment on attachment 202717 Patch Clearing flags on attachment: 202717 Committed r150653: <http://trac.webkit.org/changeset/150653> 893415 9 commit-queue 2013-05-24 12:41:19 -0700 All reviewed patches have been landed. Closing bug. 895412 10 thorton 2013-05-30 01:28:35 -0700 This caused https://bugs.webkit.org/show_bug.cgi?id=117020. 199826 2013-04-26 06:47:34 -0700 2013-05-23 08:21:51 -0700 Patch bug-115256-20130426154653.patch text/plain 6188 deniau U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ4OTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDk3NWE3YzVmZTcxNGE2 ZjBiMWJlNmIwMGQ5MTY1OTJlYmUzZWFkMi4uYjI4NmQ3ZWFmZmUyNWUwNTRkNDk5NDM4ODE2M2U5 YjQ2Yzc1YzBhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA0LTI2ICBUaG9t YXMgRGVuaWF1ICA8ZGVuaWF1QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgdGhlIGNvbXBsZXRl IGJsb2NrIGFzIHRoZSBjb250ZXh0IGZvciBEaWN0aW9uYXJ5IGxvb2t1cHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTI1NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAoT09QUyEp LgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46IEV4cG9ydCBzdGFydE9mQmxvY2sgYW5kIGVu ZE9mQmxvY2sgaW4gVmlzaWJsZVVuaXRzCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGJlY2F1c2Ug V2ViUGFnZU1hYy5tbSB3aWxsIG5vdyBjYWxsIHRoZXNlIGluc3RlYWQgb2YKKyAgICAgICAgc3Rh cnRPZlBhcmFncmFwaCBhbmQgZW5kT2ZQYXJhZ3JhcGggdG8gZGV0ZXJtaW5lIGNvbnRleHQgd2hl biBsb29raW5nCisgICAgICAgIHVwIGEgZGVmaW5pdGlvbi4KKwogMjAxMy0wNC0yMyAgTm9hbSBS b3NlbnRoYWwgIDxub2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1RleG1hcF0gRG9uJ3QgcGFp bnQgdG8gYW4gaW50ZXJtZWRpYXRlIHN1cmZhY2Ugd2hlbiB0aGUgcmVzdWx0IGlzIGdvaW5nIHRv IGJlIGNsaXBwZWQgb3V0IGNvbXBsZXRlbHkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjQ1NjFlMzcxYjFmOWYx Y2ZlMjc0NmZmMWJlMTM5MmYyYzhkZjk0OS4uNGUyZTYzMzcyMmUwYmRkZmZiMTk0NmU5OTg1MDY4 OGUzYzZjOGU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA0LTI2ICBUaG9t YXMgRGVuaWF1ICA8ZGVuaWF1QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgdGhlIGNvbXBsZXRl IGJsb2NrIGFzIHRoZSBjb250ZXh0IGZvciBEaWN0aW9uYXJ5IGxvb2t1cHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTI1NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9XZWJQYWdlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwZXJmb3JtRGlj dGlvbmFyeUxvb2t1cEF0TG9jYXRpb24pOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpwZXJm b3JtRGljdGlvbmFyeUxvb2t1cEZvclNlbGVjdGlvbik6CisgICAgICAgIFVzZSB0aGUgZnVsbCBi bG9jayBhcyB0aGUgY29udGV4dCB3aGVuIGxvb2tpbmcgdXAgYSBEaWN0aW9uYXJ5CisgICAgICAg IGRlZmluaXRpb24sIHNvIHRoYXQgaXQgZG9lc24ndCBzdG9wIGF0IGxpbmUgYnJlYWtzLgorCiAy MDEzLTA0LTIzICBOb2FtIFJvc2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBb Q29vcmRpbmF0ZWQgR3JhcGhpY3NdIFJlbW92ZSB0aGUgbG9ja0FuaW1hdGlvbnMgY29kZSBwYXRo CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJD b3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IGVlZDc5NjdkMTczNDYyOWZlMGUwZGI4ZDlkYTlmOTc3 ZGU3YzE1M2EuLjJlY2M2OThjOTIyN2I5MjVlZjkwMjQ2ZTk1MmExNzQ4ODhjMTBlNTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCisrKyBiL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZXhwLmluCkBAIC00MDEsNiArNDAxLDcgQEAgX19aTjdXZWJDb3JlMTRTdG9yYWdl VHJhY2tlcjd0cmFja2VyRXYKIF9fWk43V2ViQ29yZTE0U3RvcmFnZVRyYWNrZXI5c2V0Q2xpZW50 RVBOU18yMFN0b3JhZ2VUcmFja2VyQ2xpZW50RQogX19aTjdXZWJDb3JlMTRkZWNvZGVIb3N0TmFt ZUVQOE5TU3RyaW5nCiBfX1pON1dlYkNvcmUxNGVuY29kZUhvc3ROYW1lRVA4TlNTdHJpbmcKK19f Wk43V2ViQ29yZTEwZW5kT2ZCbG9ja0VSS05TXzE1VmlzaWJsZVBvc2l0aW9uRU5TXzI3RWRpdGlu Z0JvdW5kYXJ5Q3Jvc3NpbmdSdWxlRQogX19aTjdXZWJDb3JlMTRlbmRPZlBhcmFncmFwaEVSS05T XzE1VmlzaWJsZVBvc2l0aW9uRU5TXzI3RWRpdGluZ0JvdW5kYXJ5Q3Jvc3NpbmdSdWxlRQogX19a TjdXZWJDb3JlMTRzZXRNZXRhZGF0YVVSTEVSTjNXVEY2U3RyaW5nRVJLUzFfUzRfCiBfX1pON1dl YkNvcmUxNUFmZmluZVRyYW5zZm9ybTVmbGlwWUV2CkBAIC01NDYsNiArNTQ3LDcgQEAgX19aTjdX ZWJDb3JlMTZlbmNsb3NpbmdJbnRSZWN0RVJLTlNfOUZsb2F0UmVjdEUKIF9fWk43V2ViQ29yZTE2 aXNFbmRPZlBhcmFncmFwaEVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRU5TXzI3RWRpdGluZ0JvdW5k YXJ5Q3Jvc3NpbmdSdWxlRQogX19aTjdXZWJDb3JlMTZpc1VzZXJWaXNpYmxlVVJMRVA4TlNTdHJp bmcKIF9fWk43V2ViQ29yZTE2c2NyaXB0TmFtZVRvQ29kZUVSS04zV1RGNlN0cmluZ0UKK19fWk43 V2ViQ29yZTEyc3RhcnRPZkJsb2NrRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FTlNfMjdFZGl0aW5n Qm91bmRhcnlDcm9zc2luZ1J1bGVFCiBfX1pON1dlYkNvcmUxNnN0YXJ0T2ZQYXJhZ3JhcGhFUktO U18xNVZpc2libGVQb3NpdGlvbkVOU18yN0VkaXRpbmdCb3VuZGFyeUNyb3NzaW5nUnVsZUUKIF9f Wk43V2ViQ29yZTE3Q3JlZGVudGlhbFN0b3JhZ2UyNGdldEZyb21QZXJzaXN0ZW50U3RvcmFnZUVS S05TXzE1UHJvdGVjdGlvblNwYWNlRQogX19aTjdXZWJDb3JlMTdDcmVkZW50aWFsU3RvcmFnZTNn ZXRFUktOU18xNVByb3RlY3Rpb25TcGFjZUUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQppbmRleCA0NGM5MjczZjgyZGUxNDRiOWY3 ZDAwMGRjMzk5MDNjMGIzOTY4NjRlLi5hOTBjODY3NTk1OTAwNzQxOWM3NmZhNTI3YmExMzExMmYw M2RiMDA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1dlYlBhZ2VNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21h Yy9XZWJQYWdlTWFjLm1tCkBAIC01MDYsMTMgKzUwNiwxNCBAQCB2b2lkIFdlYlBhZ2U6OnBlcmZv cm1EaWN0aW9uYXJ5TG9va3VwQXRMb2NhdGlvbihjb25zdCBGbG9hdFBvaW50JiBmbG9hdFBvaW50 KQogCiAgICAgTlNEaWN0aW9uYXJ5ICpvcHRpb25zID0gbmlsOwogCi0gICAgLy8gQXMgY29udGV4 dCwgd2UgYXJlIGdvaW5nIHRvIHVzZSB0aGUgc3Vycm91bmRpbmcgcGFyYWdyYXBoIG9mIHRleHQu Ci0gICAgVmlzaWJsZVBvc2l0aW9uIHBhcmFncmFwaFN0YXJ0ID0gc3RhcnRPZlBhcmFncmFwaChw b3NpdGlvbik7Ci0gICAgVmlzaWJsZVBvc2l0aW9uIHBhcmFncmFwaEVuZCA9IGVuZE9mUGFyYWdy YXBoKHBvc2l0aW9uKTsKKyAgICAvLyBBcyBjb250ZXh0LCB3ZSBhcmUgZ29pbmcgdG8gdXNlIHRo ZSBzdXJyb3VuZGluZyBibG9jaworICAgIC8vIEEgInBhcmFncmFwaCIgaXMgbm90IGVub3VnaCBh cyBpdCBtYXkgc3RvcCBhdCBhIDxicj4gYW5kIExvb2t1cCBzb21ldGltZXMgbmVlZHMgc2V2ZXJh bCBsaW5lcyBvZiBjb250ZXh0LgorICAgIFZpc2libGVQb3NpdGlvbiBibG9ja1N0YXJ0ID0gc3Rh cnRPZkJsb2NrKHBvc2l0aW9uKTsKKyAgICBWaXNpYmxlUG9zaXRpb24gYmxvY2tFbmQgPSBlbmRP ZkJsb2NrKHBvc2l0aW9uKTsKIAotICAgIE5TUmFuZ2UgcmFuZ2VUb1Bhc3MgPSBOU01ha2VSYW5n ZShUZXh0SXRlcmF0b3I6OnJhbmdlTGVuZ3RoKG1ha2VSYW5nZShwYXJhZ3JhcGhTdGFydCwgcG9z aXRpb24pLmdldCgpKSwgMCk7CisgICAgTlNSYW5nZSByYW5nZVRvUGFzcyA9IE5TTWFrZVJhbmdl KFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgobWFrZVJhbmdlKGJsb2NrU3RhcnQsIHBvc2l0aW9u KS5nZXQoKSksIDApOwogCi0gICAgUmVmUHRyPFJhbmdlPiBmdWxsQ2hhcmFjdGVyUmFuZ2UgPSBt YWtlUmFuZ2UocGFyYWdyYXBoU3RhcnQsIHBhcmFncmFwaEVuZCk7CisgICAgUmVmUHRyPFJhbmdl PiBmdWxsQ2hhcmFjdGVyUmFuZ2UgPSBtYWtlUmFuZ2UoYmxvY2tTdGFydCwgYmxvY2tFbmQpOwog ICAgIFN0cmluZyBmdWxsUGxhaW5UZXh0U3RyaW5nID0gcGxhaW5UZXh0KGZ1bGxDaGFyYWN0ZXJS YW5nZS5nZXQoKSk7CiAKICAgICBOU1JhbmdlIGV4dHJhY3RlZFJhbmdlID0gV0tFeHRyYWN0V29y ZERlZmluaXRpb25Ub2tlblJhbmdlRnJvbUNvbnRleHR1YWxTdHJpbmcoZnVsbFBsYWluVGV4dFN0 cmluZywgcmFuZ2VUb1Bhc3MsICZvcHRpb25zKTsKQEAgLTUzNSwxNSArNTM2LDE1IEBAIHZvaWQg V2ViUGFnZTo6cGVyZm9ybURpY3Rpb25hcnlMb29rdXBGb3JTZWxlY3Rpb24oRGljdGlvbmFyeVBv cHVwSW5mbzo6VHlwZSB0eXBlCiAgICAgVmlzaWJsZVBvc2l0aW9uIHNlbGVjdGlvblN0YXJ0ID0g c2VsZWN0aW9uLnZpc2libGVTdGFydCgpOwogICAgIFZpc2libGVQb3NpdGlvbiBzZWxlY3Rpb25F bmQgPSBzZWxlY3Rpb24udmlzaWJsZUVuZCgpOwogCi0gICAgLy8gQXMgY29udGV4dCwgd2UgYXJl IGdvaW5nIHRvIHVzZSB0aGUgc3Vycm91bmRpbmcgcGFyYWdyYXBocyBvZiB0ZXh0LgotICAgIFZp c2libGVQb3NpdGlvbiBwYXJhZ3JhcGhTdGFydCA9IHN0YXJ0T2ZQYXJhZ3JhcGgoc2VsZWN0aW9u U3RhcnQpOwotICAgIFZpc2libGVQb3NpdGlvbiBwYXJhZ3JhcGhFbmQgPSBlbmRPZlBhcmFncmFw aChzZWxlY3Rpb25FbmQpOworICAgIC8vIEFzIGNvbnRleHQsIHdlIGFyZSBnb2luZyB0byB1c2Ug dGhlIHN1cnJvdW5kaW5nIGJsb2NrcworICAgIFZpc2libGVQb3NpdGlvbiBibG9ja1N0YXJ0ID0g c3RhcnRPZkJsb2NrKHNlbGVjdGlvblN0YXJ0KTsKKyAgICBWaXNpYmxlUG9zaXRpb24gYmxvY2tF bmQgPSBlbmRPZkJsb2NrKHNlbGVjdGlvbkVuZCk7CiAKLSAgICBpbnQgbGVuZ3RoVG9TZWxlY3Rp b25TdGFydCA9IFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgobWFrZVJhbmdlKHBhcmFncmFwaFN0 YXJ0LCBzZWxlY3Rpb25TdGFydCkuZ2V0KCkpOwotICAgIGludCBsZW5ndGhUb1NlbGVjdGlvbkVu ZCA9IFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgobWFrZVJhbmdlKHBhcmFncmFwaFN0YXJ0LCBz ZWxlY3Rpb25FbmQpLmdldCgpKTsKKyAgICBpbnQgbGVuZ3RoVG9TZWxlY3Rpb25TdGFydCA9IFRl eHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgobWFrZVJhbmdlKGJsb2NrU3RhcnQsIHNlbGVjdGlvblN0 YXJ0KS5nZXQoKSk7CisgICAgaW50IGxlbmd0aFRvU2VsZWN0aW9uRW5kID0gVGV4dEl0ZXJhdG9y OjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UoYmxvY2tTdGFydCwgc2VsZWN0aW9uRW5kKS5nZXQoKSk7 CiAgICAgTlNSYW5nZSByYW5nZVRvUGFzcyA9IE5TTWFrZVJhbmdlKGxlbmd0aFRvU2VsZWN0aW9u U3RhcnQsIGxlbmd0aFRvU2VsZWN0aW9uRW5kIC0gbGVuZ3RoVG9TZWxlY3Rpb25TdGFydCk7CiAK LSAgICBTdHJpbmcgZnVsbFBsYWluVGV4dFN0cmluZyA9IHBsYWluVGV4dChtYWtlUmFuZ2UocGFy YWdyYXBoU3RhcnQsIHBhcmFncmFwaEVuZCkuZ2V0KCkpOworICAgIFN0cmluZyBmdWxsUGxhaW5U ZXh0U3RyaW5nID0gcGxhaW5UZXh0KG1ha2VSYW5nZShibG9ja1N0YXJ0LCBibG9ja0VuZCkuZ2V0 KCkpOwogCiAgICAgLy8gU2luY2Ugd2UgYWxyZWFkeSBoYXZlIHRoZSByYW5nZSB3ZSB3YW50LCB3 ZSBqdXN0IG5lZWQgdG8gZ3JhYiB0aGUgcmV0dXJuZWQgb3B0aW9ucy4KICAgICBXS0V4dHJhY3RX b3JkRGVmaW5pdGlvblRva2VuUmFuZ2VGcm9tQ29udGV4dHVhbFN0cmluZyhmdWxsUGxhaW5UZXh0 U3RyaW5nLCByYW5nZVRvUGFzcywgJm9wdGlvbnMpOwo= 202717 2013-05-23 08:21:58 -0700 2013-05-24 12:41:17 -0700 Patch bug-115256-20130523172038.patch text/plain 10221 deniau U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwNTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDlmNDUxMDcyYjNiZWI5 N2Q5NTAzYzkzNTcwZDYyMWNiZDYwNWE5ZC4uNmE5MmJhNjU3MTUyZjA2Y2NiZGUzMWMxOTA0ZmYy YjYwM2Y4N2ZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA1LTIzICBUaG9t YXMgRGVuaWF1ICA8ZGVuaWF1QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgbW9yZSBsaW5lcyB0 byB0aGUgY29udGV4dCBkdXJpbmcgRGljdGlvbmFyeSBsb29rdXBzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUyNTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgLSBubyBuZXcgZnVu Y3Rpb25hbGl0eS4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOiBFeHBvcnQgYSBmZXcgbWV0 aG9kcyBpbiBWaXNpYmxlVW5pdHMgbmVlZGVkIHRvIGJlIGFibGUKKyAgICAgICAgdG8gY2FsbCBw cmV2aW91c0xpbmVQb3NpdGlvbigpLCBuZXh0TGluZVBvc2l0aW9uKCksIHN0YXJ0T2ZMaW5lKCkg YW5kCisgICAgICAgIGVuZE9mTGluZSgpIGluIFdlYlBhZ2VNYWMubW0gd2hlbiBkZXRlcm1pbmlu ZyB0aGUgY29udGV4dCB3aGlsZSBsb29raW5nCisgICAgICAgIHVwIGEgZGljdGlvbmFyeSBkZWZp bml0aW9uLiBUaGVzZSBzeW1ib2xzIHVzZWQgdG8gYmUgZXhwb3J0ZWQgZm9yIGlPUworICAgICAg ICBvbmx5LCBleHBvcnQgdGhlbSBvbiB0aGUgZGVza3RvcCB0b28uCisKIDIwMTMtMDUtMjMgIE1p Y2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KIAogICAgICAg ICBbRUZMXSBCYWNrLCBGb3J3YXJkIGFuZCBTdG9wIHNob3VsZCBiZSBoaWRkZW4gaW4gY29udGV4 dCBtZW51CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKaW5kZXggNmU2NzdhMTdiNDM4NDQyY2I4M2UwYTE3MTI3ZDBhNGIwOTQx NzQ4Mi4uZWE3MzcwZDZjNTE2NTNkNjllNDkyNDdkNDJmMWUyNmEzNDg2NzcxOSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA1LTIzICBUaG9tYXMgRGVuaWF1ICA8ZGVuaWF1QGFw cGxlLmNvbT4KKworICAgICAgICBBZGQgbW9yZSBsaW5lcyB0byB0aGUgY29udGV4dCBkdXJpbmcg RGljdGlvbmFyeSBsb29rdXBzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMTUyNTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZTo6cGVyZm9ybURpY3Rpb25hcnlMb29rdXBBdExvY2F0aW9uKToK KyAgICAgICAgSW5zdGVhZCBvZiB1c2luZyB0aGUgY3VycmVudCBwYXJhZ3JhcGggYXMgdGhlIGNv bnRleHQgKHdoaWNoIHN0b3BzIGF0CisgICAgICAgIGxpbmUgYnJlYWtzKSwgZ2V0IGEgZmV3IGxp bmVzIGJlZm9yZSBhbmQgYWZ0ZXIgdGhlIHBvaW50LCBzbyB0aGF0IHRoZQorICAgICAgICBjb250 ZXh0IGNvbnRhaW5zIGF0IGxlYXN0IGZvdXIgbGluZXMgaW4gZWFjaCBkaXJlY3Rpb24uCisgICAg ICAgIFRoaXMgd2F5IHRoZSBEaWN0aW9uYXJ5IHdpbGwgYmUgYWJsZSB0byBsb29rIHVwIHRoaW5n cyB0aGF0IGV4dGVuZCBwYXN0CisgICAgICAgIHRoZSBjdXJyZW50IGxpbmUuCisKIDIwMTMtMDUt MjMgIFJvbGFuZCBUYWthY3MgIDxydGFrYWNzQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBT dXBwb3J0IGZyYW1lIGluc3RydW1lbnRhdGlvbiBmb3IgY29vcmRpbmF0ZWQgZ3JhcGhpY3MKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5leHAuaW4KaW5kZXggMDA0Mzg5YTRiZDkzZjE2YjU4ZmRjMTZhZmU1OTExZWZjNWY2 NjdmMy4uMzg5NTRiOGY1ZTM4YTFkZDliNzg2NjY5ZDIyYTFmODY3ZjU3NmI0YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvV2Vi Q29yZS5leHAuaW4KQEAgLTE2OCw2ICsxNjgsNyBAQCBfX1pON1dlYkNvcmUxMVNRTFJlc3VsdE9r RQogX19aTjdXZWJDb3JlMTFVUkxXaXRoRGF0YUVQNk5TRGF0YVA1TlNVUkwKIF9fWk43V2ViQ29y ZTExaUJlYW1DdXJzb3JFdgogX19aTjdXZWJDb3JlMTFtZW1vcnlDYWNoZUV2CitfX1pON1dlYkNv cmUxMXN0YXJ0T2ZMaW5lRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FCiBfX1pON1dlYkNvcmUxMXN0 YXJ0T2ZXb3JkRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FTlNfOUVXb3JkU2lkZUUKIF9fWk43V2Vi Q29yZTExd3JpdGVUb0ZpbGVFaVBLY2kKIF9fWk43V2ViQ29yZTEyQ2hyb21lQ2xpZW50MjNwYWlu dEN1c3RvbU92ZXJoYW5nQXJlYUVQTlNfMTVHcmFwaGljc0NvbnRleHRFUktOU183SW50UmVjdEVT NV9TNV8KQEAgLTU2Niw2ICs1NjcsNyBAQCBfX1pON1dlYkNvcmUxNmVuY2xvc2luZ0ludFJlY3RF Uks2Q0dSZWN0CiBfX1pON1dlYkNvcmUxNmVuY2xvc2luZ0ludFJlY3RFUktOU185RmxvYXRSZWN0 RQogX19aTjdXZWJDb3JlMTZpc0VuZE9mUGFyYWdyYXBoRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25F TlNfMjdFZGl0aW5nQm91bmRhcnlDcm9zc2luZ1J1bGVFCiBfX1pON1dlYkNvcmUxNmlzVXNlclZp c2libGVVUkxFUDhOU1N0cmluZworX19aTjdXZWJDb3JlMTZuZXh0TGluZVBvc2l0aW9uRVJLTlNf MTVWaXNpYmxlUG9zaXRpb25FaU5TXzEyRWRpdGFibGVUeXBlRQogX19aTjdXZWJDb3JlMTZzY3Jp cHROYW1lVG9Db2RlRVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlMTZzdGFydE9mUGFyYWdy YXBoRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FTlNfMjdFZGl0aW5nQm91bmRhcnlDcm9zc2luZ1J1 bGVFCiBfX1pON1dlYkNvcmUxN0NyZWRlbnRpYWxTdG9yYWdlMjRnZXRGcm9tUGVyc2lzdGVudFN0 b3JhZ2VFUktOU18xNVByb3RlY3Rpb25TcGFjZUUKQEAgLTY4Niw2ICs2ODgsNyBAQCBfX1pON1dl YkNvcmUyMFVzZXJHZXN0dXJlSW5kaWNhdG9yQzFFTlNfMjZQcm9jZXNzaW5nVXNlckdlc3R1cmVT dGF0ZUUKIF9fWk43V2ViQ29yZTIwVXNlckdlc3R1cmVJbmRpY2F0b3JEMUV2CiBfX1pON1dlYkNv cmUyMGRlbGV0ZUVtcHR5RGlyZWN0b3J5RVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlMjBt YWtlUkdCQTMyRnJvbUZsb2F0c0VmZmZmCitfX1pON1dlYkNvcmUyMHByZXZpb3VzTGluZVBvc2l0 aW9uRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FaU5TXzEyRWRpdGFibGVUeXBlRQogX19aTjdXZWJD b3JlMjBwcm90b2NvbElzSmF2YVNjcmlwdEVSS04zV1RGNlN0cmluZ0UKIF9fWk43V2ViQ29yZTIw dG9VSW50MzJFbmZvcmNlUmFuZ2VFUE4zSlNDOUV4ZWNTdGF0ZUVOUzBfN0pTVmFsdWVFCiBfX1pO N1dlYkNvcmUyMUJhY2tGb3J3YXJkQ29udHJvbGxlcjExaXRlbUF0SW5kZXhFaQpAQCAtMTI2Myw2 ICsxMjY2LDcgQEAgX19aTjdXZWJDb3JlOVRpbWVyQmFzZTVzdGFydEVkZAogX19aTjdXZWJDb3Jl OVRpbWVyQmFzZUMyRXYKIF9fWk43V2ViQ29yZTlUaW1lckJhc2VEMkV2CiBfX1pON1dlYkNvcmU5 Y2xvc2VGaWxlRVJpCitfX1pON1dlYkNvcmU5ZW5kT2ZMaW5lRVJLTlNfMTVWaXNpYmxlUG9zaXRp b25FCiBfX1pON1dlYkNvcmU5ZW5kT2ZXb3JkRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FTlNfOUVX b3JkU2lkZUUKIF9fWk43V2ViQ29yZTlmb250Q2FjaGVFdgogX19aTjdXZWJDb3JlOW1ha2VSYW5n ZUVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRVMyXwpAQCAtMTQ0OCw2ICsxNDUyLDcgQEAgX19aTks3 V2ViQ29yZTE1UmVzb3VyY2VSZXF1ZXN0MTJuc1VSTFJlcXVlc3RFTlNfMjBIVFRQQm9keVVwZGF0 ZVBvbGljeUUKIF9fWk5LN1dlYkNvcmUxNVZpc2libGVQb3NpdGlvbjE0Y2hhcmFjdGVyQWZ0ZXJF dgogX19aTks3V2ViQ29yZTE1VmlzaWJsZVBvc2l0aW9uMTRsb2NhbENhcmV0UmVjdEVSUE5TXzEy UmVuZGVyT2JqZWN0RQogX19aTks3V2ViQ29yZTE1VmlzaWJsZVBvc2l0aW9uMTlhYnNvbHV0ZUNh cmV0Qm91bmRzRXYKK19fWk5LN1dlYkNvcmUxNVZpc2libGVQb3NpdGlvbjQ1bGluZURpcmVjdGlv blBvaW50Rm9yQmxvY2tEaXJlY3Rpb25OYXZpZ2F0aW9uRXYKIF9fWk5LN1dlYkNvcmUxNVZpc2li bGVQb3NpdGlvbjRuZXh0RU5TXzI3RWRpdGluZ0JvdW5kYXJ5Q3Jvc3NpbmdSdWxlRQogX19aTks3 V2ViQ29yZTE1VmlzaWJsZVBvc2l0aW9uOHByZXZpb3VzRU5TXzI3RWRpdGluZ0JvdW5kYXJ5Q3Jv c3NpbmdSdWxlRQogX19aTks3V2ViQ29yZTE2RXZlbnRMaXN0ZW5lck1hcDhjb250YWluc0VSS04z V1RGMTJBdG9taWNTdHJpbmdFCkBAIC0xNjM3LDYgKzE2NDIsNyBAQCBfX1pOSzdXZWJDb3JlOFBv c2l0aW9uMTNjb250YWluZXJOb2RlRXYKIF9fWk5LN1dlYkNvcmU4UG9zaXRpb24yNHBhcmVudEFu Y2hvcmVkRXF1aXZhbGVudEV2CiBfX1pOSzdXZWJDb3JlOFBvc2l0aW9uMjVsZWFkaW5nV2hpdGVz cGFjZVBvc2l0aW9uRU5TXzlFQWZmaW5pdHlFYgogX19aTks3V2ViQ29yZThQb3NpdGlvbjI2dHJh aWxpbmdXaGl0ZXNwYWNlUG9zaXRpb25FTlNfOUVBZmZpbml0eUViCitfX1pOSzdXZWJDb3JlOFBv c2l0aW9uMjhvZmZzZXRGb3JQb3NpdGlvbkFmdGVyQW5jaG9yRXYKIF9fWk5LN1dlYkNvcmU4UG9z aXRpb244dXBzdHJlYW1FTlNfMjdFZGl0aW5nQm91bmRhcnlDcm9zc2luZ1J1bGVFCiBfX1pOSzdX ZWJDb3JlOURPTVdpbmRvdzI3cGVuZGluZ1VubG9hZEV2ZW50TGlzdGVuZXJzRXYKIF9fWk5LN1dl YkNvcmU5RmxvYXRRdWFkMTFib3VuZGluZ0JveEV2CkBAIC0yMDY5LDcgKzIwNzUsNiBAQCBfX1pO N1dlYkNvcmUxMU1lbW9yeUNhY2hlMThwcnVuZURlYWRSZXNvdXJjZXNFdgogX19aTjdXZWJDb3Jl MTFNZW1vcnlDYWNoZTE4cHJ1bmVMaXZlUmVzb3VyY2VzRWIKIF9fWk43V2ViQ29yZTExTWVtb3J5 Q2FjaGUyMHJlbW92ZUltYWdlRnJvbUNhY2hlRVJLTlNfNEtVUkxFCiBfX1pON1dlYkNvcmUxMWlz RW5kT2ZMaW5lRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FCi1fX1pON1dlYkNvcmUxMXN0YXJ0T2ZM aW5lRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FCiBfX1pON1dlYkNvcmUxMkV2ZW50SGFuZGxlcjEw bW91c2VNb3ZlZEVQOFdlYkV2ZW50CiBfX1pON1dlYkNvcmUxMkV2ZW50SGFuZGxlcjEwd2hlZWxF dmVudEVQOFdlYkV2ZW50CiBfX1pON1dlYkNvcmUxMkV2ZW50SGFuZGxlcjE1c2VuZFNjcm9sbEV2 ZW50RXYKQEAgLTIxMTgsNyArMjEyMyw2IEBAIF9fWk43V2ViQ29yZTE2VGhyZWFkR2xvYmFsRGF0 YTI2c2hhcmVkTWFpblRocmVhZFN0YXRpY0RhdGFFCiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxl Y3Rpb24yN3NlbGVjdGlvbkZyb21Db250ZW50c09mTm9kZUVQTlNfNE5vZGVFCiBfX1pON1dlYkNv cmUxNlZpc2libGVTZWxlY3Rpb25DMUV2CiBfX1pON1dlYkNvcmUxNmpzU3RyaW5nV2l0aENhY2hl U2xvd0Nhc2VFUE4zSlNDOUV4ZWNTdGF0ZUVSTjNXVEY3SGFzaE1hcElQTlMzXzEwU3RyaW5nSW1w bEVOUzBfNFdlYWtJTlMwXzhKU1N0cmluZ0VFRU5TM18xMFN0cmluZ0hhc2hFTlMzXzEwSGFzaFRy YWl0c0lTNl9FRU5TQl9JUzlfRUVFRVM2XwotX19aTjdXZWJDb3JlMTZuZXh0TGluZVBvc2l0aW9u RVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FaU5TXzEyRWRpdGFibGVUeXBlRQogX19aTjdXZWJDb3Jl MTZuZXh0V29yZFBvc2l0aW9uRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FCiBfX1pON1dlYkNvcmUx N0NyZWRlbnRpYWxTdG9yYWdlMTZjbGVhckNyZWRlbnRpYWxzRXYKIF9fWk43V2ViQ29yZTE3aXNT dGFydE9mRG9jdW1lbnRFUktOU18xNVZpc2libGVQb3NpdGlvbkUKQEAgLTIxMzMsNyArMjEzNyw2 IEBAIF9fWk43V2ViQ29yZTIwZW5kT2ZFZGl0YWJsZUNvbnRlbnRFUktOU18xNVZpc2libGVQb3Np dGlvbkUKIF9fWk43V2ViQ29yZTIwbGFzdE9mZnNldEZvckVkaXRpbmdFUEtOU180Tm9kZUUKIF9f Wk43V2ViQ29yZTIwbmV0d29ya1N0YXRlTm90aWZpZXJFdgogX19aTjdXZWJDb3JlMjBuZXh0U2Vu dGVuY2VQb3NpdGlvbkVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRQotX19aTjdXZWJDb3JlMjBwcmV2 aW91c0xpbmVQb3NpdGlvbkVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRWlOU18xMkVkaXRhYmxlVHlw ZUUKIF9fWk43V2ViQ29yZTIwcHJldmlvdXNXb3JkUG9zaXRpb25FUktOU18xNVZpc2libGVQb3Np dGlvbkUKIF9fWk43V2ViQ29yZTIxTWVtb3J5UHJlc3N1cmVIYW5kbGVyMTljbGVhck1lbW9yeVBy ZXNzdXJlRXYKIF9fWk43V2ViQ29yZTIxTWVtb3J5UHJlc3N1cmVIYW5kbGVyMjVoYXNSZWNlaXZl ZE1lbW9yeVByZXNzdXJlRXYKQEAgLTIyMTMsNyArMjIxNiw2IEBAIF9fWk43V2ViQ29yZTlQYWdl R3JvdXAyMGFkZFVzZXJTY3JpcHRUb1dvcmxkRVBOU18xNURPTVdyYXBwZXJXb3JsZEVSS04zV1RG NlN0cmluCiBfX1pON1dlYkNvcmU5UGFnZUdyb3VwMjRhZGRVc2VyU3R5bGVTaGVldFRvV29ybGRF UE5TXzE1RE9NV3JhcHBlcldvcmxkRVJLTjNXVEY2U3RyaW5nRVJLTlNfNEtVUkxFUktOUzNfNlZl Y3RvcklTNF9MbTBFTlMzXzE1Q3Jhc2hPbk92ZXJmbG93RUVFU0VfTlNfMjVVc2VyQ29udGVudElu amVjdGVkRnJhbWVzRU5TXzE0VXNlclN0eWxlTGV2ZWxFTlNfMjJVc2VyU3R5bGVJbmplY3Rpb25U aW1lRQogX19aTjdXZWJDb3JlOVRpbGVDYWNoZTE0ZHJhaW5MYXllclBvb2xFdgogX19aTjdXZWJD b3JlOVRpbGVDYWNoZTIwc2V0TGF5ZXJQb29sQ2FwYWNpdHlFagotX19aTjdXZWJDb3JlOWVuZE9m TGluZUVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRQogX19aTks3V2ViQ29yZTEwRmxvYXRQb2ludGN2 N0NHUG9pbnRFdgogX19aTks3V2ViQ29yZTE0RnJhbWVTZWxlY3Rpb24xN3dvcmRPZmZzZXRJblJh bmdlRVBLTlNfNVJhbmdlRQogX19aTks3V2ViQ29yZTE0RnJhbWVTZWxlY3Rpb24yMHNlbGVjdGlv bkF0V29yZFN0YXJ0RXYKQEAgLTIyMjcsNyArMjIyOSw2IEBAIF9fWk5LN1dlYkNvcmUxNEZyYW1l U2VsZWN0aW9uMzJyYW5nZUJ5RXh0ZW5kaW5nQ3VycmVudFNlbGVjdGlvbkVpCiBfX1pOSzdXZWJD b3JlMTRGcmFtZVNlbGVjdGlvbjM1Y2hhcmFjdGVySW5SZWxhdGlvblRvQ2FyZXRTZWxlY3Rpb25F aQogX19aTks3V2ViQ29yZTE0RnJhbWVTZWxlY3Rpb24zNmVsZW1lbnRSYW5nZUNvbnRhaW5pbmdD YXJldFNlbGVjdGlvbkV2CiBfX1pOSzdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjh0b1N0cmluZ0V2 Ci1fX1pOSzdXZWJDb3JlMTVWaXNpYmxlUG9zaXRpb240NWxpbmVEaXJlY3Rpb25Qb2ludEZvckJs b2NrRGlyZWN0aW9uTmF2aWdhdGlvbkV2CiBfX1pOSzdXZWJDb3JlMTVWaXNpYmxlUG9zaXRpb240 bGVmdEViCiBfX1pOSzdXZWJDb3JlMTVWaXNpYmxlUG9zaXRpb241cmlnaHRFYgogX19aTks3V2Vi Q29yZTE3UmVuZGVyVGV4dENvbnRyb2wyMnRleHRGb3JtQ29udHJvbEVsZW1lbnRFdgpAQCAtMjI1 NSw3ICsyMjU2LDYgQEAgX19aTks3V2ViQ29yZTZFZGl0b3IxNmhhc0JpZGlTZWxlY3Rpb25Fdgog X19aTks3V2ViQ29yZTZFZGl0b3I2Y2xpZW50RXYKIF9fWk5LN1dlYkNvcmU3SW50U2l6ZWN2NkNH U2l6ZUV2CiBfX1pOSzdXZWJDb3JlOERvY3VtZW50MzFpc1RlbGVwaG9uZU51bWJlclBhcnNpbmdF bmFibGVkRXYKLV9fWk5LN1dlYkNvcmU4UG9zaXRpb24yOG9mZnNldEZvclBvc2l0aW9uQWZ0ZXJB bmNob3JFdgogX19aTks3V2ViQ29yZTlGbG9hdFJlY3RjdjZDR1JlY3RFdgogX19aTks3V2ViQ29y ZTlGbG9hdFNpemVjdjZDR1NpemVFdgogX3dlYlRocmVhZFNob3VsZFlpZWxkCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0gYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMubW0KaW5kZXgg NjczNWM4YzdjYjM2MmFiMmNjYzEzOTFmYjZhMGFkYTQxYjNiZDk2Ny4uYzI3ZWMyOWQ0OTI2M2Fh MGQ2OWE0NGU0ODRjNzJjODQxZjQzNjU0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQpAQCAtNTA3LDEzICs1MDcsMjggQEAg dm9pZCBXZWJQYWdlOjpwZXJmb3JtRGljdGlvbmFyeUxvb2t1cEF0TG9jYXRpb24oY29uc3QgRmxv YXRQb2ludCYgZmxvYXRQb2ludCkKIAogICAgIE5TRGljdGlvbmFyeSAqb3B0aW9ucyA9IG5pbDsK IAotICAgIC8vIEFzIGNvbnRleHQsIHdlIGFyZSBnb2luZyB0byB1c2UgdGhlIHN1cnJvdW5kaW5n IHBhcmFncmFwaCBvZiB0ZXh0LgotICAgIFZpc2libGVQb3NpdGlvbiBwYXJhZ3JhcGhTdGFydCA9 IHN0YXJ0T2ZQYXJhZ3JhcGgocG9zaXRpb24pOwotICAgIFZpc2libGVQb3NpdGlvbiBwYXJhZ3Jh cGhFbmQgPSBlbmRPZlBhcmFncmFwaChwb3NpdGlvbik7Ci0KLSAgICBOU1JhbmdlIHJhbmdlVG9Q YXNzID0gTlNNYWtlUmFuZ2UoVGV4dEl0ZXJhdG9yOjpyYW5nZUxlbmd0aChtYWtlUmFuZ2UocGFy YWdyYXBoU3RhcnQsIHBvc2l0aW9uKS5nZXQoKSksIDApOworICAgIC8vIEFzIGNvbnRleHQsIHdl IGFyZSBnb2luZyB0byB1c2UgZm91ciBsaW5lcyBvZiB0ZXh0IGJlZm9yZSBhbmQgYWZ0ZXIgdGhl IHBvaW50LiAoRGljdGlvbmFyeSBjYW4gc29tZXRpbWVzIGxvb2sgdXAgdGhpbmdzIHRoYXQgYXJl IGZvdXIgbGluZXMgbG9uZykKKyAgICBjb25zdCBpbnQgbnVtYmVyT2ZMaW5lc09mQ29udGV4dCA9 IDQ7CisgICAgVmlzaWJsZVBvc2l0aW9uIGNvbnRleHRTdGFydCA9IHBvc2l0aW9uOworICAgIFZp c2libGVQb3NpdGlvbiBjb250ZXh0RW5kID0gcG9zaXRpb247CisgICAgZm9yIChpbnQgaSA9IDA7 IGkgPCBudW1iZXJPZkxpbmVzT2ZDb250ZXh0OyBpKyspIHsKKyAgICAgICAgVmlzaWJsZVBvc2l0 aW9uIG4gPSBwcmV2aW91c0xpbmVQb3NpdGlvbihjb250ZXh0U3RhcnQsIGNvbnRleHRTdGFydC5s aW5lRGlyZWN0aW9uUG9pbnRGb3JCbG9ja0RpcmVjdGlvbk5hdmlnYXRpb24oKSk7CisgICAgICAg IGlmIChuLmlzTnVsbCgpIHx8IG4gPT0gY29udGV4dFN0YXJ0KQorICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGNvbnRleHRTdGFydCA9IG47CisgICAgfQorICAgIGZvciAoaW50IGkgPSAwOyBp IDwgbnVtYmVyT2ZMaW5lc09mQ29udGV4dDsgaSsrKSB7CisgICAgICAgIFZpc2libGVQb3NpdGlv biBuID0gbmV4dExpbmVQb3NpdGlvbihjb250ZXh0RW5kLCBjb250ZXh0RW5kLmxpbmVEaXJlY3Rp b25Qb2ludEZvckJsb2NrRGlyZWN0aW9uTmF2aWdhdGlvbigpKTsKKyAgICAgICAgaWYgKG4uaXNO dWxsKCkgfHwgbiA9PSBjb250ZXh0RW5kKQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNv bnRleHRFbmQgPSBuOworICAgIH0KKyAgICBjb250ZXh0U3RhcnQgPSBzdGFydE9mTGluZShjb250 ZXh0U3RhcnQpOworICAgIGNvbnRleHRFbmQgPSBlbmRPZkxpbmUoY29udGV4dEVuZCk7CisgICAg CisgICAgTlNSYW5nZSByYW5nZVRvUGFzcyA9IE5TTWFrZVJhbmdlKFRleHRJdGVyYXRvcjo6cmFu Z2VMZW5ndGgobWFrZVJhbmdlKGNvbnRleHRTdGFydCwgcG9zaXRpb24pLmdldCgpKSwgMCk7CiAK LSAgICBSZWZQdHI8UmFuZ2U+IGZ1bGxDaGFyYWN0ZXJSYW5nZSA9IG1ha2VSYW5nZShwYXJhZ3Jh cGhTdGFydCwgcGFyYWdyYXBoRW5kKTsKKyAgICBSZWZQdHI8UmFuZ2U+IGZ1bGxDaGFyYWN0ZXJS YW5nZSA9IG1ha2VSYW5nZShjb250ZXh0U3RhcnQsIGNvbnRleHRFbmQpOwogICAgIFN0cmluZyBm dWxsUGxhaW5UZXh0U3RyaW5nID0gcGxhaW5UZXh0KGZ1bGxDaGFyYWN0ZXJSYW5nZS5nZXQoKSk7 CiAKICAgICBOU1JhbmdlIGV4dHJhY3RlZFJhbmdlID0gV0tFeHRyYWN0V29yZERlZmluaXRpb25U b2tlblJhbmdlRnJvbUNvbnRleHR1YWxTdHJpbmcoZnVsbFBsYWluVGV4dFN0cmluZywgcmFuZ2VU b1Bhc3MsICZvcHRpb25zKTsK