142504 2015-03-09 13:59:31 -0700 Simple line layout should not be limited to RenderText. 2015-03-09 16:31:07 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn kondapallykalyan mmaxfield oldest_to_newest 1075741 0 zalan 2015-03-09 13:59:31 -0700 This is in transition to support br element. 1075751 1 248275 zalan 2015-03-09 14:11:54 -0700 Created attachment 248275 Patch 1075804 2 248275 commit-queue 2015-03-09 16:31:04 -0700 Comment on attachment 248275 Patch Clearing flags on attachment: 248275 Committed r181290: <http://trac.webkit.org/changeset/181290> 1075805 3 commit-queue 2015-03-09 16:31:07 -0700 All reviewed patches have been landed. Closing bug. 248275 2015-03-09 14:11:54 -0700 2015-03-09 16:31:04 -0700 Patch bug-142504-20150309141129.patch text/plain 18309 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxMDc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQwY2NkNzNjMWJiM2Jm MDdiMzZjMjExN2Q2YTJjNDIyMjVlNzc4NS4uNWZkNTc1NWY5ZWE3ZmFmYzAxZGFhZDFmNWY5OGZk MmYzOGVlYWFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDE1LTAzLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 IHNob3VsZCBub3QgYmUgbGltaXRlZCB0byBSZW5kZXJUZXh0LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTA0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiB0cmFuc2l0aW9uIHRvIHN1 cHBvcnQgYnIgZWxlbWVudC4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4K KworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRleHQ6OmFic29sdXRlUmVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4 dDo6YWJzb2x1dGVRdWFkc0NsaXBwZWRUb0VsbGlwc2lzKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRleHQ6OmFic29sdXRlUXVhZHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dDo6 Zmlyc3RSdW5Mb2NhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0OjpsaW5lc0Jv dW5kaW5nQm94KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmNhcmV0TWluT2Zmc2V0 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmNhcmV0TWF4T2Zmc2V0KToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlclRleHQ6OmNvbnRhaW5zQ2FyZXRPZmZzZXQpOgorICAgICAgICAq IHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250ZW50czo6c2VnbWVudEZvclJlbmRlcmVy KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5oOgor ICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNvbXB1dGVCb3VuZGluZ0JveCk6CisgICAg ICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojpjb21wdXRlRmlyc3RSdW5Mb2NhdGlvbik6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojpjb2xsZWN0QWJzb2x1dGVSZWN0 cyk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojpjb2xsZWN0QWJzb2x1dGVR dWFkcyk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0Ojpjb21wdXRlVGV4dEJv dW5kaW5nQm94KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6 OmNvbXB1dGVUZXh0Rmlyc3RSdW5Mb2NhdGlvbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpTaW1wbGVMaW5lTGF5b3V0Ojpjb2xsZWN0VGV4dEFic29sdXRlUmVjdHMpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y29sbGVjdFRleHRBYnNvbHV0ZVF1 YWRzKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0 aW9ucy5oOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6ZmluZENhcmV0TWlu aW11bU9mZnNldCk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpmaW5kQ2Fy ZXRNYXhpbXVtT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNv bnRhaW5zQ2FyZXRPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6 ZmluZFRleHRDYXJldE1pbmltdW1PZmZzZXQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlTGluZUxheW91dDo6ZmluZFRleHRDYXJldE1heGltdW1PZmZzZXQpOiBEZWxldGVkLgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y29udGFpbnNUZXh0Q2FyZXRPZmZz ZXQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2 ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6UnVuUmVzb2x2ZXI6 OlJ1bjo6dGV4dCk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpSdW5SZXNv bHZlcjo6cmFuZ2VGb3JSZW5kZXJlcik6CisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXRSZXNvbHZlci5oOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0VGV4 dEZyYWdtZW50SXRlcmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91 dDo6VGV4dEZyYWdtZW50SXRlcmF0b3I6OnRleHRXaWR0aCk6CisKIDIwMTUtMDMtMDUgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtTT1VQXSBD aGVjayBUTFMgZXJyb3JzIGFzIHNvb24gYXMgdGhleSBhcmUgc2V0IGluIHRoZSBTb3VwTWVzc2Fn ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCmluZGV4IDE1ZDAxNGRmMTY1 MDUwYTZlYjVkMjBkMzNlOTM1YmFlNTcwNjJkMjQuLjE2ZmJjMDkyZGJjZTZmNTNjMTFjNGFiODk4 NmY5OTBkYjQwNzZlYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAK QEAgLTMwMCw3ICszMDAsNyBAQCBTdHJpbmcgUmVuZGVyVGV4dDo6b3JpZ2luYWxUZXh0KCkgY29u c3QKIHZvaWQgUmVuZGVyVGV4dDo6YWJzb2x1dGVSZWN0cyhWZWN0b3I8SW50UmVjdD4mIHJlY3Rz LCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQpIGNvbnN0CiB7CiAgICAgaWYg KGF1dG8gbGF5b3V0ID0gc2ltcGxlTGluZUxheW91dCgpKSB7Ci0gICAgICAgIHJlY3RzLmFwcGVu ZFZlY3Rvcihjb2xsZWN0VGV4dEFic29sdXRlUmVjdHMoKnRoaXMsICpsYXlvdXQsIGFjY3VtdWxh dGVkT2Zmc2V0KSk7CisgICAgICAgIHJlY3RzLmFwcGVuZFZlY3RvcihTaW1wbGVMaW5lTGF5b3V0 Ojpjb2xsZWN0QWJzb2x1dGVSZWN0cygqdGhpcywgKmxheW91dCwgYWNjdW11bGF0ZWRPZmZzZXQp KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICByZWN0cy5hcHBlbmRWZWN0b3IobV9saW5l Qm94ZXMuYWJzb2x1dGVSZWN0cyhhY2N1bXVsYXRlZE9mZnNldCkpOwpAQCAtNDA0LDcgKzQwNCw3 IEBAIFZlY3RvcjxGbG9hdFF1YWQ+IFJlbmRlclRleHQ6OmFic29sdXRlUXVhZHNDbGlwcGVkVG9F bGxpcHNpcygpIGNvbnN0CiB7CiAgICAgaWYgKGF1dG8gbGF5b3V0ID0gc2ltcGxlTGluZUxheW91 dCgpKSB7CiAgICAgICAgIEFTU0VSVChzdHlsZSgpLnRleHRPdmVyZmxvdygpICE9IFRleHRPdmVy Zmxvd0VsbGlwc2lzKTsKLSAgICAgICAgcmV0dXJuIGNvbGxlY3RUZXh0QWJzb2x1dGVRdWFkcygq dGhpcywgKmxheW91dCwgbnVsbHB0cik7CisgICAgICAgIHJldHVybiBTaW1wbGVMaW5lTGF5b3V0 Ojpjb2xsZWN0QWJzb2x1dGVRdWFkcygqdGhpcywgKmxheW91dCwgbnVsbHB0cik7CiAgICAgfQog ICAgIHJldHVybiBtX2xpbmVCb3hlcy5hYnNvbHV0ZVF1YWRzKCp0aGlzLCBudWxscHRyLCBSZW5k ZXJUZXh0TGluZUJveGVzOjpDbGlwVG9FbGxpcHNpcyk7CiB9CkBAIC00MTIsNyArNDEyLDcgQEAg VmVjdG9yPEZsb2F0UXVhZD4gUmVuZGVyVGV4dDo6YWJzb2x1dGVRdWFkc0NsaXBwZWRUb0VsbGlw c2lzKCkgY29uc3QKIHZvaWQgUmVuZGVyVGV4dDo6YWJzb2x1dGVRdWFkcyhWZWN0b3I8RmxvYXRR dWFkPiYgcXVhZHMsIGJvb2wqIHdhc0ZpeGVkKSBjb25zdAogewogICAgIGlmIChhdXRvIGxheW91 dCA9IHNpbXBsZUxpbmVMYXlvdXQoKSkgewotICAgICAgICBxdWFkcy5hcHBlbmRWZWN0b3IoY29s bGVjdFRleHRBYnNvbHV0ZVF1YWRzKCp0aGlzLCAqbGF5b3V0LCB3YXNGaXhlZCkpOworICAgICAg ICBxdWFkcy5hcHBlbmRWZWN0b3IoU2ltcGxlTGluZUxheW91dDo6Y29sbGVjdEFic29sdXRlUXVh ZHMoKnRoaXMsICpsYXlvdXQsIHdhc0ZpeGVkKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAg ICAgcXVhZHMuYXBwZW5kVmVjdG9yKG1fbGluZUJveGVzLmFic29sdXRlUXVhZHMoKnRoaXMsIHdh c0ZpeGVkLCBSZW5kZXJUZXh0TGluZUJveGVzOjpOb0NsaXBwaW5nKSk7CkBAIC05NjEsNyArOTYx LDcgQEAgYm9vbCBSZW5kZXJUZXh0Ojpjb250YWluc09ubHlXaGl0ZXNwYWNlKHVuc2lnbmVkIGZy b20sIHVuc2lnbmVkIGxlbikgY29uc3QKIEludFBvaW50IFJlbmRlclRleHQ6OmZpcnN0UnVuTG9j YXRpb24oKSBjb25zdAogewogICAgIGlmIChhdXRvKiBsYXlvdXQgPSBzaW1wbGVMaW5lTGF5b3V0 KCkpCi0gICAgICAgIHJldHVybiBTaW1wbGVMaW5lTGF5b3V0Ojpjb21wdXRlVGV4dEZpcnN0UnVu TG9jYXRpb24oKnRoaXMsICpsYXlvdXQpOworICAgICAgICByZXR1cm4gU2ltcGxlTGluZUxheW91 dDo6Y29tcHV0ZUZpcnN0UnVuTG9jYXRpb24oKnRoaXMsICpsYXlvdXQpOwogCiAgICAgcmV0dXJu IG1fbGluZUJveGVzLmZpcnN0UnVuTG9jYXRpb24oKTsKIH0KQEAgLTEyNTgsNyArMTI1OCw3IEBA IGZsb2F0IFJlbmRlclRleHQ6OndpZHRoKHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIGxlbiwgY29u c3QgRm9udENhc2NhZGUmIGYsIGZsb2F0CiBJbnRSZWN0IFJlbmRlclRleHQ6OmxpbmVzQm91bmRp bmdCb3goKSBjb25zdAogewogICAgIGlmIChhdXRvIGxheW91dCA9IHNpbXBsZUxpbmVMYXlvdXQo KSkKLSAgICAgICAgcmV0dXJuIFNpbXBsZUxpbmVMYXlvdXQ6OmNvbXB1dGVUZXh0Qm91bmRpbmdC b3goKnRoaXMsICpsYXlvdXQpOworICAgICAgICByZXR1cm4gU2ltcGxlTGluZUxheW91dDo6Y29t cHV0ZUJvdW5kaW5nQm94KCp0aGlzLCAqbGF5b3V0KTsKIAogICAgIHJldHVybiBtX2xpbmVCb3hl cy5ib3VuZGluZ0JveCgqdGhpcyk7CiB9CkBAIC0xMzQ2LDE0ICsxMzQ2LDE0IEBAIExheW91dFJl Y3QgUmVuZGVyVGV4dDo6c2VsZWN0aW9uUmVjdEZvclJlcGFpbnQoY29uc3QgUmVuZGVyTGF5ZXJN b2RlbE9iamVjdCogcmVwCiBpbnQgUmVuZGVyVGV4dDo6Y2FyZXRNaW5PZmZzZXQoKSBjb25zdAog ewogICAgIGlmIChhdXRvIGxheW91dCA9IHNpbXBsZUxpbmVMYXlvdXQoKSkKLSAgICAgICAgcmV0 dXJuIFNpbXBsZUxpbmVMYXlvdXQ6OmZpbmRUZXh0Q2FyZXRNaW5pbXVtT2Zmc2V0KCp0aGlzLCAq bGF5b3V0KTsKKyAgICAgICAgcmV0dXJuIFNpbXBsZUxpbmVMYXlvdXQ6OmZpbmRDYXJldE1pbmlt dW1PZmZzZXQoKnRoaXMsICpsYXlvdXQpOwogICAgIHJldHVybiBtX2xpbmVCb3hlcy5jYXJldE1p bk9mZnNldCgpOwogfQogCiBpbnQgUmVuZGVyVGV4dDo6Y2FyZXRNYXhPZmZzZXQoKSBjb25zdAog ewogICAgIGlmIChhdXRvIGxheW91dCA9IHNpbXBsZUxpbmVMYXlvdXQoKSkKLSAgICAgICAgcmV0 dXJuIFNpbXBsZUxpbmVMYXlvdXQ6OmZpbmRUZXh0Q2FyZXRNYXhpbXVtT2Zmc2V0KCp0aGlzLCAq bGF5b3V0KTsKKyAgICAgICAgcmV0dXJuIFNpbXBsZUxpbmVMYXlvdXQ6OmZpbmRDYXJldE1heGlt dW1PZmZzZXQoKnRoaXMsICpsYXlvdXQpOwogICAgIHJldHVybiBtX2xpbmVCb3hlcy5jYXJldE1h eE9mZnNldCgqdGhpcyk7CiB9CiAKQEAgLTEzNzIsNyArMTM3Miw3IEBAIGJvb2wgUmVuZGVyVGV4 dDo6Y29udGFpbnNSZW5kZXJlZENoYXJhY3Rlck9mZnNldCh1bnNpZ25lZCBvZmZzZXQpIGNvbnN0 CiBib29sIFJlbmRlclRleHQ6OmNvbnRhaW5zQ2FyZXRPZmZzZXQodW5zaWduZWQgb2Zmc2V0KSBj b25zdAogewogICAgIGlmIChhdXRvIGxheW91dCA9IHNpbXBsZUxpbmVMYXlvdXQoKSkKLSAgICAg ICAgcmV0dXJuIFNpbXBsZUxpbmVMYXlvdXQ6OmNvbnRhaW5zVGV4dENhcmV0T2Zmc2V0KCp0aGlz LCAqbGF5b3V0LCBvZmZzZXQpOworICAgICAgICByZXR1cm4gU2ltcGxlTGluZUxheW91dDo6Y29u dGFpbnNDYXJldE9mZnNldCgqdGhpcywgKmxheW91dCwgb2Zmc2V0KTsKICAgICByZXR1cm4gbV9s aW5lQm94ZXMuY29udGFpbnNPZmZzZXQoKnRoaXMsIG9mZnNldCwgUmVuZGVyVGV4dExpbmVCb3hl czo6Q2FyZXRPZmZzZXQpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAKaW5kZXggMjIwOTc5N2RlN2Jh NTZkYzMwN2FhZDJmNDYzOWQ3NTY3NTExZmIyMS4uMTIzZGU4MzhlOTE1ZTE0NTc3MTU3YWUwMDc3 NzRmOWY5NGVhYjUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcApAQCAtNjIsNyArNjIsNyBAQCB1bnNp Z25lZCBGbG93Q29udGVudHM6OnNlZ21lbnRJbmRleEZvclBvc2l0aW9uU2xvdyh1bnNpZ25lZCBw b3NpdGlvbikgY29uc3QKICAgICByZXR1cm4gaW5kZXg7CiB9CiAKLWNvbnN0IEZsb3dDb250ZW50 czo6U2VnbWVudCYgRmxvd0NvbnRlbnRzOjpzZWdtZW50Rm9yUmVuZGVyZXIoY29uc3QgUmVuZGVy VGV4dCYgcmVuZGVyZXIpIGNvbnN0Citjb25zdCBGbG93Q29udGVudHM6OlNlZ21lbnQmIEZsb3dD b250ZW50czo6c2VnbWVudEZvclJlbmRlcmVyKGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIp IGNvbnN0CiB7CiAgICAgZm9yIChhdXRvJiBzZWdtZW50IDogbV9zZWdtZW50cykgewogICAgICAg ICBpZiAoJnNlZ21lbnQucmVuZGVyZXIgPT0gJnJlbmRlcmVyKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmgKaW5kZXgg NDU3NWJkNjA3YzdkY2JhYjExYjM2MGFkMGVkMzYwYjk3ZmY2OTJiYi4uMWZjMzQ3OWQyZTdhNzZm NjExOWU5MzcyMzlkOThlZDRiZTQ4YjFmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5oCkBAIC00MSwxMCArNDEs MTAgQEAgcHVibGljOgogICAgICAgICB1bnNpZ25lZCBzdGFydDsKICAgICAgICAgdW5zaWduZWQg ZW5kOwogICAgICAgICBTdHJpbmcgdGV4dDsKLSAgICAgICAgY29uc3QgUmVuZGVyVGV4dCYgcmVu ZGVyZXI7CisgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXI7CiAgICAgfTsKICAg ICBjb25zdCBTZWdtZW50JiBzZWdtZW50Rm9yUG9zaXRpb24odW5zaWduZWQpIGNvbnN0OwotICAg IGNvbnN0IFNlZ21lbnQmIHNlZ21lbnRGb3JSZW5kZXJlcihjb25zdCBSZW5kZXJUZXh0JikgY29u c3Q7CisgICAgY29uc3QgU2VnbWVudCYgc2VnbWVudEZvclJlbmRlcmVyKGNvbnN0IFJlbmRlck9i amVjdCYpIGNvbnN0OwogCiAgICAgY2xhc3MgSXRlcmF0b3IgewogICAgIHB1YmxpYzoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25z LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25z LmNwcAppbmRleCBmM2M0YTVmY2NjYjgxNDk3NzgyYTIwNTUwZTg3OGQ4MWJhMWFiODU4Li4wMDUw ODM5ZTUwMzg5ZGQ4MzlkMDA2NGUxOGZkYmNlNGE0NGQ0ZTUyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuY3BwCkBAIC0x MzQsMTEgKzEzNCwxMSBAQCB2b2lkIGNvbGxlY3RGbG93T3ZlcmZsb3coUmVuZGVyQmxvY2tGbG93 JiBmbG93LCBjb25zdCBMYXlvdXQmIGxheW91dCkKICAgICB9CiB9CiAKLUludFJlY3QgY29tcHV0 ZVRleHRCb3VuZGluZ0JveChjb25zdCBSZW5kZXJUZXh0JiB0ZXh0UmVuZGVyZXIsIGNvbnN0IExh eW91dCYgbGF5b3V0KQorSW50UmVjdCBjb21wdXRlQm91bmRpbmdCb3goY29uc3QgUmVuZGVyT2Jq ZWN0JiByZW5kZXJlciwgY29uc3QgTGF5b3V0JiBsYXlvdXQpCiB7Ci0gICAgYXV0byByZXNvbHZl ciA9IHJ1blJlc29sdmVyKGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKnRleHRSZW5kZXJlci5w YXJlbnQoKSksIGxheW91dCk7CisgICAgYXV0byByZXNvbHZlciA9IHJ1blJlc29sdmVyKGRvd25j YXN0PFJlbmRlckJsb2NrRmxvdz4oKnJlbmRlcmVyLnBhcmVudCgpKSwgbGF5b3V0KTsKICAgICBG bG9hdFJlY3QgYm91bmRpbmdCb3hSZWN0OwotICAgIGZvciAoY29uc3QgYXV0byYgcnVuIDogcmVz b2x2ZXIucmFuZ2VGb3JSZW5kZXJlcih0ZXh0UmVuZGVyZXIpKSB7CisgICAgZm9yIChjb25zdCBh dXRvJiBydW4gOiByZXNvbHZlci5yYW5nZUZvclJlbmRlcmVyKHJlbmRlcmVyKSkgewogICAgICAg ICBGbG9hdFJlY3QgcmVjdCA9IHJ1bi5yZWN0KCk7CiAgICAgICAgIGlmIChib3VuZGluZ0JveFJl Y3QgPT0gRmxvYXRSZWN0KCkpCiAgICAgICAgICAgICBib3VuZGluZ0JveFJlY3QgPSByZWN0OwpA QCAtMTQ4LDEwICsxNDgsMTAgQEAgSW50UmVjdCBjb21wdXRlVGV4dEJvdW5kaW5nQm94KGNvbnN0 IFJlbmRlclRleHQmIHRleHRSZW5kZXJlciwgY29uc3QgTGF5b3V0JiBsYXkKICAgICByZXR1cm4g ZW5jbG9zaW5nSW50UmVjdChib3VuZGluZ0JveFJlY3QpOwogfQogCi1JbnRQb2ludCBjb21wdXRl VGV4dEZpcnN0UnVuTG9jYXRpb24oY29uc3QgUmVuZGVyVGV4dCYgdGV4dFJlbmRlcmVyLCBjb25z dCBMYXlvdXQmIGxheW91dCkKK0ludFBvaW50IGNvbXB1dGVGaXJzdFJ1bkxvY2F0aW9uKGNvbnN0 IFJlbmRlck9iamVjdCYgcmVuZGVyZXIsIGNvbnN0IExheW91dCYgbGF5b3V0KQogewotICAgIGF1 dG8gcmVzb2x2ZXIgPSBydW5SZXNvbHZlcihkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCp0ZXh0 UmVuZGVyZXIucGFyZW50KCkpLCBsYXlvdXQpOwotICAgIGNvbnN0IGF1dG8mIGl0ID0gcmVzb2x2 ZXIucmFuZ2VGb3JSZW5kZXJlcih0ZXh0UmVuZGVyZXIpOworICAgIGF1dG8gcmVzb2x2ZXIgPSBy dW5SZXNvbHZlcihkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpyZW5kZXJlci5wYXJlbnQoKSks IGxheW91dCk7CisgICAgY29uc3QgYXV0byYgaXQgPSByZXNvbHZlci5yYW5nZUZvclJlbmRlcmVy KHJlbmRlcmVyKTsKICAgICBhdXRvIGJlZ2luID0gaXQuYmVnaW4oKTsKICAgICBpZiAoYmVnaW4g PT0gaXQuZW5kKCkpCiAgICAgICAgIHJldHVybiBJbnRQb2ludCgwLCAwKTsKQEAgLTE1OSwyMyAr MTU5LDIzIEBAIEludFBvaW50IGNvbXB1dGVUZXh0Rmlyc3RSdW5Mb2NhdGlvbihjb25zdCBSZW5k ZXJUZXh0JiB0ZXh0UmVuZGVyZXIsIGNvbnN0IExheW91CiAgICAgcmV0dXJuIGZsb29yZWRJbnRQ b2ludCgoKmJlZ2luKS5yZWN0KCkubG9jYXRpb24oKSk7CiB9CiAKLVZlY3RvcjxJbnRSZWN0PiBj b2xsZWN0VGV4dEFic29sdXRlUmVjdHMoY29uc3QgUmVuZGVyVGV4dCYgdGV4dFJlbmRlcmVyLCBj b25zdCBMYXlvdXQmIGxheW91dCwgY29uc3QgTGF5b3V0UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0 KQorVmVjdG9yPEludFJlY3Q+IGNvbGxlY3RBYnNvbHV0ZVJlY3RzKGNvbnN0IFJlbmRlck9iamVj dCYgcmVuZGVyZXIsIGNvbnN0IExheW91dCYgbGF5b3V0LCBjb25zdCBMYXlvdXRQb2ludCYgYWNj dW11bGF0ZWRPZmZzZXQpCiB7CiAgICAgVmVjdG9yPEludFJlY3Q+IHJlY3RzOwotICAgIGF1dG8g cmVzb2x2ZXIgPSBydW5SZXNvbHZlcihkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCp0ZXh0UmVu ZGVyZXIucGFyZW50KCkpLCBsYXlvdXQpOwotICAgIGZvciAoY29uc3QgYXV0byYgcnVuIDogcmVz b2x2ZXIucmFuZ2VGb3JSZW5kZXJlcih0ZXh0UmVuZGVyZXIpKSB7CisgICAgYXV0byByZXNvbHZl ciA9IHJ1blJlc29sdmVyKGRvd25jYXN0PFJlbmRlckJsb2NrRmxvdz4oKnJlbmRlcmVyLnBhcmVu dCgpKSwgbGF5b3V0KTsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIHJ1biA6IHJlc29sdmVyLnJhbmdl Rm9yUmVuZGVyZXIocmVuZGVyZXIpKSB7CiAgICAgICAgIExheW91dFJlY3QgcmVjdCA9IHJ1bi5y ZWN0KCk7CiAgICAgICAgIHJlY3RzLmFwcGVuZChlbmNsb3NpbmdJbnRSZWN0KEZsb2F0UmVjdChh Y2N1bXVsYXRlZE9mZnNldCArIHJlY3QubG9jYXRpb24oKSwgcmVjdC5zaXplKCkpKSk7CiAgICAg fQogICAgIHJldHVybiByZWN0czsKIH0KIAotVmVjdG9yPEZsb2F0UXVhZD4gY29sbGVjdFRleHRB YnNvbHV0ZVF1YWRzKGNvbnN0IFJlbmRlclRleHQmIHRleHRSZW5kZXJlciwgY29uc3QgTGF5b3V0 JiBsYXlvdXQsIGJvb2wqIHdhc0ZpeGVkKQorVmVjdG9yPEZsb2F0UXVhZD4gY29sbGVjdEFic29s dXRlUXVhZHMoY29uc3QgUmVuZGVyT2JqZWN0JiByZW5kZXJlciwgY29uc3QgTGF5b3V0JiBsYXlv dXQsIGJvb2wqIHdhc0ZpeGVkKQogewogICAgIFZlY3RvcjxGbG9hdFF1YWQ+IHF1YWRzOwotICAg IGF1dG8gcmVzb2x2ZXIgPSBydW5SZXNvbHZlcihkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCp0 ZXh0UmVuZGVyZXIucGFyZW50KCkpLCBsYXlvdXQpOwotICAgIGZvciAoY29uc3QgYXV0byYgcnVu IDogcmVzb2x2ZXIucmFuZ2VGb3JSZW5kZXJlcih0ZXh0UmVuZGVyZXIpKQotICAgICAgICBxdWFk cy5hcHBlbmQodGV4dFJlbmRlcmVyLmxvY2FsVG9BYnNvbHV0ZVF1YWQoRmxvYXRRdWFkKHJ1bi5y ZWN0KCkpLCAwLCB3YXNGaXhlZCkpOworICAgIGF1dG8gcmVzb2x2ZXIgPSBydW5SZXNvbHZlcihk b3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpyZW5kZXJlci5wYXJlbnQoKSksIGxheW91dCk7Cisg ICAgZm9yIChjb25zdCBhdXRvJiBydW4gOiByZXNvbHZlci5yYW5nZUZvclJlbmRlcmVyKHJlbmRl cmVyKSkKKyAgICAgICAgcXVhZHMuYXBwZW5kKHJlbmRlcmVyLmxvY2FsVG9BYnNvbHV0ZVF1YWQo RmxvYXRRdWFkKHJ1bi5yZWN0KCkpLCAwLCB3YXNGaXhlZCkpOwogICAgIHJldHVybiBxdWFkczsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlv dXRGdW5jdGlvbnMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 RnVuY3Rpb25zLmgKaW5kZXggMmE5NjQ2NDNiZjhhMmY1ODAzNTc1NGQ1ZWNlY2Q5YmJkNGMyOWVi ZC4uOGQzYzI3MjQwZjUwNGJjYTU2YzAzODQ3Y2JiZTllOGE2MzY1YjZiZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5oCkBA IC0zNyw3ICszNyw2IEBAIGNsYXNzIEhpdFRlc3RMb2NhdGlvbjsKIGNsYXNzIEhpdFRlc3RSZXF1 ZXN0OwogY2xhc3MgSGl0VGVzdFJlc3VsdDsKIGNsYXNzIFJlbmRlckJsb2NrRmxvdzsKLWNsYXNz IFJlbmRlclRleHQ7CiBzdHJ1Y3QgUGFpbnRJbmZvOwogCiBuYW1lc3BhY2UgU2ltcGxlTGluZUxh eW91dCB7CkBAIC01MSwxNCArNTAsMTQgQEAgYm9vbCBoaXRUZXN0Rmxvdyhjb25zdCBSZW5kZXJC bG9ja0Zsb3cmLCBjb25zdCBMYXlvdXQmLCBjb25zdCBIaXRUZXN0UmVxdWVzdCYsIEgKIHZvaWQg Y29sbGVjdEZsb3dPdmVyZmxvdyhSZW5kZXJCbG9ja0Zsb3cmLCBjb25zdCBMYXlvdXQmKTsKIAog Ym9vbCBpc1RleHRSZW5kZXJlZChjb25zdCBSZW5kZXJUZXh0JiwgY29uc3QgTGF5b3V0Jik7Ci1i b29sIGNvbnRhaW5zVGV4dENhcmV0T2Zmc2V0KGNvbnN0IFJlbmRlclRleHQmLCBjb25zdCBMYXlv dXQmLCB1bnNpZ25lZCk7Ci11bnNpZ25lZCBmaW5kVGV4dENhcmV0TWluaW11bU9mZnNldChjb25z dCBSZW5kZXJUZXh0JiwgY29uc3QgTGF5b3V0Jik7Ci11bnNpZ25lZCBmaW5kVGV4dENhcmV0TWF4 aW11bU9mZnNldChjb25zdCBSZW5kZXJUZXh0JiwgY29uc3QgTGF5b3V0Jik7Ci1JbnRSZWN0IGNv bXB1dGVUZXh0Qm91bmRpbmdCb3goY29uc3QgUmVuZGVyVGV4dCYsIGNvbnN0IExheW91dCYpOwot SW50UG9pbnQgY29tcHV0ZVRleHRGaXJzdFJ1bkxvY2F0aW9uKGNvbnN0IFJlbmRlclRleHQmLCBj b25zdCBMYXlvdXQmKTsKK2Jvb2wgY29udGFpbnNDYXJldE9mZnNldChjb25zdCBSZW5kZXJPYmpl Y3QmLCBjb25zdCBMYXlvdXQmLCB1bnNpZ25lZCk7Cit1bnNpZ25lZCBmaW5kQ2FyZXRNaW5pbXVt T2Zmc2V0KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IExheW91dCYpOwordW5zaWduZWQgZmlu ZENhcmV0TWF4aW11bU9mZnNldChjb25zdCBSZW5kZXJPYmplY3QmLCBjb25zdCBMYXlvdXQmKTsK K0ludFJlY3QgY29tcHV0ZUJvdW5kaW5nQm94KGNvbnN0IFJlbmRlck9iamVjdCYsIGNvbnN0IExh eW91dCYpOworSW50UG9pbnQgY29tcHV0ZUZpcnN0UnVuTG9jYXRpb24oY29uc3QgUmVuZGVyT2Jq ZWN0JiwgY29uc3QgTGF5b3V0Jik7CiAKLVZlY3RvcjxJbnRSZWN0PiBjb2xsZWN0VGV4dEFic29s dXRlUmVjdHMoY29uc3QgUmVuZGVyVGV4dCYsIGNvbnN0IExheW91dCYsIGNvbnN0IExheW91dFBv aW50JiBhY2N1bXVsYXRlZE9mZnNldCk7Ci1WZWN0b3I8RmxvYXRRdWFkPiBjb2xsZWN0VGV4dEFi c29sdXRlUXVhZHMoY29uc3QgUmVuZGVyVGV4dCYsIGNvbnN0IExheW91dCYsIGJvb2wqIHdhc0Zp eGVkKTsKK1ZlY3RvcjxJbnRSZWN0PiBjb2xsZWN0QWJzb2x1dGVSZWN0cyhjb25zdCBSZW5kZXJP YmplY3QmLCBjb25zdCBMYXlvdXQmLCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZz ZXQpOworVmVjdG9yPEZsb2F0UXVhZD4gY29sbGVjdEFic29sdXRlUXVhZHMoY29uc3QgUmVuZGVy T2JqZWN0JiwgY29uc3QgTGF5b3V0JiwgYm9vbCogd2FzRml4ZWQpOwogCiBMYXlvdXRVbml0IGxp bmVIZWlnaHRGcm9tRmxvdyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmKTsKIExheW91dFVuaXQgYmFz ZWxpbmVGcm9tRmxvdyhjb25zdCBSZW5kZXJCbG9ja0Zsb3cmKTsKQEAgLTg4LDE0ICs4NywxNCBA QCBpbmxpbmUgTGF5b3V0VW5pdCBjb21wdXRlRmxvd0xhc3RMaW5lQmFzZWxpbmUoY29uc3QgUmVu ZGVyQmxvY2tGbG93JiBmbG93LCBjb25zdAogICAgIHJldHVybiBmbG93LmJvcmRlckFuZFBhZGRp bmdCZWZvcmUoKSArIGxpbmVIZWlnaHRGcm9tRmxvdyhmbG93KSAqIChsYXlvdXQubGluZUNvdW50 KCkgLSAxKSArIGJhc2VsaW5lRnJvbUZsb3coZmxvdyk7CiB9CiAKLWlubGluZSB1bnNpZ25lZCBm aW5kVGV4dENhcmV0TWluaW11bU9mZnNldChjb25zdCBSZW5kZXJUZXh0JiwgY29uc3QgTGF5b3V0 JiBsYXlvdXQpCitpbmxpbmUgdW5zaWduZWQgZmluZENhcmV0TWluaW11bU9mZnNldChjb25zdCBS ZW5kZXJUZXh0JiwgY29uc3QgTGF5b3V0JiBsYXlvdXQpCiB7CiAgICAgaWYgKCFsYXlvdXQucnVu Q291bnQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgcmV0dXJuIGxheW91dC5ydW5BdCgwKS5z dGFydDsKIH0KIAotaW5saW5lIHVuc2lnbmVkIGZpbmRUZXh0Q2FyZXRNYXhpbXVtT2Zmc2V0KGNv bnN0IFJlbmRlclRleHQmIHJlbmRlcmVyLCBjb25zdCBMYXlvdXQmIGxheW91dCkKK2lubGluZSB1 bnNpZ25lZCBmaW5kQ2FyZXRNYXhpbXVtT2Zmc2V0KGNvbnN0IFJlbmRlclRleHQmIHJlbmRlcmVy LCBjb25zdCBMYXlvdXQmIGxheW91dCkKIHsKICAgICBpZiAoIWxheW91dC5ydW5Db3VudCgpKQog ICAgICAgICByZXR1cm4gcmVuZGVyZXIudGV4dExlbmd0aCgpOwpAQCAtMTAzLDcgKzEwMiw3IEBA IGlubGluZSB1bnNpZ25lZCBmaW5kVGV4dENhcmV0TWF4aW11bU9mZnNldChjb25zdCBSZW5kZXJU ZXh0JiByZW5kZXJlciwgY29uc3QgTGF5CiAgICAgcmV0dXJuIGxhc3QuZW5kOwogfQogCi1pbmxp bmUgYm9vbCBjb250YWluc1RleHRDYXJldE9mZnNldChjb25zdCBSZW5kZXJUZXh0JiwgY29uc3Qg TGF5b3V0JiBsYXlvdXQsIHVuc2lnbmVkIG9mZnNldCkKK2lubGluZSBib29sIGNvbnRhaW5zQ2Fy ZXRPZmZzZXQoY29uc3QgUmVuZGVyVGV4dCYsIGNvbnN0IExheW91dCYgbGF5b3V0LCB1bnNpZ25l ZCBvZmZzZXQpCiB7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxheW91dC5ydW5Db3Vu dCgpOyArK2kpIHsKICAgICAgICAgYXV0byYgcnVuID0gbGF5b3V0LnJ1bkF0KGkpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNw cAppbmRleCA2YjA3MGQ2NmQ3ZjA5MDEwZWY0ZjM0N2Q0ZGFjODY2ZmNiYzdmYzM2Li5lOGQyNWI2 YmEwNWU3ZDlkNmE3MmI4NGM2Yzk5MjUxMTE3Mzg2MzRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNwcApAQCAtMjcsNyAr MjcsNyBAQAogI2luY2x1ZGUgIlNpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oIgogCiAjaW5jbHVk ZSAiUmVuZGVyQmxvY2tGbG93LmgiCi0jaW5jbHVkZSAiUmVuZGVyVGV4dC5oIgorI2luY2x1ZGUg IlJlbmRlck9iamVjdC5oIgogI2luY2x1ZGUgIlNpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuaCIK IAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNzcsNyArNzcsNyBAQCBTdHJpbmdWaWV3IFJ1blJl c29sdmVyOjpSdW46OnRleHQoKSBjb25zdAogICAgIGF1dG8mIHJlc29sdmVyID0gbV9pdGVyYXRv ci5yZXNvbHZlcigpOwogICAgIGF1dG8mIHJ1biA9IG1faXRlcmF0b3Iuc2ltcGxlUnVuKCk7CiAg ICAgYXV0byYgc2VnbWVudCA9IHJlc29sdmVyLm1fZmxvd0NvbnRlbnRzLnNlZ21lbnRGb3JQb3Np dGlvbihydW4uc3RhcnQpOwotICAgIC8vIFdlIGN1cnJlbnRseSBzcGxpdCBydW5zIG9uIHNlZ21l bnQgYm91bmRhcmllcyAoZGlmZmVyZW50IFJlbmRlclRleHQpLgorICAgIC8vIFdlIGN1cnJlbnRs eSBzcGxpdCBydW5zIG9uIHNlZ21lbnQgYm91bmRhcmllcyAoZGlmZmVyZW50IFJlbmRlck9iamVj dCkuCiAgICAgQVNTRVJUKHJ1bi5lbmQgPD0gc2VnbWVudC5lbmQpOwogICAgIGlmIChzZWdtZW50 LnRleHQuaXM4Qml0KCkpCiAgICAgICAgIHJldHVybiBTdHJpbmdWaWV3KHNlZ21lbnQudGV4dC5j aGFyYWN0ZXJzOCgpLCBzZWdtZW50LnRleHQubGVuZ3RoKCkpLnN1YnN0cmluZyhydW4uc3RhcnQg LSBzZWdtZW50LnN0YXJ0LCBydW4uZW5kIC0gcnVuLnN0YXJ0KTsKQEAgLTE1NSw3ICsxNTUsNyBA QCBSYW5nZTxSdW5SZXNvbHZlcjo6SXRlcmF0b3I+IFJ1blJlc29sdmVyOjpyYW5nZUZvclJlY3Qo Y29uc3QgTGF5b3V0UmVjdCYgcmVjdCkgYwogICAgIHJldHVybiBSYW5nZTxJdGVyYXRvcj4ocmFu Z2VCZWdpbiwgcmFuZ2VFbmQpOwogfQogCi1SYW5nZTxSdW5SZXNvbHZlcjo6SXRlcmF0b3I+IFJ1 blJlc29sdmVyOjpyYW5nZUZvclJlbmRlcmVyKGNvbnN0IFJlbmRlclRleHQmIHJlbmRlcmVyKSBj b25zdAorUmFuZ2U8UnVuUmVzb2x2ZXI6Okl0ZXJhdG9yPiBSdW5SZXNvbHZlcjo6cmFuZ2VGb3JS ZW5kZXJlcihjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyKSBjb25zdAogewogICAgIGF1dG8m IHNlZ21lbnQgPSBtX2Zsb3dDb250ZW50cy5zZWdtZW50Rm9yUmVuZGVyZXIocmVuZGVyZXIpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJl c29sdmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29s dmVyLmgKaW5kZXggN2YxNzg3ZWUyZjI2OTI2NTNkMjJkZGU3NTkwNTQ2ZjRjNmNiNDVhZS4uMDM1 OTkwMTQxNjA4YmM2NDBkMzQ2Zjg3YmMwOTMwYmIxNTc2YjRmZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaApAQCAtMjgsNyAr MjgsNiBAQAogCiAjaW5jbHVkZSAiTGF5b3V0UmVjdC5oIgogI2luY2x1ZGUgIlJlbmRlckJsb2Nr Rmxvdy5oIgotI2luY2x1ZGUgIlJlbmRlclRleHQuaCIKICNpbmNsdWRlICJTaW1wbGVMaW5lTGF5 b3V0Rmxvd0NvbnRlbnRzLmgiCiAjaW5jbHVkZSAiU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5o IgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KQEAgLTEwMSw3ICsxMDAsNyBAQCBwdWJsaWM6CiAg ICAgSXRlcmF0b3IgZW5kKCkgY29uc3Q7CiAKICAgICBSYW5nZTxJdGVyYXRvcj4gcmFuZ2VGb3JS ZWN0KGNvbnN0IExheW91dFJlY3QmKSBjb25zdDsKLSAgICBSYW5nZTxJdGVyYXRvcj4gcmFuZ2VG b3JSZW5kZXJlcihjb25zdCBSZW5kZXJUZXh0JikgY29uc3Q7CisgICAgUmFuZ2U8SXRlcmF0b3I+ IHJhbmdlRm9yUmVuZGVyZXIoY29uc3QgUmVuZGVyT2JqZWN0JikgY29uc3Q7CiAKIHByaXZhdGU6 CiAgICAgZW51bSBjbGFzcyBJbmRleFR5cGUgeyBGaXJzdCwgTGFzdCB9OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRUZXh0RnJhZ21lbnRJdGVy YXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFRleHRG cmFnbWVudEl0ZXJhdG9yLmNwcAppbmRleCA5ZTVmNjY0M2JhNzBjODA4OTYwYTkyMDUxY2QyY2Nj Njg1Mzg2N2MyLi5iMjU1ZjVlN2ZlYjI3NjQ4ZjQ5ZjllMGJkZWNiNTMzZWQ5YWVjMjJkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFRleHRGcmFn bWVudEl0ZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFRleHRGcmFnbWVudEl0ZXJhdG9yLmNwcApAQCAtMjgsNyArMjgsNiBAQAogCiAjaW5j bHVkZSAiUmVuZGVyQmxvY2tGbG93LmgiCiAjaW5jbHVkZSAiUmVuZGVyQ2hpbGRJdGVyYXRvci5o IgotI2luY2x1ZGUgIlJlbmRlclRleHQuaCIKICNpbmNsdWRlICJTaW1wbGVMaW5lTGF5b3V0Rmxv d0NvbnRlbnRzLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTk0LDggKzkzLDkgQEAgVGV4 dEZyYWdtZW50SXRlcmF0b3I6OlRleHRGcmFnbWVudCBUZXh0RnJhZ21lbnRJdGVyYXRvcjo6bmV4 dFRleHRGcmFnbWVudChmbG9hdAogZmxvYXQgVGV4dEZyYWdtZW50SXRlcmF0b3I6OnRleHRXaWR0 aCh1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgZmxvYXQgeFBvc2l0aW9uKSBjb25zdAogewog ICAgIGNvbnN0IGF1dG8mIGZyb21TZWdtZW50ID0gbV9mbG93Q29udGVudHMuc2VnbWVudEZvclBv c2l0aW9uKGZyb20pOworICAgIEFTU0VSVChpczxSZW5kZXJUZXh0Pihmcm9tU2VnbWVudC5yZW5k ZXJlcikpOwogICAgIGlmICgobV9zdHlsZS5mb250LmlzRml4ZWRQaXRjaCgpICYmIGZyb21TZWdt ZW50LmVuZCA+PSB0bykgfHwgKGZyb20gPT0gZnJvbVNlZ21lbnQuc3RhcnQgJiYgdG8gPT0gZnJv bVNlZ21lbnQuZW5kKSkKLSAgICAgICAgcmV0dXJuIGZyb21TZWdtZW50LnJlbmRlcmVyLndpZHRo KGZyb20gLSBmcm9tU2VnbWVudC5zdGFydCwgdG8gLSBmcm9tLCBtX3N0eWxlLmZvbnQsIHhQb3Np dGlvbiwgbnVsbHB0ciwgbnVsbHB0cik7CisgICAgICAgIHJldHVybiBkb3duY2FzdDxSZW5kZXJU ZXh0Pihmcm9tU2VnbWVudC5yZW5kZXJlcikud2lkdGgoZnJvbSAtIGZyb21TZWdtZW50LnN0YXJ0 LCB0byAtIGZyb20sIG1fc3R5bGUuZm9udCwgeFBvc2l0aW9uLCBudWxscHRyLCBudWxscHRyKTsK IAogICAgIGNvbnN0IGF1dG8qIHNlZ21lbnQgPSAmZnJvbVNlZ21lbnQ7CiAgICAgZmxvYXQgdGV4 dFdpZHRoID0gMDsK