140654 2015-01-19 18:09:23 -0800 Resolve the epsilon transitions for each state upfront instead of dynamically 2015-01-20 12:43:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin kling oldest_to_newest 1062581 0 benjamin 2015-01-19 18:09:23 -0800 Resolve the epsilon transitions for each state upfront instead of dynamically 1062583 1 244947 benjamin 2015-01-19 18:12:06 -0800 Created attachment 244947 Patch 1062677 2 244947 kling 2015-01-20 01:31:27 -0800 Comment on attachment 244947 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=244947&action=review r=me > Source/WebCore/contentextensions/NFAToDFA.cpp:84 > + if (nfaNodeClosures[nodeId].size()) { I softly prefer !isEmpty() over size() here. 1062850 3 benjamin 2015-01-20 12:43:27 -0800 Committed r178739: <http://trac.webkit.org/changeset/178739> 244947 2015-01-19 18:12:06 -0800 2015-01-20 01:31:27 -0800 Patch bug-140654-20150119181214.patch text/plain 9337 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NjY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2JjNDlkOWNjNGMyZGY3 NzZmMDNlNWVmMTRkZWQ0ZTFjYTFmYzFlMi4uNDJiOGJjMDc3Mzk3Njc2ODY1N2EwYmJiMmY1ZTIy ZmQ5MTE4NmY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE1LTAxLTE5ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXNvbHZlIHRo ZSBlcHNpbG9uIHRyYW5zaXRpb25zIGZvciBlYWNoIHN0YXRlIHVwZnJvbnQgaW5zdGVhZCBvZiBk eW5hbWljYWxseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQwNjU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSW5zdGVhZCBvZiByZWNvbXB1dGluZyB0aGUgZXBzaWxvbi1jbG9zdXJlIGZvciBlYWNoIHNl dCwgd2UgY29tcHV0ZSB0aGUgY2xvc3VyZQorICAgICAgICBvZiBldmVyeSBlbGVtZW50IGF0IHRo ZSBiZWdpbm5pbmcgb2YgdGhlIHRyYW5zZm9ybWF0aW9uLgorCisgICAgICAgIFdlIHRoZW4gcmVt b3ZlIHRoZSBlcHNpbG9uIHRyYW5zaXRpb25zIGZyb20gdGhlIE5GQSB0byBzaW1wbGlmeSBwb3B1 bGF0ZVRyYW5zaXRpb25zKCkuCisgICAgICAgIFRoZSBlcHNpbG9uIHRyYW5zaXRpb25zIGFyZSBz dGlsbCB0aGVyZSwgYnV0IHRoZXkgYXJlIG5vdyBpbiBhIHNlcGFyYXRlIGdyYXBoIHdlIHVzZQor ICAgICAgICBpbiBwYXJhbGxlbC4KKworICAgICAgICAqIGNvbnRlbnRleHRlbnNpb25zL05GQVRv REZBLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjplcHNpbG9uQ2xv c3VyZUV4Y2x1ZGluZ1NlbGYpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVuc2lvbnM6 OnJlc29sdmVFcHNpbG9uQ2xvc3VyZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEV4dGVu c2lvbnM6OmV4dGVuZFNldFdpdGhDbG9zdXJlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRF eHRlbnNpb25zOjpwb3B1bGF0ZVRyYW5zaXRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl bnRFeHRlbnNpb25zOjpORkFUb0RGQTo6Y29udmVydCk6CisgICAgICAgIChXZWJDb3JlOjpDb250 ZW50RXh0ZW5zaW9uczo6ZXBzaWxvbkNsb3N1cmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6Q29udGVudEV4dGVuc2lvbnM6OnBvcHVsYXRlVHJhbnNpdGlvbnNFeGNsdWRpbmdFcHNpbG9u KTogRGVsZXRlZC4KKyAgICAgICAgKiBjb250ZW50ZXh0ZW5zaW9ucy9ORkFUb0RGQS5oOgorCiAy MDE1LTAxLTE5ICBCcmlhbiBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVkdT4KIAogICAg ICAgICBXZWIgUmVwbGF5OiBjb252ZXJ0IHRvIGlzPFQ+IGFuZCBkb3duY2FzdDxUPiBmb3IgZGVj b2RpbmcgcmVwbGF5IGlucHV0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY29udGVudGV4 dGVuc2lvbnMvTkZBVG9ERkEuY3BwIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVuc2lvbnMv TkZBVG9ERkEuY3BwCmluZGV4IGNkODExNWNjODQ1NTc3NDUyMzMwYTUyY2QxYTY3YWY0OGY2YjM5 MzQuLjRlZTg1ZDEyOGYzOGI3MmM2ZTI2MWE0NmZlZTUzZWQ1NjZmN2FiNzQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL05GQVRvREZBLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9ORkFUb0RGQS5jcHAKQEAgLTQzLDI5ICs0Myw1 OSBAQCBuYW1lc3BhY2UgQ29udGVudEV4dGVuc2lvbnMgewogLy8gRklYTUU6IGluY2x1ZGUgdGhl IGhhc2ggaW5zaWRlIE5vZGVJZFNldC4KIHR5cGVkZWYgSGFzaFNldDx1bnNpZ25lZCwgRGVmYXVs dEhhc2g8dW5zaWduZWQ+OjpIYXNoLCBXVEY6OlVuc2lnbmVkV2l0aFplcm9LZXlIYXNoVHJhaXRz PHVuc2lnbmVkPj4gTm9kZUlkU2V0OwogCi1zdGF0aWMgaW5saW5lIHZvaWQgZXBzaWxvbkNsb3N1 cmUoTm9kZUlkU2V0JiBub2RlU2V0LCBjb25zdCBWZWN0b3I8TkZBTm9kZT4mIGdyYXBoLCB1bnNp Z25lZCBlcHNpbG9uVHJhbnNpdGlvbkNoYXJhY3RlcikKK3N0YXRpYyBpbmxpbmUgdm9pZCBlcHNp bG9uQ2xvc3VyZUV4Y2x1ZGluZ1NlbGYoY29uc3QgVmVjdG9yPE5GQU5vZGU+JiBuZmFHcmFwaCwg dW5zaWduZWQgbm9kZUlkLCB1bnNpZ25lZCBlcHNpbG9uVHJhbnNpdGlvbkNoYXJhY3RlciwgVmVj dG9yPHVuc2lnbmVkPiYgb3V0cHV0KQogewotICAgIEFTU0VSVCghbm9kZVNldC5pc0VtcHR5KCkp OwotICAgIEFTU0VSVCghZ3JhcGguaXNFbXB0eSgpKTsKKyAgICBjb25zdCBhdXRvJiB0cmFuc2l0 aW9ucyA9IG5mYUdyYXBoW25vZGVJZF0udHJhbnNpdGlvbnM7CisgICAgYXV0byBlcHNpbG9uVHJh bnNpdGlvblNsb3QgPSB0cmFuc2l0aW9ucy5maW5kKGVwc2lsb25UcmFuc2l0aW9uQ2hhcmFjdGVy KTsKKworICAgIGlmIChlcHNpbG9uVHJhbnNpdGlvblNsb3QgPT0gdHJhbnNpdGlvbnMuZW5kKCkp CisgICAgICAgIHJldHVybjsKIAotICAgIC8vIEZJWE1FOiBmaW5lIGEgZ29vZCBpbmxpbmUgc2l6 ZSBmb3IgdW5wcm9jZXNzZWROb2Rlcy4KLSAgICBWZWN0b3I8dW5zaWduZWQ+IHVucHJvY2Vzc2Vk Tm9kZXM7Ci0gICAgY29weVRvVmVjdG9yKG5vZGVTZXQsIHVucHJvY2Vzc2VkTm9kZXMpOworICAg IE5vZGVJZFNldCBjbG9zdXJlKHsgbm9kZUlkIH0pOworICAgIFZlY3Rvcjx1bnNpZ25lZCwgNjQ+ IHVucHJvY2Vzc2VkTm9kZXM7CisgICAgY29weVRvVmVjdG9yKGVwc2lsb25UcmFuc2l0aW9uU2xv dC0+dmFsdWUsIHVucHJvY2Vzc2VkTm9kZXMpOworICAgIGNsb3N1cmUuYWRkKHVucHJvY2Vzc2Vk Tm9kZXMuYmVnaW4oKSwgdW5wcm9jZXNzZWROb2Rlcy5lbmQoKSk7CisgICAgb3V0cHV0ID0gdW5w cm9jZXNzZWROb2RlczsKIAogICAgIGRvIHsKICAgICAgICAgdW5zaWduZWQgdW5wcm9jZXNzZWRO b2RlSWQgPSB1bnByb2Nlc3NlZE5vZGVzLnRha2VMYXN0KCk7Ci0gICAgICAgIGNvbnN0IE5GQU5v ZGUmIG5vZGUgPSBncmFwaFt1bnByb2Nlc3NlZE5vZGVJZF07CisgICAgICAgIGNvbnN0IE5GQU5v ZGUmIG5vZGUgPSBuZmFHcmFwaFt1bnByb2Nlc3NlZE5vZGVJZF07CiAgICAgICAgIGF1dG8gZXBz aWxvblRyYW5zaXRpb25TbG90ID0gbm9kZS50cmFuc2l0aW9ucy5maW5kKGVwc2lsb25UcmFuc2l0 aW9uQ2hhcmFjdGVyKTsKICAgICAgICAgaWYgKGVwc2lsb25UcmFuc2l0aW9uU2xvdCAhPSBub2Rl LnRyYW5zaXRpb25zLmVuZCgpKSB7CiAgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIHRhcmdldE5v ZGVJZCA6IGVwc2lsb25UcmFuc2l0aW9uU2xvdC0+dmFsdWUpIHsKLSAgICAgICAgICAgICAgICBh dXRvIGFkZFJlc3VsdCA9IG5vZGVTZXQuYWRkKHRhcmdldE5vZGVJZCk7Ci0gICAgICAgICAgICAg ICAgaWYgKGFkZFJlc3VsdC5pc05ld0VudHJ5KQorICAgICAgICAgICAgICAgIGF1dG8gYWRkUmVz dWx0ID0gY2xvc3VyZS5hZGQodGFyZ2V0Tm9kZUlkKTsKKyAgICAgICAgICAgICAgICBpZiAoYWRk UmVzdWx0LmlzTmV3RW50cnkpIHsKICAgICAgICAgICAgICAgICAgICAgdW5wcm9jZXNzZWROb2Rl cy5hcHBlbmQodGFyZ2V0Tm9kZUlkKTsKKyAgICAgICAgICAgICAgICAgICAgb3V0cHV0LmFwcGVu ZCh0YXJnZXROb2RlSWQpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0gd2hpbGUgKCF1bnByb2Nlc3NlZE5vZGVzLmlzRW1wdHkoKSk7CiB9CiAKK3N0 YXRpYyB2b2lkIHJlc29sdmVFcHNpbG9uQ2xvc3VyZXMoVmVjdG9yPE5GQU5vZGU+JiBuZmFHcmFw aCwgdW5zaWduZWQgZXBzaWxvblRyYW5zaXRpb25DaGFyYWN0ZXIsIFZlY3RvcjxWZWN0b3I8dW5z aWduZWQ+PiYgbmZhTm9kZUNsb3N1cmVzKQoreworICAgIHVuc2lnbmVkIG5mYUdyYXBoU2l6ZSA9 IG5mYUdyYXBoLnNpemUoKTsKKyAgICBuZmFOb2RlQ2xvc3VyZXMucmVzaXplKG5mYUdyYXBoU2l6 ZSk7CisgICAgZm9yICh1bnNpZ25lZCBub2RlSWQgPSAwOyBub2RlSWQgPCBuZmFHcmFwaFNpemU7 ICsrbm9kZUlkKQorICAgICAgICBlcHNpbG9uQ2xvc3VyZUV4Y2x1ZGluZ1NlbGYobmZhR3JhcGgs IG5vZGVJZCwgZXBzaWxvblRyYW5zaXRpb25DaGFyYWN0ZXIsIG5mYU5vZGVDbG9zdXJlc1tub2Rl SWRdKTsKKworICAgIGZvciAodW5zaWduZWQgbm9kZUlkID0gMDsgbm9kZUlkIDwgbmZhR3JhcGhT aXplOyArK25vZGVJZCkgeworICAgICAgICBpZiAobmZhTm9kZUNsb3N1cmVzW25vZGVJZF0uc2l6 ZSgpKSB7CisgICAgICAgICAgICBib29sIGVwc2lsb25UcmFuc2l0aW9uSXNSZW1vdmVkID0gbmZh R3JhcGhbbm9kZUlkXS50cmFuc2l0aW9ucy5yZW1vdmUoZXBzaWxvblRyYW5zaXRpb25DaGFyYWN0 ZXIpOworICAgICAgICAgICAgQVNTRVJUX1VOVVNFRChlcHNpbG9uVHJhbnNpdGlvbklzUmVtb3Zl ZCwgZXBzaWxvblRyYW5zaXRpb25Jc1JlbW92ZWQpOworICAgICAgICB9CisgICAgfQorfQorCitz dGF0aWMgQUxXQVlTX0lOTElORSB2b2lkIGV4dGVuZFNldFdpdGhDbG9zdXJlKGNvbnN0IFZlY3Rv cjxWZWN0b3I8dW5zaWduZWQ+PiYgbmZhTm9kZUNsb3N1cmVzLCB1bnNpZ25lZCBub2RlSWQsIE5v ZGVJZFNldCYgc2V0KQoreworICAgIEFTU0VSVChzZXQuY29udGFpbnMobm9kZUlkKSk7CisgICAg Y29uc3QgVmVjdG9yPHVuc2lnbmVkPiYgbm9kZUNsb3N1cmUgPSBuZmFOb2RlQ2xvc3VyZXNbbm9k ZUlkXTsKKyAgICBpZiAoIW5vZGVDbG9zdXJlLmlzRW1wdHkoKSkKKyAgICAgICAgc2V0LmFkZChu b2RlQ2xvc3VyZS5iZWdpbigpLCBub2RlQ2xvc3VyZS5lbmQoKSk7Cit9CisKIHN0cnVjdCBVbmlx dWVOb2RlSWRTZXRJbXBsIHsKICAgICB1bnNpZ25lZCogYnVmZmVyKCkKICAgICB7CkBAIC0yMzQs NyArMjY0LDcgQEAgc3RydWN0IE5vZGVJZFNldFRvVW5pcXVlTm9kZUlkU2V0VHJhbnNsYXRvciB7 CiAgICAgfQogfTsKIAotY2xhc3MgU2V0VHJhbnNpdGlvbnNFeGNsdWRpbmdFcHNpbG9uIHsKK2Ns YXNzIFNldFRyYW5zaXRpb25zIHsKIHB1YmxpYzoKICAgICBOb2RlSWRTZXQmIG9wZXJhdG9yW10o dW5zaWduZWQgaW5kZXgpCiAgICAgewpAQCAtMjYxLDQ5ICsyOTEsNTMgQEAgcHJpdmF0ZToKICAg ICBOb2RlSWRTZXQgbV90YXJnZXRzWzEyOF07CiB9OwogCi1zdGF0aWMgaW5saW5lIHZvaWQgcG9w dWxhdGVUcmFuc2l0aW9uc0V4Y2x1ZGluZ0Vwc2lsb24oU2V0VHJhbnNpdGlvbnNFeGNsdWRpbmdF cHNpbG9uJiBzZXRUcmFuc2l0aW9uc0V4Y2x1ZGluZ0Vwc2lsb24sIGNvbnN0IFVuaXF1ZU5vZGVJ ZFNldEltcGwmIHNvdXJjZU5vZGVTZXQsIGNvbnN0IFZlY3RvcjxORkFOb2RlPiYgZ3JhcGgsIHVu c2lnbmVkIGVwc2lsb25UcmFuc2l0aW9uQ2hhcmFjdGVyKQorc3RhdGljIGlubGluZSB2b2lkIHBv cHVsYXRlVHJhbnNpdGlvbnMoU2V0VHJhbnNpdGlvbnMmIHNldFRyYW5zaXRpb25zLCBjb25zdCBV bmlxdWVOb2RlSWRTZXRJbXBsJiBzb3VyY2VOb2RlU2V0LCBjb25zdCBWZWN0b3I8TkZBTm9kZT4m IGdyYXBoLCBjb25zdCBWZWN0b3I8VmVjdG9yPHVuc2lnbmVkPj4mIG5mYU5vZGVjbG9zdXJlcykK IHsKICAgICBBU1NFUlQoIWdyYXBoLmlzRW1wdHkoKSk7CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAot ICAgIGZvciAoY29uc3QgTm9kZUlkU2V0JiBzZXQgOiBzZXRUcmFuc2l0aW9uc0V4Y2x1ZGluZ0Vw c2lsb24pCisgICAgZm9yIChjb25zdCBOb2RlSWRTZXQmIHNldCA6IHNldFRyYW5zaXRpb25zKQog ICAgICAgICBBU1NFUlQoc2V0LmlzRW1wdHkoKSk7CiAjZW5kaWYKIAogICAgIGNvbnN0IHVuc2ln bmVkKiBidWZmZXIgPSBzb3VyY2VOb2RlU2V0LmJ1ZmZlcigpOwogICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBzb3VyY2VOb2RlU2V0Lm1fc2l6ZTsgKytpKSB7CiAgICAgICAgIHVuc2lnbmVk IG5vZGVJZCA9IGJ1ZmZlcltpXTsKLSAgICAgICAgY29uc3QgTkZBTm9kZSYgbm9kZSA9IGdyYXBo W25vZGVJZF07Ci0gICAgICAgIGZvciAoY29uc3QgYXV0byYgdHJhbnNpdGlvblNsb3QgOiBub2Rl LnRyYW5zaXRpb25zKSB7Ci0gICAgICAgICAgICBpZiAodHJhbnNpdGlvblNsb3Qua2V5ICE9IGVw c2lsb25UcmFuc2l0aW9uQ2hhcmFjdGVyKQotICAgICAgICAgICAgICAgIHNldFRyYW5zaXRpb25z RXhjbHVkaW5nRXBzaWxvblt0cmFuc2l0aW9uU2xvdC5rZXldLmFkZCh0cmFuc2l0aW9uU2xvdC52 YWx1ZS5iZWdpbigpLCB0cmFuc2l0aW9uU2xvdC52YWx1ZS5lbmQoKSk7CisgICAgICAgIGZvciAo Y29uc3QgYXV0byYgdHJhbnNpdGlvblNsb3QgOiBncmFwaFtub2RlSWRdLnRyYW5zaXRpb25zKSB7 CisgICAgICAgICAgICBOb2RlSWRTZXQmIHRhcmdldFNldCA9IHNldFRyYW5zaXRpb25zW3RyYW5z aXRpb25TbG90LmtleV07CisgICAgICAgICAgICBmb3IgKHVuc2lnbmVkIHRhcmdldE5vZElkIDog dHJhbnNpdGlvblNsb3QudmFsdWUpIHsKKyAgICAgICAgICAgICAgICB0YXJnZXRTZXQuYWRkKHRh cmdldE5vZElkKTsKKyAgICAgICAgICAgICAgICBleHRlbmRTZXRXaXRoQ2xvc3VyZShuZmFOb2Rl Y2xvc3VyZXMsIHRhcmdldE5vZElkLCB0YXJnZXRTZXQpOworICAgICAgICAgICAgfQogICAgICAg ICB9CiAgICAgfQogfQogCi1ERkEgTkZBVG9ERkE6OmNvbnZlcnQoY29uc3QgTkZBJiBuZmEpCitE RkEgTkZBVG9ERkE6OmNvbnZlcnQoTkZBJiBuZmEpCiB7Ci0gICAgVmVjdG9yPERGQU5vZGU+IGRm YUdyYXBoOworICAgIFZlY3RvcjxORkFOb2RlPiYgbmZhR3JhcGggPSBuZmEubV9ub2RlczsKIAot ICAgIGNvbnN0IFZlY3RvcjxORkFOb2RlPiYgbmZhR3JhcGggPSBuZmEubV9ub2RlczsKKyAgICBW ZWN0b3I8VmVjdG9yPHVuc2lnbmVkPj4gbmZhTm9kZUNsb3N1cmVzOworICAgIHJlc29sdmVFcHNp bG9uQ2xvc3VyZXMobmZhR3JhcGgsIE5GQTo6ZXBzaWxvblRyYW5zaXRpb25DaGFyYWN0ZXIsIG5m YU5vZGVDbG9zdXJlcyk7CiAKICAgICBOb2RlSWRTZXQgaW5pdGlhbFNldCh7IG5mYS5yb290KCkg fSk7Ci0gICAgZXBzaWxvbkNsb3N1cmUoaW5pdGlhbFNldCwgbmZhR3JhcGgsIE5GQTo6ZXBzaWxv blRyYW5zaXRpb25DaGFyYWN0ZXIpOworICAgIGV4dGVuZFNldFdpdGhDbG9zdXJlKG5mYU5vZGVD bG9zdXJlcywgbmZhLnJvb3QoKSwgaW5pdGlhbFNldCk7CiAKICAgICBVbmlxdWVOb2RlSWRTZXRU YWJsZSB1bmlxdWVOb2RlSWRTZXRUYWJsZTsKIAorICAgIFZlY3RvcjxERkFOb2RlPiBkZmFHcmFw aDsKICAgICBOb2RlSWRTZXRUb1VuaXF1ZU5vZGVJZFNldFNvdXJjZSBpbml0aWFsTm9kZUlkU2V0 VG9VbmlxdWVOb2RlSWRTZXRTb3VyY2UoZGZhR3JhcGgsIG5mYUdyYXBoLCBpbml0aWFsU2V0KTsK ICAgICBhdXRvIGFkZFJlc3VsdCA9IHVuaXF1ZU5vZGVJZFNldFRhYmxlLmFkZDxOb2RlSWRTZXRU b1VuaXF1ZU5vZGVJZFNldFRyYW5zbGF0b3I+KGluaXRpYWxOb2RlSWRTZXRUb1VuaXF1ZU5vZGVJ ZFNldFNvdXJjZSk7CiAKICAgICBWZWN0b3I8VW5pcXVlTm9kZUlkU2V0SW1wbCo+IHVucHJvY2Vz c2VkTm9kZXM7CiAgICAgdW5wcm9jZXNzZWROb2Rlcy5hcHBlbmQoYWRkUmVzdWx0Lml0ZXJhdG9y LT5pbXBsKCkpOwogCi0gICAgU2V0VHJhbnNpdGlvbnNFeGNsdWRpbmdFcHNpbG9uIHRyYW5zaXRp b25zRnJvbUNsb3NlZFNldDsKKyAgICBTZXRUcmFuc2l0aW9ucyB0cmFuc2l0aW9uc0Zyb21DbG9z ZWRTZXQ7CiAKICAgICBkbyB7CiAgICAgICAgIFVuaXF1ZU5vZGVJZFNldEltcGwqIHVuaXF1ZU5v ZGVJZFNldEltcGwgPSB1bnByb2Nlc3NlZE5vZGVzLnRha2VMYXN0KCk7CiAKICAgICAgICAgdW5z aWduZWQgZGZhTm9kZUlkID0gdW5pcXVlTm9kZUlkU2V0SW1wbC0+bV9kZmFOb2RlSWQ7Ci0gICAg ICAgIHBvcHVsYXRlVHJhbnNpdGlvbnNFeGNsdWRpbmdFcHNpbG9uKHRyYW5zaXRpb25zRnJvbUNs b3NlZFNldCwgKnVuaXF1ZU5vZGVJZFNldEltcGwsIG5mYUdyYXBoLCBORkE6OmVwc2lsb25UcmFu c2l0aW9uQ2hhcmFjdGVyKTsKKyAgICAgICAgcG9wdWxhdGVUcmFuc2l0aW9ucyh0cmFuc2l0aW9u c0Zyb21DbG9zZWRTZXQsICp1bmlxdWVOb2RlSWRTZXRJbXBsLCBuZmFHcmFwaCwgbmZhTm9kZUNs b3N1cmVzKTsKIAogICAgICAgICAvLyBGSVhNRTogdGhlcmUgc2hvdWxkIG5vdCBiZSBhbnkgdHJh bnNpdGlvbiBvbiBrZXkgMC4KICAgICAgICAgZm9yICh1bnNpZ25lZCBrZXkgPSAwOyBrZXkgPCB0 cmFuc2l0aW9uc0Zyb21DbG9zZWRTZXQuc2l6ZSgpOyArK2tleSkgewpAQCAtMzEyLDggKzM0Niw2 IEBAIERGQSBORkFUb0RGQTo6Y29udmVydChjb25zdCBORkEmIG5mYSkKICAgICAgICAgICAgIGlm ICh0YXJnZXROb2RlU2V0LmlzRW1wdHkoKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAot ICAgICAgICAgICAgZXBzaWxvbkNsb3N1cmUodGFyZ2V0Tm9kZVNldCwgbmZhR3JhcGgsIE5GQTo6 ZXBzaWxvblRyYW5zaXRpb25DaGFyYWN0ZXIpOwotCiAgICAgICAgICAgICBOb2RlSWRTZXRUb1Vu aXF1ZU5vZGVJZFNldFNvdXJjZSBub2RlSWRTZXRUb1VuaXF1ZU5vZGVJZFNldFNvdXJjZShkZmFH cmFwaCwgbmZhR3JhcGgsIHRhcmdldE5vZGVTZXQpOwogICAgICAgICAgICAgYXV0byB1bmlxdWVO b2RlSWRBZGRSZXN1bHQgPSB1bmlxdWVOb2RlSWRTZXRUYWJsZS5hZGQ8Tm9kZUlkU2V0VG9Vbmlx dWVOb2RlSWRTZXRUcmFuc2xhdG9yPihub2RlSWRTZXRUb1VuaXF1ZU5vZGVJZFNldFNvdXJjZSk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2NvbnRlbnRleHRlbnNpb25zL05GQVRvREZB LmggYi9Tb3VyY2UvV2ViQ29yZS9jb250ZW50ZXh0ZW5zaW9ucy9ORkFUb0RGQS5oCmluZGV4IDBk NmE1ZjcyNTc4OGY4NTdmYmIzNDQ4ZmU2MGQwYjM0MjE0YzI3MDYuLjdlZGJkZGI2YWY2Mzg5Yzgw MGQ0OGU1NzIxYjU1NzY2Yzc4MjJkMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2NvbnRl bnRleHRlbnNpb25zL05GQVRvREZBLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY29udGVudGV4dGVu c2lvbnMvTkZBVG9ERkEuaApAQCAtMzksNyArMzksNyBAQCBjbGFzcyBORkE7CiAvLyBORkFUb0RG QSBwcm92aWRlcyBhIHdheSB0byBidWlsZCBhIERGQSBjb3JyZXNwb25kaW5nIHRvIGEgTkZBLgog Y2xhc3MgTkZBVG9ERkEgewogcHVibGljOgotICAgIHN0YXRpYyBERkEgY29udmVydChjb25zdCBO RkEmKTsKKyAgICBzdGF0aWMgREZBIGNvbnZlcnQoTkZBJik7CiB9OwogCiB9Cg==