182315 2018-01-30 16:34:20 -0800 [RenderTreeBuilder] Move RenderMultiColumnFlow::resolveMovedChild to RenderTreeBuilder. 2018-01-31 08:45:36 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1394824 0 zalan 2018-01-30 16:34:20 -0800 We only call it from there. 1394825 1 webkit-bug-importer 2018-01-30 16:35:08 -0800 <rdar://problem/37048160> 1394830 2 332722 zalan 2018-01-30 16:40:22 -0800 Created attachment 332722 Patch 1395001 3 332722 commit-queue 2018-01-31 08:45:34 -0800 Comment on attachment 332722 Patch Clearing flags on attachment: 332722 Committed r227903: <https://trac.webkit.org/changeset/227903> 1395002 4 commit-queue 2018-01-31 08:45:36 -0800 All reviewed patches have been landed. Closing bug. 332722 2018-01-30 16:40:22 -0800 2018-01-31 08:45:34 -0800 Patch bug-182315-20180130164021.patch text/plain 11853 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3ODU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzM3MTE3MjAyZmMyOTgw MzRiYzRmNjhjNGIwMDEyNzFmY2NlMmQ4My4uYWYxMmI5ZTJiYWVhNzc3NjQyZTI0ZGFiMjNkNDQx NDYwNmFjYmU0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE4LTAxLTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlck11bHRpQ29sdW1uRmxvdzo6cmVzb2x2ZU1vdmVkQ2hpbGQgdG8gUmVuZGVy VHJlZUJ1aWxkZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xODIzMTUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM3MDQ4MTYwPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHJlc29sdmVNb3ZlZENoaWxk KCkgaXMgb25seSBjYWxsZWQgZnJvbSBSZW5kZXJUcmVlQnVpbGRlci4KKworICAgICAgICBObyBj aGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGcmFn bWVudGVkRmxvdy5oOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5GbG93OjpyZXNvbHZlTW92 ZWRDaGlsZCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck11bHRp Q29sdW1uRmxvdy5oOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6cmVzb2x2ZU1v dmVkQ2hpbGRGb3JNdWx0aUNvbHVtbkZsb3cpOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlQnVpbGRlci5oOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlckJsb2NrRmxvdy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVl QnVpbGRlcjo6QmxvY2tGbG93OjppbnNlcnRDaGlsZCk6CisgICAgICAgICogcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVySW5saW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRyZWVCdWlsZGVyOjpJbmxpbmU6Omluc2VydENoaWxkKToKKyAgICAgICAgKiByZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6TXVsdGlDb2x1bW46OnJlc29sdmVNb3ZlZENoaWxk KToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNv bHVtbi5oOgorCiAyMDE4LTAxLTMwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVyXSBNb3ZlIFJlbmRlclJ1YnlSdW46OnJ1YnlCYXNl U2FmZSB0byBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZyYWdtZW50ZWRGbG93LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRnJhZ21lbnRlZEZsb3cuaAppbmRleCBkNjk5NDIzODhjNjMyYTM4YTljMmM0 Zjc0YjkwYzUxYTgxZDk3Yzk3Li5jZGQ0M2NjZTFhZWQyYzAxMGFkNGRmYTg2YmIzZjk0ZmZlMWRl YTgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhZ21lbnRl ZEZsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhZ21lbnRlZEZs b3cuaApAQCAtODYsMTAgKzg2LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBib29sIHNpbmds ZUZyYWdtZW50SGFzVW5pZm9ybUxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9 CiAgICAgCi0gICAgLy8gU29tZSByZW5kZXJlcnMgKGNvbHVtbiBzcGFubmVycykgYXJlIG1vdmVk IG91dCBvZiB0aGUgZmxvdyB0aHJlYWQgdG8gbGl2ZSBhbW9uZyBjb2x1bW4KLSAgICAvLyBzZXRz LiBJZiB8Y2hpbGR8IGlzIHN1Y2ggYSByZW5kZXJlciwgcmVzb2x2ZSBpdCB0byB0aGUgcGxhY2Vo b2xkZXIgdGhhdCBsaXZlcyBhdCB0aGUgb3JpZ2luYWwKLSAgICAvLyBsb2NhdGlvbiBpbiB0aGUg dHJlZS4KLSAgICB2aXJ0dWFsIFJlbmRlck9iamVjdCogcmVzb2x2ZU1vdmVkQ2hpbGQoUmVuZGVy T2JqZWN0KiBjaGlsZCkgY29uc3QgeyByZXR1cm4gY2hpbGQ7IH0KICAgICAvLyBDYWxsZWQgd2hl biBhIGRlc2NlbmRhbnQgb2YgdGhlIGZsb3cgdGhyZWFkIGhhcyBiZWVuIGluc2VydGVkLgogICAg IHZpcnR1YWwgdm9pZCBmcmFnbWVudGVkRmxvd0Rlc2NlbmRhbnRJbnNlcnRlZChSZW5kZXJPYmpl Y3QmKSB7IH0KICAgICAvLyBDYWxsZWQgd2hlbiBhIHNpYmxpbmcgb3IgZGVzY2VuZGFudCBvZiB0 aGUgZmxvdyB0aHJlYWQgaXMgYWJvdXQgdG8gYmUgcmVtb3ZlZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAKaW5kZXggZmQ2ZTdhNDgx Mjg4NGQ0NTIzMWI4OWFhMDcwYmU3OGQ1OWNlMDZhOS4uZDY3Y2Y1N2JkM2E0MGRkNTJiZmVkNDk4 YjE4Yzk0ZGMyZDEzZDdmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uRmxvdy5jcHAKQEAgLTE2NywzMSArMTY3LDYgQEAgdm9pZCBSZW5kZXJN dWx0aUNvbHVtbkZsb3c6OndpbGxCZVJlbW92ZWRGcm9tVHJlZSgpCiAgICAgUmVuZGVyRnJhZ21l bnRlZEZsb3c6OndpbGxCZVJlbW92ZWRGcm9tVHJlZSgpOwogfQogCi1SZW5kZXJPYmplY3QqIFJl bmRlck11bHRpQ29sdW1uRmxvdzo6cmVzb2x2ZU1vdmVkQ2hpbGQoUmVuZGVyT2JqZWN0KiBjaGls ZCkgY29uc3QKLXsKLSAgICBpZiAoIWNoaWxkKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQot ICAgIGlmIChjaGlsZC0+c3R5bGUoKS5jb2x1bW5TcGFuKCkgIT0gQ29sdW1uU3BhbkFsbCB8fCAh aXM8UmVuZGVyQm94PigqY2hpbGQpKSB7Ci0gICAgICAgIC8vIFdlIG9ubHkgbmVlZCB0byByZXNv bHZlIGZvciBjb2x1bW4gc3Bhbm5lcnMuCi0gICAgICAgIHJldHVybiBjaGlsZDsKLSAgICB9Ci0g ICAgLy8gVGhlIHJlbmRlcmVyIGZvciB0aGUgYWN0dWFsIERPTSBub2RlIHRoYXQgZXN0YWJsaXNo ZXMgYSBzcGFubmVyIGlzIG1vdmVkIGZyb20gaXRzIG9yaWdpbmFsCi0gICAgLy8gbG9jYXRpb24g aW4gdGhlIHJlbmRlciB0cmVlIHRvIGJlY29taW5nIGEgc2libGluZyBvZiB0aGUgY29sdW1uIHNl dHMuIEluIG90aGVyIHdvcmRzLCBpdCdzCi0gICAgLy8gbW92ZWQgb3V0IGZyb20gdGhlIGZsb3cg dGhyZWFkIChhbmQgYmVjb21lcyBhIHNpYmxpbmcgb2YgaXQpLiBXaGVuIHdlIGZvciBpbnN0YW5j ZSB3YW50IHRvCi0gICAgLy8gY3JlYXRlIGFuZCBpbnNlcnQgYSByZW5kZXJlciBmb3IgdGhlIHNp Ymxpbmcgbm9kZSBpbW1lZGlhdGVseSBwcmVjZWRpbmcgdGhlIHNwYW5uZXIsIHdlIG5lZWQKLSAg ICAvLyB0byBtYXAgdGhhdCBzcGFubmVyIHJlbmRlcmVyIHRvIHRoZSBzcGFubmVyJ3MgcGxhY2Vo b2xkZXIsIHdoaWNoIGlzIHdoZXJlIHRoZSBuZXcgaW5zZXJ0ZWQKLSAgICAvLyByZW5kZXJlciBi ZWxvbmdzLgotICAgIGlmIChSZW5kZXJNdWx0aUNvbHVtblNwYW5uZXJQbGFjZWhvbGRlciogcGxh Y2Vob2xkZXIgPSBmaW5kQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKGRvd25jYXN0PFJlbmRlckJv eD4oY2hpbGQpKSkKLSAgICAgICAgcmV0dXJuIHBsYWNlaG9sZGVyOwotCi0gICAgLy8gVGhpcyBp cyBhbiBpbnZhbGlkIHNwYW5uZXIsIG9yIGl0cyBwbGFjZWhvbGRlciBoYXNuJ3QgYmVlbiBjcmVh dGVkIHlldC4gVGhpcyBoYXBwZW5zIHdoZW4KLSAgICAvLyBtb3ZpbmcgYW4gZW50aXJlIHN1YnRy ZWUgaW50byB0aGUgZmxvdyB0aHJlYWQsIHdoZW4gd2UgYXJlIHByb2Nlc3NpbmcgdGhlIGluc2Vy dGlvbiBvZiB0aGlzCi0gICAgLy8gc3Bhbm5lcidzIHByZWNlZGluZyBzaWJsaW5nLCBhbmQgd2Ug b2J2aW91c2x5IGhhdmVuJ3QgZ290IGFzIGZhciBhcyBwcm9jZXNzaW5nIHRoaXMgc3Bhbm5lcgot ICAgIC8vIHlldC4KLSAgICByZXR1cm4gY2hpbGQ7Ci19Ci0KIGJvb2wgUmVuZGVyTXVsdGlDb2x1 bW5GbG93Ojppc0NvbHVtblNwYW5uaW5nRGVzY2VuZGFudChjb25zdCBSZW5kZXJCb3gmIGRlc2Nl bmRhbnRCb3gpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGRlc2NlbmRhbnRCb3guc3R5bGUoKS5jb2x1 bW5TcGFuKCkgPT0gQ29sdW1uU3BhbkFsbDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuaAppbmRleCA3YjRiMTA0NDQwOTQwMjBmNTk2YmQ3OTQx ZDMzYzcxZTM4MDU5MTVhLi5iZDZiZjUwYTBmNWY4ZmRmNjQ0ZWE4NTZkYTNmYWEzZDcwMjc4Yjgw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5G bG93LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uRmxv dy5oCkBAIC0xMDgsNyArMTA4LDYgQEAgcHJpdmF0ZToKICAgICBjb25zdCBjaGFyKiByZW5kZXJO YW1lKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBhZGRGcmFnbWVudFRvVGhyZWFkKFJlbmRl ckZyYWdtZW50Q29udGFpbmVyKikgb3ZlcnJpZGU7CiAgICAgdm9pZCB3aWxsQmVSZW1vdmVkRnJv bVRyZWUoKSBvdmVycmlkZTsKLSAgICBSZW5kZXJPYmplY3QqIHJlc29sdmVNb3ZlZENoaWxkKFJl bmRlck9iamVjdCogY2hpbGQpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgZnJhZ21lbnRlZEZs b3dEZXNjZW5kYW50SW5zZXJ0ZWQoUmVuZGVyT2JqZWN0Jikgb3ZlcnJpZGU7CiAgICAgdm9pZCBm cmFnbWVudGVkRmxvd1JlbGF0aXZlV2lsbEJlUmVtb3ZlZChSZW5kZXJPYmplY3QmKSBvdmVycmlk ZTsKICAgICB2b2lkIGZyYWdtZW50ZWRGbG93RGVzY2VuZGFudEJveExhaWRPdXQoUmVuZGVyQm94 Kikgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCA5N2Y1MDExNjY1Yzk3NDY2MTA5MzM5ZTM0 MzViNDVkOWI3ODc1ODZmLi44OWQ2MDRjZDYxODNkM2FlYzE0MTRiZDUwYzQzNDg1YjkxMGVmNWQx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlci5jcHAKQEAgLTM4OCw0ICszODgsOSBAQCB2b2lkIFJlbmRlclRyZWVCdWls ZGVyOjp1cGRhdGVBZnRlckRlc2NlbmRhbnRzKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyKQogICAg ICAgICBtdWx0aUNvbHVtbkJ1aWxkZXIoKS51cGRhdGVBZnRlckRlc2NlbmRhbnRzKGRvd25jYXN0 PFJlbmRlckJsb2NrRmxvdz4ocmVuZGVyZXIpKTsKIH0KIAorUmVuZGVyT2JqZWN0KiBSZW5kZXJU cmVlQnVpbGRlcjo6cmVzb2x2ZU1vdmVkQ2hpbGRGb3JNdWx0aUNvbHVtbkZsb3coUmVuZGVyRnJh Z21lbnRlZEZsb3cmIGVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93LCBSZW5kZXJPYmplY3QqIGJlZm9y ZUNoaWxkKQoreworICAgIHJldHVybiBtdWx0aUNvbHVtbkJ1aWxkZXIoKS5yZXNvbHZlTW92ZWRD aGlsZChlbmNsb3NpbmdGcmFnbWVudGVkRmxvdywgYmVmb3JlQ2hpbGQpOworfQorCiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRl ci5oCmluZGV4IGIwMzY2MjcwNDc2YWZjOWM2Mjc0YWJkZDE5ODFlY2M4ZDQwNGRiNGYuLjRjMjc1 OGRiNzQzNWQ0OTZjYTJmYWVlYTUzZGNlODY4M2Y1YTE5YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5oCkBAIC03Niw2 ICs3Niw3IEBAIHB1YmxpYzoKICAgICBSZW5kZXJPYmplY3QqIHNwbGl0QW5vbnltb3VzQm94ZXNB cm91bmRDaGlsZChSZW5kZXJCb3gmIHBhcmVudCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCk7 CiAgICAgdm9pZCBtb3ZlUnVieUNoaWxkcmVuKFJlbmRlclJ1YnlCYXNlJiBmcm9tLCBSZW5kZXJS dWJ5QmFzZSYgdG8pOwogICAgIHZvaWQgY2hpbGRGbG93U3RhdGVDaGFuZ2VzQW5kQWZmZWN0c1Bh cmVudEJsb2NrKFJlbmRlckVsZW1lbnQmIGNoaWxkKTsKKyAgICBSZW5kZXJPYmplY3QqIHJlc29s dmVNb3ZlZENoaWxkRm9yTXVsdGlDb2x1bW5GbG93KFJlbmRlckZyYWdtZW50ZWRGbG93JiBlbmNs b3NpbmdGcmFnbWVudGVkRmxvdywgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCk7CiAKIHByaXZh dGU6CiAgICAgY2xhc3MgRmlyc3RMZXR0ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9ja0Zsb3cuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2tGbG93LmNw cAppbmRleCA0NTAyYzBmZWVkZTQ3ZDBjYWQ0ZjQ5ZTQ4ZGYyNzk1ZGY2ZTYyNjQ2Li41MmU3YWRj NDkzMzk1ODExYzMwZTRhY2I1MDdjZGQ0NTYzOGQyMDk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9ja0Zsb3cuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJs b2NrRmxvdy5jcHAKQEAgLTQxLDcgKzQxLDcgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6Qmxv Y2tGbG93OjppbnNlcnRDaGlsZChSZW5kZXJCbG9ja0Zsb3cmIHBhcmVudCwgUmVuZGVyUHQKICAg ICAgICAgcmV0dXJuIG1fYnVpbGRlci5pbnNlcnRDaGlsZCgqcGFyZW50Lm11bHRpQ29sdW1uRmxv dygpLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogICAgIGF1dG8qIGJlZm9yZUNoaWxk T3JQbGFjZWhvbGRlciA9IGJlZm9yZUNoaWxkOwogICAgIGlmIChhdXRvKiBjb250YWluaW5nRnJh Z21lbnRlZEZsb3cgPSBwYXJlbnQuZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3coKSkKLSAgICAgICAg YmVmb3JlQ2hpbGRPclBsYWNlaG9sZGVyID0gY29udGFpbmluZ0ZyYWdtZW50ZWRGbG93LT5yZXNv bHZlTW92ZWRDaGlsZChiZWZvcmVDaGlsZCk7CisgICAgICAgIGJlZm9yZUNoaWxkT3JQbGFjZWhv bGRlciA9IG1fYnVpbGRlci5yZXNvbHZlTW92ZWRDaGlsZEZvck11bHRpQ29sdW1uRmxvdygqY29u dGFpbmluZ0ZyYWdtZW50ZWRGbG93LCBiZWZvcmVDaGlsZCk7CiAgICAgbV9idWlsZGVyLmluc2Vy dENoaWxkVG9SZW5kZXJCbG9jayhwYXJlbnQsIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZE9y UGxhY2Vob2xkZXIpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVySW5saW5lLmNwcAppbmRleCA0MTJkNjQ5 MWM2MzhjMTljMDJhZmY5NmJmNjE0OTdhMTc4NGE4Nzc2Li5hMzAxNmQ0MGI5Mzk5ODc4MTgxOTA4 Yzk3NTkyMmRiOGViZTQzOWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJJbmxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlcklubGluZS5jcHAKQEAgLTEwNiw3 ICsxMDYsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpJbmxpbmU6Omluc2VydENoaWxkKFJl bmRlcklubGluZSYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZAogewogICAgIGF1dG8qIGJlZm9yZUNo aWxkT3JQbGFjZWhvbGRlciA9IGJlZm9yZUNoaWxkOwogICAgIGlmIChhdXRvKiBmcmFnbWVudGVk RmxvdyA9IHBhcmVudC5lbmNsb3NpbmdGcmFnbWVudGVkRmxvdygpKQotICAgICAgICBiZWZvcmVD aGlsZE9yUGxhY2Vob2xkZXIgPSBmcmFnbWVudGVkRmxvdy0+cmVzb2x2ZU1vdmVkQ2hpbGQoYmVm b3JlQ2hpbGQpOworICAgICAgICBiZWZvcmVDaGlsZE9yUGxhY2Vob2xkZXIgPSBtX2J1aWxkZXIu cmVzb2x2ZU1vdmVkQ2hpbGRGb3JNdWx0aUNvbHVtbkZsb3coKmZyYWdtZW50ZWRGbG93LCBiZWZv cmVDaGlsZCk7CiAgICAgaWYgKHBhcmVudC5jb250aW51YXRpb24oKSkgewogICAgICAgICBpbnNl cnRDaGlsZFRvQ29udGludWF0aW9uKHBhcmVudCwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxk T3JQbGFjZWhvbGRlcik7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlck11bHRpQ29sdW1uLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlck11bHRp Q29sdW1uLmNwcAppbmRleCAxZTRmYzgxOWUyOTkyYjAwNzkwN2QxNTQ1Mzc4NmFmMWJlZGY1YzNm Li41MmMyNDE0OWQwY2RhNTc5NTcwZWJmYmI4ZTAyZWY5YmRkYzAzZmYzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNv bHVtbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRy ZWVCdWlsZGVyTXVsdGlDb2x1bW4uY3BwCkBAIC0xMzksNCArMTM5LDM2IEBAIHZvaWQgUmVuZGVy VHJlZUJ1aWxkZXI6Ok11bHRpQ29sdW1uOjpkZXN0cm95RnJhZ21lbnRlZEZsb3coUmVuZGVyQmxv Y2tGbG93JiBmbG93CiAgICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZCgqcGFyZW50QW5kU3Bh bm5lci5maXJzdCwgV1RGTW92ZShwYXJlbnRBbmRTcGFubmVyLnNlY29uZCkpOwogfQogCisKK1Jl bmRlck9iamVjdCogUmVuZGVyVHJlZUJ1aWxkZXI6Ok11bHRpQ29sdW1uOjpyZXNvbHZlTW92ZWRD aGlsZChSZW5kZXJGcmFnbWVudGVkRmxvdyYgZW5jbG9zaW5nRnJhZ21lbnRlZEZsb3csIFJlbmRl ck9iamVjdCogYmVmb3JlQ2hpbGQpCit7CisgICAgaWYgKCFiZWZvcmVDaGlsZCkKKyAgICAgICAg cmV0dXJuIG51bGxwdHI7CisKKyAgICBpZiAoIWlzPFJlbmRlckJveD4oKmJlZm9yZUNoaWxkKSkK KyAgICAgICAgcmV0dXJuIGJlZm9yZUNoaWxkOworCisgICAgaWYgKCFpczxSZW5kZXJNdWx0aUNv bHVtbkZsb3c+KGVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93KSkKKyAgICAgICAgcmV0dXJuIGJlZm9y ZUNoaWxkOworCisgICAgLy8gV2Ugb25seSBuZWVkIHRvIHJlc29sdmUgZm9yIGNvbHVtbiBzcGFu bmVycy4KKyAgICBpZiAoYmVmb3JlQ2hpbGQtPnN0eWxlKCkuY29sdW1uU3BhbigpICE9IENvbHVt blNwYW5BbGwpCisgICAgICAgIHJldHVybiBiZWZvcmVDaGlsZDsKKworICAgIC8vIFRoZSByZW5k ZXJlciBmb3IgdGhlIGFjdHVhbCBET00gbm9kZSB0aGF0IGVzdGFibGlzaGVzIGEgc3Bhbm5lciBp cyBtb3ZlZCBmcm9tIGl0cyBvcmlnaW5hbAorICAgIC8vIGxvY2F0aW9uIGluIHRoZSByZW5kZXIg dHJlZSB0byBiZWNvbWluZyBhIHNpYmxpbmcgb2YgdGhlIGNvbHVtbiBzZXRzLiBJbiBvdGhlciB3 b3JkcywgaXQncworICAgIC8vIG1vdmVkIG91dCBmcm9tIHRoZSBmbG93IHRocmVhZCAoYW5kIGJl Y29tZXMgYSBzaWJsaW5nIG9mIGl0KS4gV2hlbiB3ZSBmb3IgaW5zdGFuY2Ugd2FudCB0bworICAg IC8vIGNyZWF0ZSBhbmQgaW5zZXJ0IGEgcmVuZGVyZXIgZm9yIHRoZSBzaWJsaW5nIG5vZGUgaW1t ZWRpYXRlbHkgcHJlY2VkaW5nIHRoZSBzcGFubmVyLCB3ZSBuZWVkCisgICAgLy8gdG8gbWFwIHRo YXQgc3Bhbm5lciByZW5kZXJlciB0byB0aGUgc3Bhbm5lcidzIHBsYWNlaG9sZGVyLCB3aGljaCBp cyB3aGVyZSB0aGUgbmV3IGluc2VydGVkCisgICAgLy8gcmVuZGVyZXIgYmVsb25ncy4KKyAgICBp ZiAoYXV0byogcGxhY2Vob2xkZXIgPSBkb3duY2FzdDxSZW5kZXJNdWx0aUNvbHVtbkZsb3c+KGVu Y2xvc2luZ0ZyYWdtZW50ZWRGbG93KS5maW5kQ29sdW1uU3Bhbm5lclBsYWNlaG9sZGVyKGRvd25j YXN0PFJlbmRlckJveD4oYmVmb3JlQ2hpbGQpKSkKKyAgICAgICAgcmV0dXJuIHBsYWNlaG9sZGVy OworCisgICAgLy8gVGhpcyBpcyBhbiBpbnZhbGlkIHNwYW5uZXIsIG9yIGl0cyBwbGFjZWhvbGRl ciBoYXNuJ3QgYmVlbiBjcmVhdGVkIHlldC4gVGhpcyBoYXBwZW5zIHdoZW4KKyAgICAvLyBtb3Zp bmcgYW4gZW50aXJlIHN1YnRyZWUgaW50byB0aGUgZmxvdyB0aHJlYWQsIHdoZW4gd2UgYXJlIHBy b2Nlc3NpbmcgdGhlIGluc2VydGlvbiBvZiB0aGlzCisgICAgLy8gc3Bhbm5lcidzIHByZWNlZGlu ZyBzaWJsaW5nLCBhbmQgd2Ugb2J2aW91c2x5IGhhdmVuJ3QgZ290IGFzIGZhciBhcyBwcm9jZXNz aW5nIHRoaXMgc3Bhbm5lcgorICAgIC8vIHlldC4KKyAgICByZXR1cm4gYmVmb3JlQ2hpbGQ7Cit9 CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlck11bHRpQ29sdW1uLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBk YXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5oCmluZGV4IGMwMGY5OGIxNDdkMzA4 MWEyMTIzOGU0MTVmNzUwOTlmN2Q4NjBiNjUuLjZkZDQ1MDgzNWIxYzIxY2QyNWQ4YmI1ODdkOGM2 OTNmZTkyMTQxZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGlu Zy9SZW5kZXJUcmVlQnVpbGRlck11bHRpQ29sdW1uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVsdGlDb2x1bW4uaApAQCAtMzYsNiAr MzYsMTAgQEAgcHVibGljOgogICAgIE11bHRpQ29sdW1uKFJlbmRlclRyZWVCdWlsZGVyJik7CiAK ICAgICB2b2lkIHVwZGF0ZUFmdGVyRGVzY2VuZGFudHMoUmVuZGVyQmxvY2tGbG93Jik7CisgICAg Ly8gU29tZSByZW5kZXJlcnMgKGNvbHVtbiBzcGFubmVycykgYXJlIG1vdmVkIG91dCBvZiB0aGUg ZmxvdyB0aHJlYWQgdG8gbGl2ZSBhbW9uZyBjb2x1bW4KKyAgICAvLyBzZXRzLiBJZiB8Y2hpbGR8 IGlzIHN1Y2ggYSByZW5kZXJlciwgcmVzb2x2ZSBpdCB0byB0aGUgcGxhY2Vob2xkZXIgdGhhdCBs aXZlcyBhdCB0aGUgb3JpZ2luYWwKKyAgICAvLyBsb2NhdGlvbiBpbiB0aGUgdHJlZS4KKyAgICBS ZW5kZXJPYmplY3QqIHJlc29sdmVNb3ZlZENoaWxkKFJlbmRlckZyYWdtZW50ZWRGbG93JiBlbmNs b3NpbmdGcmFnbWVudGVkRmxvdywgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCk7CiAKIHByaXZh dGU6CiAgICAgdm9pZCBjcmVhdGVGcmFnbWVudGVkRmxvdyhSZW5kZXJCbG9ja0Zsb3cmKTsK