142785 2015-03-17 10:13:04 -0700 Simple line layout: Change FlowContents::segmentForPosition() to segmentForRun(). 2015-03-17 23:08:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified REOPENED P2 Normal --- 142812 1 zalan zalan commit-queue esprehn+autocc glenn koivisto kondapallykalyan oldest_to_newest 1077906 0 zalan 2015-03-17 10:13:04 -0700 This is in transition to support <br>. <br> and a render text can be on the same (start) position. 1077913 1 248854 zalan 2015-03-17 11:07:49 -0700 Created attachment 248854 Patch 1077990 2 248873 zalan 2015-03-17 15:22:59 -0700 Created attachment 248873 Patch 1078083 3 248899 zalan 2015-03-17 19:01:35 -0700 Created attachment 248899 Patch 1078096 4 248899 commit-queue 2015-03-17 20:41:27 -0700 Comment on attachment 248899 Patch Clearing flags on attachment: 248899 Committed r181682: <http://trac.webkit.org/changeset/181682> 1078097 5 commit-queue 2015-03-17 20:41:31 -0700 All reviewed patches have been landed. Closing bug. 1078122 6 commit-queue 2015-03-17 23:06:00 -0700 Re-opened since this is blocked by bug 142812 1078125 7 ap 2015-03-17 23:08:13 -0700 This patch depends on <http://trac.webkit.org/changeset/181667>, so it had to be reverted too. I am not aware of any problems with it per se. 248854 2015-03-17 11:07:49 -0700 2015-03-17 15:22:55 -0700 Patch Patch.txt text/plain 5207 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMzY1ZjcyLi5lZGJhYmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTUtMDMtMTcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAg ICBTaW1wbGUgbGluZSBsYXlvdXQ6IENoYW5nZSBGbG93Q29udGVudHM6OnNlZ21lbnRGb3JQb3Np dGlvbigpIHRvIHNlZ21lbnRGb3JSdW4oKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0Mjc4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gdHJhbnNpdGlvbiB0byBzdXBwb3J0IDxicj4u IEEgcGFydGljdWxhciBwb3NpdGlvbiBjb3VsZCBwb2ludCB0byBtdWx0aXBsZQorICAgICAgICBz ZWdtZW50cyB3aGVuIDxicj4gaXMgZGlyZWN0bHkgZm9sbG93ZWQgYnkgdGV4dC4gCisKKyAgICAg ICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVM aW5lTGF5b3V0OjpGbG93Q29udGVudHM6OnNlZ21lbnRJbmRleEZvclJ1blNsb3cpOgorICAgICAg ICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Rmxvd0NvbnRlbnRzOjpzZWdtZW50SW5kZXhG b3JQb3NpdGlvblNsb3cpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0Rmxvd0NvbnRlbnRzLmg6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0 OjpGbG93Q29udGVudHM6OnNlZ21lbnRJbmRleEZvclJ1bik6CisgICAgICAgIChXZWJDb3JlOjpT aW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVudHM6OnNlZ21lbnRGb3JSdW4pOgorICAgICAgICAq IHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2ltcGxlTGluZUxheW91dDo6UnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dCk6CisKIDIwMTUtMDMt MTYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGUgbGlu ZSBsYXlvdXQ6IFNwbGl0IGZyYWdtZW50cyBvbiByZW5kZXJlciBib3VuZGFyeSBvbiB0aGUgZmx5 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRG bG93Q29udGVudHMuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlv dXRGbG93Q29udGVudHMuY3BwCmluZGV4IDEyM2RlODMuLjE2Y2IwOWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50 cy5jcHAKQEAgLTUxLDEyICs1MSwxMyBAQCBGbG93Q29udGVudHM6OkZsb3dDb250ZW50cyhjb25z dCBSZW5kZXJCbG9ja0Zsb3cmIGZsb3cpCiB7CiB9CiAKLXVuc2lnbmVkIEZsb3dDb250ZW50czo6 c2VnbWVudEluZGV4Rm9yUG9zaXRpb25TbG93KHVuc2lnbmVkIHBvc2l0aW9uKSBjb25zdAordW5z aWduZWQgRmxvd0NvbnRlbnRzOjpzZWdtZW50SW5kZXhGb3JSdW5TbG93KHVuc2lnbmVkIHN0YXJ0 LCB1bnNpZ25lZCBlbmQpIGNvbnN0CiB7Ci0gICAgYXV0byBpdCA9IHN0ZDo6bG93ZXJfYm91bmQo bV9zZWdtZW50cy5iZWdpbigpLCBtX3NlZ21lbnRzLmVuZCgpLCBwb3NpdGlvbiwgW10oY29uc3Qg U2VnbWVudCYgc2VnbWVudCwgdW5zaWduZWQgcG9zaXRpb24pIHsKLSAgICAgICAgcmV0dXJuIHNl Z21lbnQuZW5kIDw9IHBvc2l0aW9uOworICAgIGF1dG8gaXQgPSBzdGQ6Omxvd2VyX2JvdW5kKG1f c2VnbWVudHMuYmVnaW4oKSwgbV9zZWdtZW50cy5lbmQoKSwgc3RhcnQsIFtdKGNvbnN0IFNlZ21l bnQmIHNlZ21lbnQsIHVuc2lnbmVkIHN0YXJ0KSB7CisgICAgICAgIHJldHVybiBzZWdtZW50LmVu ZCA8PSBzdGFydDsKICAgICB9KTsKICAgICBBU1NFUlQoaXQgIT0gbV9zZWdtZW50cy5lbmQoKSk7 CisgICAgQVNTRVJUX1VOVVNFRChlbmQsIGVuZCA8PSBpdC0+ZW5kKTsKICAgICBhdXRvIGluZGV4 ID0gaXQgLSBtX3NlZ21lbnRzLmJlZ2luKCk7CiAgICAgbV9sYXN0U2VnbWVudEluZGV4ID0gaW5k ZXg7CiAgICAgcmV0dXJuIGluZGV4OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmgKaW5kZXggNWM2YTk0Yi4uODU4OWFh YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRG bG93Q29udGVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxh eW91dEZsb3dDb250ZW50cy5oCkBAIC00Myw3ICs0Myw3IEBAIHB1YmxpYzoKICAgICAgICAgU3Ry aW5nIHRleHQ7CiAgICAgICAgIGNvbnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXI7CiAgICAgfTsK LSAgICBjb25zdCBTZWdtZW50JiBzZWdtZW50Rm9yUG9zaXRpb24odW5zaWduZWQpIGNvbnN0Owor ICAgIGNvbnN0IFNlZ21lbnQmIHNlZ21lbnRGb3JSdW4odW5zaWduZWQgc3RhcnQsIHVuc2lnbmVk IGVuZCkgY29uc3Q7CiAgICAgY29uc3QgU2VnbWVudCYgc2VnbWVudEZvclJlbmRlcmVyKGNvbnN0 IFJlbmRlck9iamVjdCYpIGNvbnN0OwogCiAgICAgY2xhc3MgSXRlcmF0b3IgewpAQCAtNzAsMTAg KzcwLDEwIEBAIHB1YmxpYzoKICAgICBJdGVyYXRvciBiZWdpbigpIGNvbnN0IHsgcmV0dXJuIEl0 ZXJhdG9yKCp0aGlzLCAwKTsgfQogICAgIEl0ZXJhdG9yIGVuZCgpIGNvbnN0IHsgcmV0dXJuIEl0 ZXJhdG9yKCp0aGlzLCBtX3NlZ21lbnRzLnNpemUoKSk7IH0KIAotICAgIHVuc2lnbmVkIHNlZ21l bnRJbmRleEZvclBvc2l0aW9uKHVuc2lnbmVkIHBvc2l0aW9uKSBjb25zdDsKKyAgICB1bnNpZ25l ZCBzZWdtZW50SW5kZXhGb3JSdW4odW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGVuZCkgY29uc3Q7 CiAKIHByaXZhdGU6Ci0gICAgdW5zaWduZWQgc2VnbWVudEluZGV4Rm9yUG9zaXRpb25TbG93KHVu c2lnbmVkIHBvc2l0aW9uKSBjb25zdDsKKyAgICB1bnNpZ25lZCBzZWdtZW50SW5kZXhGb3JSdW5T bG93KHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQpIGNvbnN0OwogICAgIGNvbnN0IFZlY3Rv cjxTZWdtZW50LCA4PiBtX3NlZ21lbnRzOwogICAgIG11dGFibGUgdW5zaWduZWQgbV9sYXN0U2Vn bWVudEluZGV4OwogfTsKQEAgLTExOCwxNyArMTE4LDE4IEBAIGlubGluZSBjb25zdCBGbG93Q29u dGVudHM6OlNlZ21lbnQqIEZsb3dDb250ZW50czo6SXRlcmF0b3I6Om9wZXJhdG9yLT4oKSBjb25z dAogICAgIHJldHVybiAmKG1fZmxvd0NvbnRlbnRzLm1fc2VnbWVudHNbbV9zZWdtZW50SW5kZXhd KTsKIH0KIAotaW5saW5lIHVuc2lnbmVkIEZsb3dDb250ZW50czo6c2VnbWVudEluZGV4Rm9yUG9z aXRpb24odW5zaWduZWQgcG9zaXRpb24pIGNvbnN0CitpbmxpbmUgdW5zaWduZWQgRmxvd0NvbnRl bnRzOjpzZWdtZW50SW5kZXhGb3JSdW4odW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGVuZCkgY29u c3QKIHsKKyAgICBBU1NFUlQoc3RhcnQgPCBlbmQpOwogICAgIGF1dG8mIGxhc3RTZWdtZW50ID0g bV9zZWdtZW50c1ttX2xhc3RTZWdtZW50SW5kZXhdOwotICAgIGlmIChsYXN0U2VnbWVudC5zdGFy dCA8PSBwb3NpdGlvbiAmJiBwb3NpdGlvbiA8IGxhc3RTZWdtZW50LmVuZCkKKyAgICBpZiAobGFz dFNlZ21lbnQuc3RhcnQgPD0gc3RhcnQgJiYgZW5kIDw9IGxhc3RTZWdtZW50LmVuZCkKICAgICAg ICAgcmV0dXJuIG1fbGFzdFNlZ21lbnRJbmRleDsKLSAgICByZXR1cm4gc2VnbWVudEluZGV4Rm9y UG9zaXRpb25TbG93KHBvc2l0aW9uKTsKKyAgICByZXR1cm4gc2VnbWVudEluZGV4Rm9yUnVuU2xv dyhzdGFydCwgZW5kKTsKIH0KIAotaW5saW5lIGNvbnN0IEZsb3dDb250ZW50czo6U2VnbWVudCYg Rmxvd0NvbnRlbnRzOjpzZWdtZW50Rm9yUG9zaXRpb24odW5zaWduZWQgcG9zaXRpb24pIGNvbnN0 CitpbmxpbmUgY29uc3QgRmxvd0NvbnRlbnRzOjpTZWdtZW50JiBGbG93Q29udGVudHM6OnNlZ21l bnRGb3JSdW4odW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGVuZCkgY29uc3QKIHsKLSAgICByZXR1 cm4gbV9zZWdtZW50c1tzZWdtZW50SW5kZXhGb3JQb3NpdGlvbihwb3NpdGlvbildOworICAgIHJl dHVybiBtX3NlZ21lbnRzW3NlZ21lbnRJbmRleEZvclJ1bihzdGFydCwgZW5kKV07CiB9CiAKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVz b2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNv bHZlci5jcHAKaW5kZXggZThkMjViNi4uYjIzYjQ3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAKQEAgLTc2LDcgKzc2 LDggQEAgU3RyaW5nVmlldyBSdW5SZXNvbHZlcjo6UnVuOjp0ZXh0KCkgY29uc3QKIHsKICAgICBh dXRvJiByZXNvbHZlciA9IG1faXRlcmF0b3IucmVzb2x2ZXIoKTsKICAgICBhdXRvJiBydW4gPSBt X2l0ZXJhdG9yLnNpbXBsZVJ1bigpOwotICAgIGF1dG8mIHNlZ21lbnQgPSByZXNvbHZlci5tX2Zs b3dDb250ZW50cy5zZWdtZW50Rm9yUG9zaXRpb24ocnVuLnN0YXJ0KTsKKyAgICBBU1NFUlQocnVu LnN0YXJ0IDwgcnVuLmVuZCk7CisgICAgYXV0byYgc2VnbWVudCA9IHJlc29sdmVyLm1fZmxvd0Nv bnRlbnRzLnNlZ21lbnRGb3JSdW4ocnVuLnN0YXJ0LCBydW4uZW5kKTsKICAgICAvLyBXZSBjdXJy ZW50bHkgc3BsaXQgcnVucyBvbiBzZWdtZW50IGJvdW5kYXJpZXMgKGRpZmZlcmVudCBSZW5kZXJP YmplY3QpLgogICAgIEFTU0VSVChydW4uZW5kIDw9IHNlZ21lbnQuZW5kKTsKICAgICBpZiAoc2Vn bWVudC50ZXh0LmlzOEJpdCgpKQo= 248873 2015-03-17 15:22:59 -0700 2015-03-17 19:01:32 -0700 Patch bug-142785-20150317152228.patch text/plain 5556 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNjY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODc0MGExZjM0YjNmMjQ2 ZGQwODc2OGRlMWYxMDMxODg1YmVjMDllOS4uYmJiNzY0YjEzNzBjNTA4M2E2ZjNmMGExZWJiYmFj YmUzMzcwZGVhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE1LTAzLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBDaGFuZ2UgRmxvd0NvbnRlbnRzOjpzZWdtZW50Rm9yUG9zaXRpb24oKSB0byBzZWdtZW50Rm9y UnVuKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDI3ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGlzIGluIHRyYW5zaXRpb24gdG8gc3VwcG9ydCA8YnI+LiBBIHBhcnRpY3VsYXIgcG9zaXRp b24gY291bGQgcG9pbnQgdG8gbXVsdGlwbGUKKyAgICAgICAgc2VnbWVudHMgd2hlbiA8YnI+IGlz IGRpcmVjdGx5IGZvbGxvd2VkIGJ5IHRleHQuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0 aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250 ZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVu dHM6OnNlZ21lbnRJbmRleEZvclJ1blNsb3cpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGlu ZUxheW91dDo6Rmxvd0NvbnRlbnRzOjpzZWdtZW50SW5kZXhGb3JQb3NpdGlvblNsb3cpOiBEZWxl dGVkLgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmg6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVudHM6OnNlZ21l bnRJbmRleEZvclJ1bik6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpGbG93 Q29udGVudHM6OnNlZ21lbnRGb3JSdW4pOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0UmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6 UnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dCk6CisKKzIwMTUtMDMtMTcgIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KKwogICAgICAgICBTaW1wbGUgbGluZSBsYXlvdXQ6IFNwbGl0IGZyYWdt ZW50cyBvbiByZW5kZXJlciBib3VuZGFyeSBvbiB0aGUgZmx5LgogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTc5CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcApp bmRleCAxMjNkZTgzOGU5MTVlMTQ1NzcxNTdhZTAwNzc3NGY5Zjk0ZWFiNTIxLi4xNmNiMDllODk0 OTFlMzEwN2QxMGExOTFlY2ZkZTMzODM2Yjg5YzFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3BwCkBAIC01 MSwxMiArNTEsMTMgQEAgRmxvd0NvbnRlbnRzOjpGbG93Q29udGVudHMoY29uc3QgUmVuZGVyQmxv Y2tGbG93JiBmbG93KQogewogfQogCi11bnNpZ25lZCBGbG93Q29udGVudHM6OnNlZ21lbnRJbmRl eEZvclBvc2l0aW9uU2xvdyh1bnNpZ25lZCBwb3NpdGlvbikgY29uc3QKK3Vuc2lnbmVkIEZsb3dD b250ZW50czo6c2VnbWVudEluZGV4Rm9yUnVuU2xvdyh1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQg ZW5kKSBjb25zdAogewotICAgIGF1dG8gaXQgPSBzdGQ6Omxvd2VyX2JvdW5kKG1fc2VnbWVudHMu YmVnaW4oKSwgbV9zZWdtZW50cy5lbmQoKSwgcG9zaXRpb24sIFtdKGNvbnN0IFNlZ21lbnQmIHNl Z21lbnQsIHVuc2lnbmVkIHBvc2l0aW9uKSB7Ci0gICAgICAgIHJldHVybiBzZWdtZW50LmVuZCA8 PSBwb3NpdGlvbjsKKyAgICBhdXRvIGl0ID0gc3RkOjpsb3dlcl9ib3VuZChtX3NlZ21lbnRzLmJl Z2luKCksIG1fc2VnbWVudHMuZW5kKCksIHN0YXJ0LCBbXShjb25zdCBTZWdtZW50JiBzZWdtZW50 LCB1bnNpZ25lZCBzdGFydCkgeworICAgICAgICByZXR1cm4gc2VnbWVudC5lbmQgPD0gc3RhcnQ7 CiAgICAgfSk7CiAgICAgQVNTRVJUKGl0ICE9IG1fc2VnbWVudHMuZW5kKCkpOworICAgIEFTU0VS VF9VTlVTRUQoZW5kLCBlbmQgPD0gaXQtPmVuZCk7CiAgICAgYXV0byBpbmRleCA9IGl0IC0gbV9z ZWdtZW50cy5iZWdpbigpOwogICAgIG1fbGFzdFNlZ21lbnRJbmRleCA9IGluZGV4OwogICAgIHJl dHVybiBpbmRleDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVM aW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxl TGluZUxheW91dEZsb3dDb250ZW50cy5oCmluZGV4IDE3ZDBkMGFkOGU5YjhkMDA5NGFiNjdkM2Mw OTM3NjNmNmM3ZjM3YzQuLjVkZmEwNmVkY2FhYjQ2OGIzYTlmZjQ5OGVkZDgxOGQ0ZGE2OWU3ZGIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxv d0NvbnRlbnRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlv dXRGbG93Q29udGVudHMuaApAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiAgICAgICAgIFN0cmlu ZyB0ZXh0OwogICAgICAgICBjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyOwogICAgIH07Ci0g ICAgY29uc3QgU2VnbWVudCYgc2VnbWVudEZvclBvc2l0aW9uKHVuc2lnbmVkKSBjb25zdDsKKyAg ICBjb25zdCBTZWdtZW50JiBzZWdtZW50Rm9yUnVuKHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBl bmQpIGNvbnN0OwogICAgIGNvbnN0IFNlZ21lbnQmIHNlZ21lbnRGb3JSZW5kZXJlcihjb25zdCBS ZW5kZXJPYmplY3QmKSBjb25zdDsKIAogICAgIGNsYXNzIEl0ZXJhdG9yIHsKQEAgLTY5LDEwICs2 OSwxMCBAQCBwdWJsaWM6CiAgICAgSXRlcmF0b3IgYmVnaW4oKSBjb25zdCB7IHJldHVybiBJdGVy YXRvcigqdGhpcywgMCk7IH0KICAgICBJdGVyYXRvciBlbmQoKSBjb25zdCB7IHJldHVybiBJdGVy YXRvcigqdGhpcywgbV9zZWdtZW50cy5zaXplKCkpOyB9CiAKLSAgICB1bnNpZ25lZCBzZWdtZW50 SW5kZXhGb3JQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbikgY29uc3Q7CisgICAgdW5zaWduZWQg c2VnbWVudEluZGV4Rm9yUnVuKHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQpIGNvbnN0Owog CiBwcml2YXRlOgotICAgIHVuc2lnbmVkIHNlZ21lbnRJbmRleEZvclBvc2l0aW9uU2xvdyh1bnNp Z25lZCBwb3NpdGlvbikgY29uc3Q7CisgICAgdW5zaWduZWQgc2VnbWVudEluZGV4Rm9yUnVuU2xv dyh1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kKSBjb25zdDsKICAgICBjb25zdCBWZWN0b3I8 U2VnbWVudCwgOD4gbV9zZWdtZW50czsKICAgICBtdXRhYmxlIHVuc2lnbmVkIG1fbGFzdFNlZ21l bnRJbmRleDsKIH07CkBAIC0xMTEsMTcgKzExMSwxOCBAQCBpbmxpbmUgY29uc3QgRmxvd0NvbnRl bnRzOjpTZWdtZW50KiBGbG93Q29udGVudHM6Okl0ZXJhdG9yOjpvcGVyYXRvci0+KCkgY29uc3QK ICAgICByZXR1cm4gJihtX2Zsb3dDb250ZW50cy5tX3NlZ21lbnRzW21fc2VnbWVudEluZGV4XSk7 CiB9CiAKLWlubGluZSB1bnNpZ25lZCBGbG93Q29udGVudHM6OnNlZ21lbnRJbmRleEZvclBvc2l0 aW9uKHVuc2lnbmVkIHBvc2l0aW9uKSBjb25zdAoraW5saW5lIHVuc2lnbmVkIEZsb3dDb250ZW50 czo6c2VnbWVudEluZGV4Rm9yUnVuKHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQpIGNvbnN0 CiB7CisgICAgQVNTRVJUKHN0YXJ0IDwgZW5kKTsKICAgICBhdXRvJiBsYXN0U2VnbWVudCA9IG1f c2VnbWVudHNbbV9sYXN0U2VnbWVudEluZGV4XTsKLSAgICBpZiAobGFzdFNlZ21lbnQuc3RhcnQg PD0gcG9zaXRpb24gJiYgcG9zaXRpb24gPCBsYXN0U2VnbWVudC5lbmQpCisgICAgaWYgKGxhc3RT ZWdtZW50LnN0YXJ0IDw9IHN0YXJ0ICYmIGVuZCA8PSBsYXN0U2VnbWVudC5lbmQpCiAgICAgICAg IHJldHVybiBtX2xhc3RTZWdtZW50SW5kZXg7Ci0gICAgcmV0dXJuIHNlZ21lbnRJbmRleEZvclBv c2l0aW9uU2xvdyhwb3NpdGlvbik7CisgICAgcmV0dXJuIHNlZ21lbnRJbmRleEZvclJ1blNsb3co c3RhcnQsIGVuZCk7CiB9CiAKLWlubGluZSBjb25zdCBGbG93Q29udGVudHM6OlNlZ21lbnQmIEZs b3dDb250ZW50czo6c2VnbWVudEZvclBvc2l0aW9uKHVuc2lnbmVkIHBvc2l0aW9uKSBjb25zdAor aW5saW5lIGNvbnN0IEZsb3dDb250ZW50czo6U2VnbWVudCYgRmxvd0NvbnRlbnRzOjpzZWdtZW50 Rm9yUnVuKHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQpIGNvbnN0CiB7Ci0gICAgcmV0dXJu IG1fc2VnbWVudHNbc2VnbWVudEluZGV4Rm9yUG9zaXRpb24ocG9zaXRpb24pXTsKKyAgICByZXR1 cm4gbV9zZWdtZW50c1tzZWdtZW50SW5kZXhGb3JSdW4oc3RhcnQsIGVuZCldOwogfQogCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29s dmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2 ZXIuY3BwCmluZGV4IGU4ZDI1YjZiYTA1ZTdkOWQ2YTcyYjg0YzZjOTkyNTExMTczODYzNGUuLmIy M2I0NzU0ZWVmNzU5NmZkNTZlNDEyNmNjNDE0OWU2ZjU3MWNiZGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCkBAIC03 Niw3ICs3Niw4IEBAIFN0cmluZ1ZpZXcgUnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dCgpIGNvbnN0CiB7 CiAgICAgYXV0byYgcmVzb2x2ZXIgPSBtX2l0ZXJhdG9yLnJlc29sdmVyKCk7CiAgICAgYXV0byYg cnVuID0gbV9pdGVyYXRvci5zaW1wbGVSdW4oKTsKLSAgICBhdXRvJiBzZWdtZW50ID0gcmVzb2x2 ZXIubV9mbG93Q29udGVudHMuc2VnbWVudEZvclBvc2l0aW9uKHJ1bi5zdGFydCk7CisgICAgQVNT RVJUKHJ1bi5zdGFydCA8IHJ1bi5lbmQpOworICAgIGF1dG8mIHNlZ21lbnQgPSByZXNvbHZlci5t X2Zsb3dDb250ZW50cy5zZWdtZW50Rm9yUnVuKHJ1bi5zdGFydCwgcnVuLmVuZCk7CiAgICAgLy8g V2UgY3VycmVudGx5IHNwbGl0IHJ1bnMgb24gc2VnbWVudCBib3VuZGFyaWVzIChkaWZmZXJlbnQg UmVuZGVyT2JqZWN0KS4KICAgICBBU1NFUlQocnVuLmVuZCA8PSBzZWdtZW50LmVuZCk7CiAgICAg aWYgKHNlZ21lbnQudGV4dC5pczhCaXQoKSkK 248899 2015-03-17 19:01:35 -0700 2015-03-17 20:41:27 -0700 Patch bug-142785-20150317190104.patch text/plain 5445 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNjgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzYyZTk0MjhjNDgxNjI5 MTFiMzRlNWYyNTIzNmQ4ZTYwMzkxYWM4OS4uZDJjZGMxYTk3ZDkxN2NmYzY1ZTI0MDMxYmYzYWMy MjczYmM2OTk1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTAzLTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBDaGFuZ2UgRmxvd0NvbnRlbnRzOjpzZWdtZW50Rm9yUG9zaXRpb24oKSB0byBzZWdtZW50Rm9y UnVuKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NDI3ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGlzIGluIHRyYW5zaXRpb24gdG8gc3VwcG9ydCA8YnI+LiBBIHBhcnRpY3VsYXIgcG9zaXRp b24gY291bGQgcG9pbnQgdG8gbXVsdGlwbGUKKyAgICAgICAgc2VnbWVudHMgd2hlbiA8YnI+IGlz IGRpcmVjdGx5IGZvbGxvd2VkIGJ5IHRleHQuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0 aW9uYWxpdHkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250 ZW50cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVu dHM6OnNlZ21lbnRJbmRleEZvclJ1blNsb3cpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGlu ZUxheW91dDo6Rmxvd0NvbnRlbnRzOjpzZWdtZW50SW5kZXhGb3JQb3NpdGlvblNsb3cpOiBEZWxl dGVkLgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmg6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVudHM6OnNlZ21l bnRGb3JSdW4pOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Rmxvd0NvbnRl bnRzOjpzZWdtZW50SW5kZXhGb3JQb3NpdGlvbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpTaW1wbGVMaW5lTGF5b3V0OjpGbG93Q29udGVudHM6OnNlZ21lbnRGb3JQb3NpdGlvbik6IERl bGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpSdW5SZXNvbHZlcjo6UnVuOjp0 ZXh0KToKKwogMjAxNS0wMy0xNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAg ICAgICAgIFtNYWNdW2lPU10gc2V0U2hhcmVkVGltZXJGaXJlSW50ZXJ2YWwoKSAvIHN0b3BTaGFy ZWRUaW1lcigpIGFyZSBleHBlbnNpdmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcAppbmRleCAxMjNkZTgzOGU5 MTVlMTQ1NzcxNTdhZTAwNzc3NGY5Zjk0ZWFiNTIxLi4xNmNiMDllODk0OTFlMzEwN2QxMGExOTFl Y2ZkZTMzODM2Yjg5YzFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3BwCkBAIC01MSwxMiArNTEsMTMgQEAg Rmxvd0NvbnRlbnRzOjpGbG93Q29udGVudHMoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93KQog ewogfQogCi11bnNpZ25lZCBGbG93Q29udGVudHM6OnNlZ21lbnRJbmRleEZvclBvc2l0aW9uU2xv dyh1bnNpZ25lZCBwb3NpdGlvbikgY29uc3QKK3Vuc2lnbmVkIEZsb3dDb250ZW50czo6c2VnbWVu dEluZGV4Rm9yUnVuU2xvdyh1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kKSBjb25zdAogewot ICAgIGF1dG8gaXQgPSBzdGQ6Omxvd2VyX2JvdW5kKG1fc2VnbWVudHMuYmVnaW4oKSwgbV9zZWdt ZW50cy5lbmQoKSwgcG9zaXRpb24sIFtdKGNvbnN0IFNlZ21lbnQmIHNlZ21lbnQsIHVuc2lnbmVk IHBvc2l0aW9uKSB7Ci0gICAgICAgIHJldHVybiBzZWdtZW50LmVuZCA8PSBwb3NpdGlvbjsKKyAg ICBhdXRvIGl0ID0gc3RkOjpsb3dlcl9ib3VuZChtX3NlZ21lbnRzLmJlZ2luKCksIG1fc2VnbWVu dHMuZW5kKCksIHN0YXJ0LCBbXShjb25zdCBTZWdtZW50JiBzZWdtZW50LCB1bnNpZ25lZCBzdGFy dCkgeworICAgICAgICByZXR1cm4gc2VnbWVudC5lbmQgPD0gc3RhcnQ7CiAgICAgfSk7CiAgICAg QVNTRVJUKGl0ICE9IG1fc2VnbWVudHMuZW5kKCkpOworICAgIEFTU0VSVF9VTlVTRUQoZW5kLCBl bmQgPD0gaXQtPmVuZCk7CiAgICAgYXV0byBpbmRleCA9IGl0IC0gbV9zZWdtZW50cy5iZWdpbigp OwogICAgIG1fbGFzdFNlZ21lbnRJbmRleCA9IGluZGV4OwogICAgIHJldHVybiBpbmRleDsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0Nv bnRlbnRzLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dD b250ZW50cy5oCmluZGV4IDE3ZDBkMGFkOGU5YjhkMDA5NGFiNjdkM2MwOTM3NjNmNmM3ZjM3YzQu LmI3OGYyOTZjMGNiYmYwODIyYzJhNmU5MWFjNzE2ZTZiZjY2MmI1NGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMu aApAQCAtNDMsNyArNDMsNyBAQCBwdWJsaWM6CiAgICAgICAgIFN0cmluZyB0ZXh0OwogICAgICAg ICBjb25zdCBSZW5kZXJPYmplY3QmIHJlbmRlcmVyOwogICAgIH07Ci0gICAgY29uc3QgU2VnbWVu dCYgc2VnbWVudEZvclBvc2l0aW9uKHVuc2lnbmVkKSBjb25zdDsKKyAgICBjb25zdCBTZWdtZW50 JiBzZWdtZW50Rm9yUnVuKHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBlbmQpIGNvbnN0OwogICAg IGNvbnN0IFNlZ21lbnQmIHNlZ21lbnRGb3JSZW5kZXJlcihjb25zdCBSZW5kZXJPYmplY3QmKSBj b25zdDsKIAogICAgIGNsYXNzIEl0ZXJhdG9yIHsKQEAgLTY5LDEwICs2OSw4IEBAIHB1YmxpYzoK ICAgICBJdGVyYXRvciBiZWdpbigpIGNvbnN0IHsgcmV0dXJuIEl0ZXJhdG9yKCp0aGlzLCAwKTsg fQogICAgIEl0ZXJhdG9yIGVuZCgpIGNvbnN0IHsgcmV0dXJuIEl0ZXJhdG9yKCp0aGlzLCBtX3Nl Z21lbnRzLnNpemUoKSk7IH0KIAotICAgIHVuc2lnbmVkIHNlZ21lbnRJbmRleEZvclBvc2l0aW9u KHVuc2lnbmVkIHBvc2l0aW9uKSBjb25zdDsKLQogcHJpdmF0ZToKLSAgICB1bnNpZ25lZCBzZWdt ZW50SW5kZXhGb3JQb3NpdGlvblNsb3codW5zaWduZWQgcG9zaXRpb24pIGNvbnN0OworICAgIHVu c2lnbmVkIHNlZ21lbnRJbmRleEZvclJ1blNsb3codW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGVu ZCkgY29uc3Q7CiAgICAgY29uc3QgVmVjdG9yPFNlZ21lbnQsIDg+IG1fc2VnbWVudHM7CiAgICAg bXV0YWJsZSB1bnNpZ25lZCBtX2xhc3RTZWdtZW50SW5kZXg7CiB9OwpAQCAtMTExLDE3ICsxMDks MTMgQEAgaW5saW5lIGNvbnN0IEZsb3dDb250ZW50czo6U2VnbWVudCogRmxvd0NvbnRlbnRzOjpJ dGVyYXRvcjo6b3BlcmF0b3ItPigpIGNvbnN0CiAgICAgcmV0dXJuICYobV9mbG93Q29udGVudHMu bV9zZWdtZW50c1ttX3NlZ21lbnRJbmRleF0pOwogfQogCi1pbmxpbmUgdW5zaWduZWQgRmxvd0Nv bnRlbnRzOjpzZWdtZW50SW5kZXhGb3JQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbikgY29uc3QK K2lubGluZSBjb25zdCBGbG93Q29udGVudHM6OlNlZ21lbnQmIEZsb3dDb250ZW50czo6c2VnbWVu dEZvclJ1bih1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgZW5kKSBjb25zdAogeworICAgIEFTU0VS VChzdGFydCA8IGVuZCk7CiAgICAgYXV0byYgbGFzdFNlZ21lbnQgPSBtX3NlZ21lbnRzW21fbGFz dFNlZ21lbnRJbmRleF07Ci0gICAgaWYgKGxhc3RTZWdtZW50LnN0YXJ0IDw9IHBvc2l0aW9uICYm IHBvc2l0aW9uIDwgbGFzdFNlZ21lbnQuZW5kKQotICAgICAgICByZXR1cm4gbV9sYXN0U2VnbWVu dEluZGV4OwotICAgIHJldHVybiBzZWdtZW50SW5kZXhGb3JQb3NpdGlvblNsb3cocG9zaXRpb24p OwotfQotCi1pbmxpbmUgY29uc3QgRmxvd0NvbnRlbnRzOjpTZWdtZW50JiBGbG93Q29udGVudHM6 OnNlZ21lbnRGb3JQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbikgY29uc3QKLXsKLSAgICByZXR1 cm4gbV9zZWdtZW50c1tzZWdtZW50SW5kZXhGb3JQb3NpdGlvbihwb3NpdGlvbildOworICAgIGlm IChsYXN0U2VnbWVudC5zdGFydCA8PSBzdGFydCAmJiBlbmQgPD0gbGFzdFNlZ21lbnQuZW5kKQor ICAgICAgICByZXR1cm4gbV9zZWdtZW50c1ttX2xhc3RTZWdtZW50SW5kZXhdOworICAgIHJldHVy biBtX3NlZ21lbnRzW3NlZ21lbnRJbmRleEZvclJ1blNsb3coc3RhcnQsIGVuZCldOwogfQogCiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJl c29sdmVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVz b2x2ZXIuY3BwCmluZGV4IGU4ZDI1YjZiYTA1ZTdkOWQ2YTcyYjg0YzZjOTkyNTExMTczODYzNGUu LmIyM2I0NzU0ZWVmNzU5NmZkNTZlNDEyNmNjNDE0OWU2ZjU3MWNiZGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwCkBA IC03Niw3ICs3Niw4IEBAIFN0cmluZ1ZpZXcgUnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dCgpIGNvbnN0 CiB7CiAgICAgYXV0byYgcmVzb2x2ZXIgPSBtX2l0ZXJhdG9yLnJlc29sdmVyKCk7CiAgICAgYXV0 byYgcnVuID0gbV9pdGVyYXRvci5zaW1wbGVSdW4oKTsKLSAgICBhdXRvJiBzZWdtZW50ID0gcmVz b2x2ZXIubV9mbG93Q29udGVudHMuc2VnbWVudEZvclBvc2l0aW9uKHJ1bi5zdGFydCk7CisgICAg QVNTRVJUKHJ1bi5zdGFydCA8IHJ1bi5lbmQpOworICAgIGF1dG8mIHNlZ21lbnQgPSByZXNvbHZl ci5tX2Zsb3dDb250ZW50cy5zZWdtZW50Rm9yUnVuKHJ1bi5zdGFydCwgcnVuLmVuZCk7CiAgICAg Ly8gV2UgY3VycmVudGx5IHNwbGl0IHJ1bnMgb24gc2VnbWVudCBib3VuZGFyaWVzIChkaWZmZXJl bnQgUmVuZGVyT2JqZWN0KS4KICAgICBBU1NFUlQocnVuLmVuZCA8PSBzZWdtZW50LmVuZCk7CiAg ICAgaWYgKHNlZ21lbnQudGV4dC5pczhCaXQoKSkK