140979 2015-01-27 19:32:58 -0800 Rename descendentxxx to descendantxxxx in RenderLayerBacking 2015-01-28 00:09:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jm86.kim webkit-unassigned commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser sun.shin oldest_to_newest 1064775 0 jm86.kim 2015-01-27 19:32:58 -0800 Rename descendentxxx to descendantxxxx in RenderLayerBacking 1064777 1 245507 jm86.kim 2015-01-27 19:38:10 -0800 Created attachment 245507 Patch 1064781 2 245510 jm86.kim 2015-01-27 19:47:21 -0800 Created attachment 245510 Patch 1064794 3 simon.fraser 2015-01-27 20:48:03 -0800 Thanks for doing this, but I'm not sure it's quite accurate. FYI, the dictionary says: "usage: The correct spelling for the noun meaning ‘person descended from a particular ancestor’ is descendant, ending with the suffix -ant, not -ent (as in she claims to be a descendant of Paul Revere). The word descendent is an adjective, now used almost exclusively in scientific contexts, meaning ‘descending from an ancestor’ (as in extinct species are replaced by descendent species). Almost 15 percent of the citations for the noun in the Oxford English Corpus use the wrong spelling." Our usage sometimes follows the adjectival form, so I don't think we're using the -ent for incorrectly. 1064803 4 sun.shin 2015-01-27 21:09:15 -0800 @Simon, we are totally agree with your idea. However, from a debugging perspective, it is a little hard to track logic if there are two different words are used for same meaning in a one file. So, we want to enhance the readability of the code itself. 1064816 5 simon.fraser 2015-01-27 23:20:28 -0800 I do not object to the patch. I think consistency is good. 1064831 6 245510 commit-queue 2015-01-28 00:09:26 -0800 Comment on attachment 245510 Patch Clearing flags on attachment: 245510 Committed r179244: <http://trac.webkit.org/changeset/179244> 1064832 7 commit-queue 2015-01-28 00:09:30 -0800 All reviewed patches have been landed. Closing bug. 245507 2015-01-27 19:38:10 -0800 2015-01-27 19:47:14 -0800 Patch bug-140979-20150128123813.patch text/plain 7278 jm86.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5MjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjZjNTBjZjY3ZDRkN2Vi MTliNDkwMjFiOTI3YWY3ZjNlOWJmMGNjZC4uMTdjMjQwMDVlY2E4OTgwMzc5OGE3MTM5ZmEyODJl NmY0MDUxMGIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTAxLTI3ICBKZW9u Z21pbiBLaW0gIDxqbTg2LmtpbUBsZ2UuY29tPgorCisgICAgICAgIFJlbmFtZSBkZXNjZW5kZW50 eHh4IHRvIGRlc2NlbmRhbnR4eHh4IGluIFJlbmRlckxheWVyQmFja2luZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwOTc5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIGRlc2NlbmRlbnR4eHgg dG8gZGVzY2VuZGFudHh4eHggaW4gUmVuZGVyTGF5ZXJCYWNraW5nCisgICAgICAgIGZvciBtYXRj aGluZyBvdGhlciB2YXJpYWJsZXMgYW5kIGZ1bmN0aW9uIG5hbWVzLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZUNvbmZpZ3VyYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVBZnRlckRlc2NlbmRhbnRzKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ2hpbGRDbGlwcGluZ1N0cmF0ZWd5KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6cGFpbnRzQ2hpbGRyZW4pOgorICAg ICAgICAoV2ViQ29yZTo6ZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6aXNQYWludERlc3RpbmF0aW9uRm9yRGVz Y2VuZGFudExheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpkZXNjZW5kZW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNr aW5nOjppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKTogRGVsZXRlZC4KKwog MjAxNS0wMS0yNyAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYkdMMjogRGlzYWJsZSB2YXJpb3VzIGV4dGVuc2lvbnMgb24gV2ViR0wyIGNvbnRleHQgdGhh dCBoYXZlIGJlZW4gcHJvbW90ZWQgdG8gY29yZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggODA1MmYxNjM3YWVlYjI5MGY5MGJiMjRm OGVkMjg1NzUwMTQ3ZDU3MS4uMDZjMTAwNDc1ZTM3NzkzMWY1ZDZiYjA4ZjY5OTMyNjY1ZDI1NTJm YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAKQEAgLTU1MCw3ICs1NTAsNyBAQCBib29sIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29u ZmlndXJhdGlvbigpCiAgICAgaWYgKHVwZGF0ZUZvcmVncm91bmRMYXllcihjb21wb3NpdG9yKCku bmVlZHNDb250ZW50c0NvbXBvc2l0aW5nTGF5ZXIobV9vd25pbmdMYXllcikpKQogICAgICAgICBs YXllckNvbmZpZ0NoYW5nZWQgPSB0cnVlOwogICAgIAotICAgIGJvb2wgbmVlZHNEZXNjZW5kZW50 c0NsaXBwaW5nTGF5ZXIgPSBjb21wb3NpdG9yKCkuY2xpcHNDb21wb3NpdGluZ0Rlc2NlbmRhbnRz KG1fb3duaW5nTGF5ZXIpOworICAgIGJvb2wgbmVlZHNEZXNjZW5kYW50c0NsaXBwaW5nTGF5ZXIg PSBjb21wb3NpdG9yKCkuY2xpcHNDb21wb3NpdGluZ0Rlc2NlbmRhbnRzKG1fb3duaW5nTGF5ZXIp OwogCiAgICAgaWYgKCFyZW5kZXJlcigpLnZpZXcoKS5uZWVkc0xheW91dCgpKSB7CiAgICAgICAg IGJvb2wgdXNlc0NvbXBvc2l0ZWRTY3JvbGxpbmc7CkBAIC01NjEsMTIgKzU2MSwxMiBAQCBib29s IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbigpCiAjZW5kaWYKICAgICAg ICAgLy8gT3VyIHNjcm9sbGluZyBsYXllciB3aWxsIGNsaXAuCiAgICAgICAgIGlmICh1c2VzQ29t cG9zaXRlZFNjcm9sbGluZykKLSAgICAgICAgICAgIG5lZWRzRGVzY2VuZGVudHNDbGlwcGluZ0xh eWVyID0gZmFsc2U7CisgICAgICAgICAgICBuZWVkc0Rlc2NlbmRhbnRzQ2xpcHBpbmdMYXllciA9 IGZhbHNlOwogCiAgICAgICAgIGlmICh1cGRhdGVTY3JvbGxpbmdMYXllcnModXNlc0NvbXBvc2l0 ZWRTY3JvbGxpbmcpKQogICAgICAgICAgICAgbGF5ZXJDb25maWdDaGFuZ2VkID0gdHJ1ZTsKIAot ICAgICAgICBpZiAodXBkYXRlRGVzY2VuZGFudENsaXBwaW5nTGF5ZXIobmVlZHNEZXNjZW5kZW50 c0NsaXBwaW5nTGF5ZXIpKQorICAgICAgICBpZiAodXBkYXRlRGVzY2VuZGFudENsaXBwaW5nTGF5 ZXIobmVlZHNEZXNjZW5kYW50c0NsaXBwaW5nTGF5ZXIpKQogICAgICAgICAgICAgbGF5ZXJDb25m aWdDaGFuZ2VkID0gdHJ1ZTsKICAgICB9CiAKQEAgLTU4Niw3ICs1ODYsNyBAQCBib29sIFJlbmRl ckxheWVyQmFja2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbigpCiAKICAgICB1cGRhdGVNYXNrTGF5 ZXIocmVuZGVyZXIoKS5oYXNNYXNrKCkpOwogCi0gICAgdXBkYXRlQ2hpbGRDbGlwcGluZ1N0cmF0 ZWd5KG5lZWRzRGVzY2VuZGVudHNDbGlwcGluZ0xheWVyKTsKKyAgICB1cGRhdGVDaGlsZENsaXBw aW5nU3RyYXRlZ3kobmVlZHNEZXNjZW5kYW50c0NsaXBwaW5nTGF5ZXIpOwogCiAgICAgaWYgKG1f b3duaW5nTGF5ZXIuaGFzUmVmbGVjdGlvbigpKSB7CiAgICAgICAgIGlmIChtX293bmluZ0xheWVy LnJlZmxlY3Rpb25MYXllcigpLT5iYWNraW5nKCkpIHsKQEAgLTEwMTYsNyArMTAxNiw3IEBAIHZv aWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVBZnRlckRlc2NlbmRhbnRzKCkKIAogICAgIHVw ZGF0ZURyYXdzQ29udGVudChpc1NpbXBsZUNvbnRhaW5lcik7CiAKLSAgICBtX2dyYXBoaWNzTGF5 ZXItPnNldENvbnRlbnRzVmlzaWJsZShtX293bmluZ0xheWVyLmhhc1Zpc2libGVDb250ZW50KCkg fHwgaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGVudExheWVycygpKTsKKyAgICBtX2dyYXBo aWNzTGF5ZXItPnNldENvbnRlbnRzVmlzaWJsZShtX293bmluZ0xheWVyLmhhc1Zpc2libGVDb250 ZW50KCkgfHwgaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycygpKTsKIH0KIAog dm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OmFkanVzdEFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHNG b3JGbG93VGhyZWFkKExheW91dFJlY3QmIGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMsIGNvbnN0 IFJlbmRlckxheWVyKiBjb21wb3NpdGluZ0FuY2VzdG9yKSBjb25zdApAQCAtMTQ0NSw5ICsxNDQ1 LDkgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZU1hc2tMYXllcihib29sIG5lZWRz TWFza0xheWVyKQogICAgICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFBhaW50aW5nUGhhc2UocGFp bnRpbmdQaGFzZUZvclByaW1hcnlMYXllcigpKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUNoaWxkQ2xpcHBpbmdTdHJhdGVneShib29sIG5lZWRzRGVzY2VuZGVudHNDbGlw cGluZ0xheWVyKQordm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNoaWxkQ2xpcHBpbmdT dHJhdGVneShib29sIG5lZWRzRGVzY2VuZGFudHNDbGlwcGluZ0xheWVyKQogewotICAgIGlmICho YXNDbGlwcGluZ0xheWVyKCkgJiYgbmVlZHNEZXNjZW5kZW50c0NsaXBwaW5nTGF5ZXIpIHsKKyAg ICBpZiAoaGFzQ2xpcHBpbmdMYXllcigpICYmIG5lZWRzRGVzY2VuZGFudHNDbGlwcGluZ0xheWVy KSB7CiAgICAgICAgIGlmIChpczxSZW5kZXJCb3g+KHJlbmRlcmVyKCkpICYmIChyZW5kZXJlcigp LnN0eWxlKCkuY2xpcFBhdGgoKSB8fCByZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVz KCkpKSB7CiAgICAgICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgZG93 bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcigpKS5zaXplKCkpOwogICAgICAgICAgICAgRmxvYXRS b3VuZGVkUmVjdCBjb250ZW50c0NsaXBwaW5nUmVjdCA9IHJlbmRlcmVyKCkuc3R5bGUoKS5nZXRS b3VuZGVkSW5uZXJCb3JkZXJGb3IoYm94UmVjdCkucGl4ZWxTbmFwcGVkUm91bmRlZFJlY3RGb3JQ YWludGluZyhkZXZpY2VTY2FsZUZhY3RvcigpKTsKQEAgLTE3NDgsNyArMTc0OCw3IEBAIGJvb2wg UmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludHNDaGlsZHJlbigpIGNvbnN0CiAgICAgaWYgKG1fb3du aW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSAmJiBtX293bmluZ0xheWVyLmhhc05vbkVtcHR5 Q2hpbGRSZW5kZXJlcnMoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAoaXNQYWlu dERlc3RpbmF0aW9uRm9yRGVzY2VuZGVudExheWVycygpKQorICAgIGlmIChpc1BhaW50RGVzdGlu YXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJzKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAg cmV0dXJuIGZhbHNlOwpAQCAtMTgxOSw3ICsxODE5LDcgQEAgc3RhdGljIGJvb2wgY29tcG9zaXRl ZFdpdGhPd25CYWNraW5nU3RvcmUoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyKQogICAgIHJldHVy biBsYXllci0+aXNDb21wb3NpdGVkKCkgJiYgIWxheWVyLT5iYWNraW5nKCktPnBhaW50c0ludG9D b21wb3NpdGVkQW5jZXN0b3IoKTsKIH0KIAotc3RhdGljIGJvb2wgZGVzY2VuZGVudExheWVyUGFp bnRzSW50b0FuY2VzdG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCitzdGF0aWMgYm9vbCBkZXNjZW5k YW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXImIHBhcmVudCkKIHsKICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkbid0IGJlIGNhbGxlZCB3aXRoIGEgc3RhbGUgei1vcmRlciBsaXN0 cy4gU2VlIGJ1ZyA4NTUxMi4KICAgICBwYXJlbnQudXBkYXRlTGF5ZXJMaXN0c0lmTmVlZGVkKCk7 CkBAIC0xODMzLDcgKzE4MzMsNyBAQCBzdGF0aWMgYm9vbCBkZXNjZW5kZW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXImIHBhcmVudCkKICAgICAgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAgICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5 ZXIgPSBub3JtYWxGbG93TGlzdC0+YXQoaSk7CiAgICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRX aXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQotICAgICAgICAgICAgICAgICYmIChjdXJMYXll ci0+aXNWaXN1YWxseU5vbkVtcHR5KCkgfHwgZGVzY2VuZGVudExheWVyUGFpbnRzSW50b0FuY2Vz dG9yKCpjdXJMYXllcikpKQorICAgICAgICAgICAgICAgICYmIChjdXJMYXllci0+aXNWaXN1YWxs eU5vbkVtcHR5KCkgfHwgZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKCpjdXJMYXll cikpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgfQpAQCAt MTg0OCw3ICsxODQ4LDcgQEAgc3RhdGljIGJvb2wgZGVzY2VuZGVudExheWVyUGFpbnRzSW50b0Fu Y2VzdG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCiAgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGxpc3RTaXplOyArK2kpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJMYXllciogY3Vy TGF5ZXIgPSBuZWdaT3JkZXJMaXN0LT5hdChpKTsKICAgICAgICAgICAgICAgICBpZiAoIWNvbXBv c2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQotICAgICAgICAgICAgICAgICAgICAm JiAoY3VyTGF5ZXItPmlzVmlzdWFsbHlOb25FbXB0eSgpIHx8IGRlc2NlbmRlbnRMYXllclBhaW50 c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKKyAgICAgICAgICAgICAgICAgICAgJiYgKGN1ckxh eWVyLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSB8fCBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5j ZXN0b3IoKmN1ckxheWVyKSkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICAgICAgfQogICAgICAgICB9CkBAIC0xODU4LDcgKzE4NTgsNyBAQCBzdGF0aWMgYm9vbCBk ZXNjZW5kZW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXImIHBhcmVudCkKICAg ICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNpemU7ICsraSkgewogICAgICAg ICAgICAgICAgIFJlbmRlckxheWVyKiBjdXJMYXllciA9IHBvc1pPcmRlckxpc3QtPmF0KGkpOwog ICAgICAgICAgICAgICAgIGlmICghY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoY3VyTGF5 ZXIpCi0gICAgICAgICAgICAgICAgICAgICYmIChjdXJMYXllci0+aXNWaXN1YWxseU5vbkVtcHR5 KCkgfHwgZGVzY2VuZGVudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKCpjdXJMYXllcikpKQorICAg ICAgICAgICAgICAgICAgICAmJiAoY3VyTGF5ZXItPmlzVmlzdWFsbHlOb25FbXB0eSgpIHx8IGRl c2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTE4Njgs OSArMTg2OCw5IEBAIHN0YXRpYyBib29sIGRlc2NlbmRlbnRMYXllclBhaW50c0ludG9BbmNlc3Rv cihSZW5kZXJMYXllciYgcGFyZW50KQogfQogCiAvLyBDb25zZXJ2YXRpdmUgdGVzdCBmb3IgaGF2 aW5nIG5vIHJlbmRlcmVkIGNoaWxkcmVuLgotYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OmlzUGFp bnREZXN0aW5hdGlvbkZvckRlc2NlbmRlbnRMYXllcnMoKSBjb25zdAorYm9vbCBSZW5kZXJMYXll ckJhY2tpbmc6OmlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2NlbmRhbnRMYXllcnMoKSBjb25zdAog ewotICAgIHJldHVybiBkZXNjZW5kZW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IobV9vd25pbmdM YXllcik7CisgICAgcmV0dXJuIGRlc2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcihtX293 bmluZ0xheWVyKTsKIH0KIAogYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OmNvbnRhaW5zUGFpbnRl ZENvbnRlbnQoYm9vbCBpc1NpbXBsZUNvbnRhaW5lcikgY29uc3QK 245510 2015-01-27 19:47:21 -0800 2015-01-28 00:09:26 -0800 Patch bug-140979-20150128124724.patch text/plain 8196 jm86.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5MjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjZjNTBjZjY3ZDRkN2Vi MTliNDkwMjFiOTI3YWY3ZjNlOWJmMGNjZC4uMTdjMjQwMDVlY2E4OTgwMzc5OGE3MTM5ZmEyODJl NmY0MDUxMGIxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE1LTAxLTI3ICBKZW9u Z21pbiBLaW0gIDxqbTg2LmtpbUBsZ2UuY29tPgorCisgICAgICAgIFJlbmFtZSBkZXNjZW5kZW50 eHh4IHRvIGRlc2NlbmRhbnR4eHh4IGluIFJlbmRlckxheWVyQmFja2luZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwOTc5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIGRlc2NlbmRlbnR4eHgg dG8gZGVzY2VuZGFudHh4eHggaW4gUmVuZGVyTGF5ZXJCYWNraW5nCisgICAgICAgIGZvciBtYXRj aGluZyBvdGhlciB2YXJpYWJsZXMgYW5kIGZ1bmN0aW9uIG5hbWVzLgorCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZUNvbmZpZ3VyYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVBZnRlckRlc2NlbmRhbnRzKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ2hpbGRDbGlwcGluZ1N0cmF0ZWd5KToKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6cGFpbnRzQ2hpbGRyZW4pOgorICAg ICAgICAoV2ViQ29yZTo6ZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6aXNQYWludERlc3RpbmF0aW9uRm9yRGVz Y2VuZGFudExheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpkZXNjZW5kZW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNr aW5nOjppc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKTogRGVsZXRlZC4KKwog MjAxNS0wMS0yNyAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUuY29tPgogCiAgICAgICAg IFdlYkdMMjogRGlzYWJsZSB2YXJpb3VzIGV4dGVuc2lvbnMgb24gV2ViR0wyIGNvbnRleHQgdGhh dCBoYXZlIGJlZW4gcHJvbW90ZWQgdG8gY29yZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggODA1MmYxNjM3YWVlYjI5MGY5MGJiMjRm OGVkMjg1NzUwMTQ3ZDU3MS4uMDZjMTAwNDc1ZTM3NzkzMWY1ZDZiYjA4ZjY5OTMyNjY1ZDI1NTJm YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAKQEAgLTU1MCw3ICs1NTAsNyBAQCBib29sIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29u ZmlndXJhdGlvbigpCiAgICAgaWYgKHVwZGF0ZUZvcmVncm91bmRMYXllcihjb21wb3NpdG9yKCku bmVlZHNDb250ZW50c0NvbXBvc2l0aW5nTGF5ZXIobV9vd25pbmdMYXllcikpKQogICAgICAgICBs YXllckNvbmZpZ0NoYW5nZWQgPSB0cnVlOwogICAgIAotICAgIGJvb2wgbmVlZHNEZXNjZW5kZW50 c0NsaXBwaW5nTGF5ZXIgPSBjb21wb3NpdG9yKCkuY2xpcHNDb21wb3NpdGluZ0Rlc2NlbmRhbnRz KG1fb3duaW5nTGF5ZXIpOworICAgIGJvb2wgbmVlZHNEZXNjZW5kYW50c0NsaXBwaW5nTGF5ZXIg PSBjb21wb3NpdG9yKCkuY2xpcHNDb21wb3NpdGluZ0Rlc2NlbmRhbnRzKG1fb3duaW5nTGF5ZXIp OwogCiAgICAgaWYgKCFyZW5kZXJlcigpLnZpZXcoKS5uZWVkc0xheW91dCgpKSB7CiAgICAgICAg IGJvb2wgdXNlc0NvbXBvc2l0ZWRTY3JvbGxpbmc7CkBAIC01NjEsMTIgKzU2MSwxMiBAQCBib29s IFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbigpCiAjZW5kaWYKICAgICAg ICAgLy8gT3VyIHNjcm9sbGluZyBsYXllciB3aWxsIGNsaXAuCiAgICAgICAgIGlmICh1c2VzQ29t cG9zaXRlZFNjcm9sbGluZykKLSAgICAgICAgICAgIG5lZWRzRGVzY2VuZGVudHNDbGlwcGluZ0xh eWVyID0gZmFsc2U7CisgICAgICAgICAgICBuZWVkc0Rlc2NlbmRhbnRzQ2xpcHBpbmdMYXllciA9 IGZhbHNlOwogCiAgICAgICAgIGlmICh1cGRhdGVTY3JvbGxpbmdMYXllcnModXNlc0NvbXBvc2l0 ZWRTY3JvbGxpbmcpKQogICAgICAgICAgICAgbGF5ZXJDb25maWdDaGFuZ2VkID0gdHJ1ZTsKIAot ICAgICAgICBpZiAodXBkYXRlRGVzY2VuZGFudENsaXBwaW5nTGF5ZXIobmVlZHNEZXNjZW5kZW50 c0NsaXBwaW5nTGF5ZXIpKQorICAgICAgICBpZiAodXBkYXRlRGVzY2VuZGFudENsaXBwaW5nTGF5 ZXIobmVlZHNEZXNjZW5kYW50c0NsaXBwaW5nTGF5ZXIpKQogICAgICAgICAgICAgbGF5ZXJDb25m aWdDaGFuZ2VkID0gdHJ1ZTsKICAgICB9CiAKQEAgLTU4Niw3ICs1ODYsNyBAQCBib29sIFJlbmRl ckxheWVyQmFja2luZzo6dXBkYXRlQ29uZmlndXJhdGlvbigpCiAKICAgICB1cGRhdGVNYXNrTGF5 ZXIocmVuZGVyZXIoKS5oYXNNYXNrKCkpOwogCi0gICAgdXBkYXRlQ2hpbGRDbGlwcGluZ1N0cmF0 ZWd5KG5lZWRzRGVzY2VuZGVudHNDbGlwcGluZ0xheWVyKTsKKyAgICB1cGRhdGVDaGlsZENsaXBw aW5nU3RyYXRlZ3kobmVlZHNEZXNjZW5kYW50c0NsaXBwaW5nTGF5ZXIpOwogCiAgICAgaWYgKG1f b3duaW5nTGF5ZXIuaGFzUmVmbGVjdGlvbigpKSB7CiAgICAgICAgIGlmIChtX293bmluZ0xheWVy LnJlZmxlY3Rpb25MYXllcigpLT5iYWNraW5nKCkpIHsKQEAgLTEwMTYsNyArMTAxNiw3IEBAIHZv aWQgUmVuZGVyTGF5ZXJCYWNraW5nOjp1cGRhdGVBZnRlckRlc2NlbmRhbnRzKCkKIAogICAgIHVw ZGF0ZURyYXdzQ29udGVudChpc1NpbXBsZUNvbnRhaW5lcik7CiAKLSAgICBtX2dyYXBoaWNzTGF5 ZXItPnNldENvbnRlbnRzVmlzaWJsZShtX293bmluZ0xheWVyLmhhc1Zpc2libGVDb250ZW50KCkg fHwgaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGVudExheWVycygpKTsKKyAgICBtX2dyYXBo aWNzTGF5ZXItPnNldENvbnRlbnRzVmlzaWJsZShtX293bmluZ0xheWVyLmhhc1Zpc2libGVDb250 ZW50KCkgfHwgaXNQYWludERlc3RpbmF0aW9uRm9yRGVzY2VuZGFudExheWVycygpKTsKIH0KIAog dm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OmFkanVzdEFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHNG b3JGbG93VGhyZWFkKExheW91dFJlY3QmIGFuY2VzdG9yQ29tcG9zaXRpbmdCb3VuZHMsIGNvbnN0 IFJlbmRlckxheWVyKiBjb21wb3NpdGluZ0FuY2VzdG9yKSBjb25zdApAQCAtMTQ0NSw5ICsxNDQ1 LDkgQEAgdm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZU1hc2tMYXllcihib29sIG5lZWRz TWFza0xheWVyKQogICAgICAgICBtX2dyYXBoaWNzTGF5ZXItPnNldFBhaW50aW5nUGhhc2UocGFp bnRpbmdQaGFzZUZvclByaW1hcnlMYXllcigpKTsKIH0KIAotdm9pZCBSZW5kZXJMYXllckJhY2tp bmc6OnVwZGF0ZUNoaWxkQ2xpcHBpbmdTdHJhdGVneShib29sIG5lZWRzRGVzY2VuZGVudHNDbGlw cGluZ0xheWVyKQordm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUNoaWxkQ2xpcHBpbmdT dHJhdGVneShib29sIG5lZWRzRGVzY2VuZGFudHNDbGlwcGluZ0xheWVyKQogewotICAgIGlmICho YXNDbGlwcGluZ0xheWVyKCkgJiYgbmVlZHNEZXNjZW5kZW50c0NsaXBwaW5nTGF5ZXIpIHsKKyAg ICBpZiAoaGFzQ2xpcHBpbmdMYXllcigpICYmIG5lZWRzRGVzY2VuZGFudHNDbGlwcGluZ0xheWVy KSB7CiAgICAgICAgIGlmIChpczxSZW5kZXJCb3g+KHJlbmRlcmVyKCkpICYmIChyZW5kZXJlcigp LnN0eWxlKCkuY2xpcFBhdGgoKSB8fCByZW5kZXJlcigpLnN0eWxlKCkuaGFzQm9yZGVyUmFkaXVz KCkpKSB7CiAgICAgICAgICAgICBMYXlvdXRSZWN0IGJveFJlY3QoTGF5b3V0UG9pbnQoKSwgZG93 bmNhc3Q8UmVuZGVyQm94PihyZW5kZXJlcigpKS5zaXplKCkpOwogICAgICAgICAgICAgRmxvYXRS b3VuZGVkUmVjdCBjb250ZW50c0NsaXBwaW5nUmVjdCA9IHJlbmRlcmVyKCkuc3R5bGUoKS5nZXRS b3VuZGVkSW5uZXJCb3JkZXJGb3IoYm94UmVjdCkucGl4ZWxTbmFwcGVkUm91bmRlZFJlY3RGb3JQ YWludGluZyhkZXZpY2VTY2FsZUZhY3RvcigpKTsKQEAgLTE3NDgsNyArMTc0OCw3IEBAIGJvb2wg UmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludHNDaGlsZHJlbigpIGNvbnN0CiAgICAgaWYgKG1fb3du aW5nTGF5ZXIuaGFzVmlzaWJsZUNvbnRlbnQoKSAmJiBtX293bmluZ0xheWVyLmhhc05vbkVtcHR5 Q2hpbGRSZW5kZXJlcnMoKSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAoaXNQYWlu dERlc3RpbmF0aW9uRm9yRGVzY2VuZGVudExheWVycygpKQorICAgIGlmIChpc1BhaW50RGVzdGlu YXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJzKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAg cmV0dXJuIGZhbHNlOwpAQCAtMTgxOSw3ICsxODE5LDcgQEAgc3RhdGljIGJvb2wgY29tcG9zaXRl ZFdpdGhPd25CYWNraW5nU3RvcmUoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyKQogICAgIHJldHVy biBsYXllci0+aXNDb21wb3NpdGVkKCkgJiYgIWxheWVyLT5iYWNraW5nKCktPnBhaW50c0ludG9D b21wb3NpdGVkQW5jZXN0b3IoKTsKIH0KIAotc3RhdGljIGJvb2wgZGVzY2VuZGVudExheWVyUGFp bnRzSW50b0FuY2VzdG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCitzdGF0aWMgYm9vbCBkZXNjZW5k YW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXImIHBhcmVudCkKIHsKICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkbid0IGJlIGNhbGxlZCB3aXRoIGEgc3RhbGUgei1vcmRlciBsaXN0 cy4gU2VlIGJ1ZyA4NTUxMi4KICAgICBwYXJlbnQudXBkYXRlTGF5ZXJMaXN0c0lmTmVlZGVkKCk7 CkBAIC0xODMzLDcgKzE4MzMsNyBAQCBzdGF0aWMgYm9vbCBkZXNjZW5kZW50TGF5ZXJQYWludHNJ bnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXImIHBhcmVudCkKICAgICAgICAgZm9yIChzaXplX3QgaSA9 IDA7IGkgPCBsaXN0U2l6ZTsgKytpKSB7CiAgICAgICAgICAgICBSZW5kZXJMYXllciogY3VyTGF5 ZXIgPSBub3JtYWxGbG93TGlzdC0+YXQoaSk7CiAgICAgICAgICAgICBpZiAoIWNvbXBvc2l0ZWRX aXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQotICAgICAgICAgICAgICAgICYmIChjdXJMYXll ci0+aXNWaXN1YWxseU5vbkVtcHR5KCkgfHwgZGVzY2VuZGVudExheWVyUGFpbnRzSW50b0FuY2Vz dG9yKCpjdXJMYXllcikpKQorICAgICAgICAgICAgICAgICYmIChjdXJMYXllci0+aXNWaXN1YWxs eU5vbkVtcHR5KCkgfHwgZGVzY2VuZGFudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKCpjdXJMYXll cikpKQogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgfQpAQCAt MTg0OCw3ICsxODQ4LDcgQEAgc3RhdGljIGJvb2wgZGVzY2VuZGVudExheWVyUGFpbnRzSW50b0Fu Y2VzdG9yKFJlbmRlckxheWVyJiBwYXJlbnQpCiAgICAgICAgICAgICBmb3IgKHNpemVfdCBpID0g MDsgaSA8IGxpc3RTaXplOyArK2kpIHsKICAgICAgICAgICAgICAgICBSZW5kZXJMYXllciogY3Vy TGF5ZXIgPSBuZWdaT3JkZXJMaXN0LT5hdChpKTsKICAgICAgICAgICAgICAgICBpZiAoIWNvbXBv c2l0ZWRXaXRoT3duQmFja2luZ1N0b3JlKGN1ckxheWVyKQotICAgICAgICAgICAgICAgICAgICAm JiAoY3VyTGF5ZXItPmlzVmlzdWFsbHlOb25FbXB0eSgpIHx8IGRlc2NlbmRlbnRMYXllclBhaW50 c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKKyAgICAgICAgICAgICAgICAgICAgJiYgKGN1ckxh eWVyLT5pc1Zpc3VhbGx5Tm9uRW1wdHkoKSB8fCBkZXNjZW5kYW50TGF5ZXJQYWludHNJbnRvQW5j ZXN0b3IoKmN1ckxheWVyKSkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAg ICAgICAgICAgfQogICAgICAgICB9CkBAIC0xODU4LDcgKzE4NTgsNyBAQCBzdGF0aWMgYm9vbCBk ZXNjZW5kZW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IoUmVuZGVyTGF5ZXImIHBhcmVudCkKICAg ICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGlzdFNpemU7ICsraSkgewogICAgICAg ICAgICAgICAgIFJlbmRlckxheWVyKiBjdXJMYXllciA9IHBvc1pPcmRlckxpc3QtPmF0KGkpOwog ICAgICAgICAgICAgICAgIGlmICghY29tcG9zaXRlZFdpdGhPd25CYWNraW5nU3RvcmUoY3VyTGF5 ZXIpCi0gICAgICAgICAgICAgICAgICAgICYmIChjdXJMYXllci0+aXNWaXN1YWxseU5vbkVtcHR5 KCkgfHwgZGVzY2VuZGVudExheWVyUGFpbnRzSW50b0FuY2VzdG9yKCpjdXJMYXllcikpKQorICAg ICAgICAgICAgICAgICAgICAmJiAoY3VyTGF5ZXItPmlzVmlzdWFsbHlOb25FbXB0eSgpIHx8IGRl c2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcigqY3VyTGF5ZXIpKSkKICAgICAgICAgICAg ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTE4Njgs OSArMTg2OCw5IEBAIHN0YXRpYyBib29sIGRlc2NlbmRlbnRMYXllclBhaW50c0ludG9BbmNlc3Rv cihSZW5kZXJMYXllciYgcGFyZW50KQogfQogCiAvLyBDb25zZXJ2YXRpdmUgdGVzdCBmb3IgaGF2 aW5nIG5vIHJlbmRlcmVkIGNoaWxkcmVuLgotYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OmlzUGFp bnREZXN0aW5hdGlvbkZvckRlc2NlbmRlbnRMYXllcnMoKSBjb25zdAorYm9vbCBSZW5kZXJMYXll ckJhY2tpbmc6OmlzUGFpbnREZXN0aW5hdGlvbkZvckRlc2NlbmRhbnRMYXllcnMoKSBjb25zdAog ewotICAgIHJldHVybiBkZXNjZW5kZW50TGF5ZXJQYWludHNJbnRvQW5jZXN0b3IobV9vd25pbmdM YXllcik7CisgICAgcmV0dXJuIGRlc2NlbmRhbnRMYXllclBhaW50c0ludG9BbmNlc3RvcihtX293 bmluZ0xheWVyKTsKIH0KIAogYm9vbCBSZW5kZXJMYXllckJhY2tpbmc6OmNvbnRhaW5zUGFpbnRl ZENvbnRlbnQoYm9vbCBpc1NpbXBsZUNvbnRhaW5lcikgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAppbmRleCA3ODAwNWQ1MmRiNDY1MDI1YzRk NWYzNDQ1ZTMwNTI1NGI1MjE2ZjJjLi4yYzJlZGY1YzIyOTgzNWYzNjViNmYzOGM4N2Q3YzczYTUy NzcyZTdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5oCkBAIC0yNzMsNyArMjczLDcgQEAgcHJpdmF0ZToKICAgICBib29sIHJlcXVpcmVzU2Nyb2xs Q29ybmVyTGF5ZXIoKSBjb25zdDsKICAgICBib29sIHVwZGF0ZVNjcm9sbGluZ0xheWVycyhib29s IHNjcm9sbGluZ0xheWVycyk7CiAgICAgdm9pZCB1cGRhdGVEcmF3c0NvbnRlbnQoYm9vbCBpc1Np bXBsZUNvbnRhaW5lcik7Ci0gICAgdm9pZCB1cGRhdGVDaGlsZENsaXBwaW5nU3RyYXRlZ3koYm9v bCBuZWVkc0Rlc2NlbmRlbnRzQ2xpcHBpbmdMYXllcik7CisgICAgdm9pZCB1cGRhdGVDaGlsZENs aXBwaW5nU3RyYXRlZ3koYm9vbCBuZWVkc0Rlc2NlbmRhbnRzQ2xpcHBpbmdMYXllcik7CiAgICAg CiAgICAgdm9pZCB1cGRhdGVSb290TGF5ZXJDb25maWd1cmF0aW9uKCk7CiAKQEAgLTMxNyw3ICsz MTcsNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCByZXNldENvbnRlbnRzUmVjdCgpOwogCi0gICAg Ym9vbCBpc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kZW50TGF5ZXJzKCkgY29uc3Q7CisgICAg Ym9vbCBpc1BhaW50RGVzdGluYXRpb25Gb3JEZXNjZW5kYW50TGF5ZXJzKCkgY29uc3Q7CiAKICAg ICBib29sIHNob3VsZENsaXBDb21wb3NpdGVkQm91bmRzKCkgY29uc3Q7CiAK