179179 2017-11-02 09:49:58 -0700 display:contents should work with dynamic table mutations 2017-11-13 15:39:35 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 157477 1 koivisto webkit-unassigned bfulgham commit-queue emilio rniwa simon.fraser webkit-bug-importer zalan oldest_to_newest 1367370 0 koivisto 2017-11-02 09:49:58 -0700 Fix some table related WPTs. 1367388 1 325726 koivisto 2017-11-02 10:05:41 -0700 Created attachment 325726 patch 1367535 2 325726 rniwa 2017-11-02 13:58:09 -0700 Comment on attachment 325726 patch View in context: https://bugs.webkit.org/attachment.cgi?id=325726&action=review > Source/WebCore/style/RenderTreeUpdater.cpp:218 > -RenderTreePosition& RenderTreeUpdater::renderTreePosition() > +auto RenderTreeUpdater::renderingParent() -> Parent& I'd prefer using Parent& RenderTreeUpdater::renderingParent() instead since -> syntax doesn't seem to buy us much. 1367554 3 koivisto 2017-11-02 14:31:22 -0700 > I'd prefer using Parent& RenderTreeUpdater::renderingParent() instead since > -> syntax doesn't seem to buy us much. I have been using it in cases where it removes redundancy. This would otherwise need to be written as RenderTreeUpdater::Parent& RenderTreeUpdater::renderingParent() 1367563 4 rniwa 2017-11-02 14:48:09 -0700 (In reply to Antti Koivisto from comment #3) > > I'd prefer using Parent& RenderTreeUpdater::renderingParent() instead since > > -> syntax doesn't seem to buy us much. > > I have been using it in cases where it removes redundancy. This would > otherwise need to be written as > > RenderTreeUpdater::Parent& RenderTreeUpdater::renderingParent() I see. I guess it's fine but I really hate now that I have to look at left & right to see what the return type of a given function is :( We should really use one or the other throughout. 1367587 5 325726 commit-queue 2017-11-02 15:38:38 -0700 Comment on attachment 325726 patch Clearing flags on attachment: 325726 Committed r224360: <https://trac.webkit.org/changeset/224360> 1367588 6 commit-queue 2017-11-02 15:38:40 -0700 All reviewed patches have been landed. Closing bug. 1371133 7 webkit-bug-importer 2017-11-13 15:39:35 -0800 <rdar://problem/35517797> 325726 2017-11-02 10:05:41 -0700 2017-11-02 15:38:38 -0700 patch display-contents-dynamic-table.patch text/plain 14682 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNDMzNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUwIEBACisyMDE3LTExLTAyICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBkaXNwbGF5OmNvbnRlbnRzIHNo b3VsZCB3b3JrIHdpdGggZHluYW1pYyB0YWJsZSBtdXRhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTE3OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjphZGRDaGlsZElnbm9yaW5nQ29udGlu dWF0aW9uKToKKworICAgICAgICAgICAgUmVuZGVyVGV4dCB3aXRoIGlubGluZSB0ZXh0IHdyYXBw ZXIgYXMgYmVmb3JlQ2hpbGQgaXMgbm93IHJlc29sdmVkIGluIFJlbmRlclRyZWVQb3NpdGlvbiwg Y292ZXJpbmcgYWxsIGNhc2VzLgorICAgICAgICAgICAgVmVyaWZ5IHRoaXMgd2l0aCBhc3NlcnQu CisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJFbGVtZW50OjppbnNlcnRDaGlsZEludGVybmFsKToKKworICAgICAgICAgICAg QWRkIGFzc2VydGlvbi4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGFibGVTZWN0aW9uOjphZGRDaGlsZCk6CisK KyAgICAgICAgICAgIEZpeCBjYXNlcyB3aGVyZSB3ZSBkaWQgdW5jaGVja2VkIGRvd25jYXN0cyBm b3IgYW5vbnltb3VzIGJlZm9yZUNoaWxkLgorCisgICAgICAgICogc3R5bGUvUmVuZGVyVHJlZVBv c2l0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVQb3NpdGlvbjo6aW5zZXJ0 KToKKworICAgICAgICAgICAgV2hlbiBpbnNlcnRpbmcgYmVmb3JlIGEgdGV4dCByZW5kZWRlciB3 aXRoIGFuIGRpc3BsYXk6Y29udGVudHMgaW5saW5lIHdyYXBwZXIsIHVzZSB0aGUgd3JhcHBlciBh cyBiZWZvcmVDaGlsZC4KKworICAgICAgICAqIHN0eWxlL1JlbmRlclRyZWVQb3NpdGlvbi5oOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZVBvc2l0aW9uOjppbnNlcnQpOiBEZWxldGVkLgor ICAgICAgICAqIHN0eWxlL1JlbmRlclRyZWVVcGRhdGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRyZWVVcGRhdGVyOjp1cGRhdGVSZW5kZXJUcmVlKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRyZWVVcGRhdGVyOjpyZW5kZXJpbmdQYXJlbnQpOgorCisgICAgICAgICAgICBBZGQg c2VwYXJhdGUgaGVscGVyIHRvIGdldCBwYXJlbnQgZnJhbWUgZm9yIHRoZSBjbG9zZXN0IHJlbmRl cmVkIChub24gZGlzcGxheTpjb250ZW50cykgYW5jZXN0b3IuCisKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRyZWVVcGRhdGVyOjpyZW5kZXJUcmVlUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVHJlZVVwZGF0ZXI6OnVwZGF0ZUVsZW1lbnRSZW5kZXJlcik6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUcmVlVXBkYXRlcjo6dGV4dFJlbmRlcmVySXNOZWVkZWQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVHJlZVVwZGF0ZXI6OnVwZGF0ZVRleHRSZW5kZXJlcik6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlVXBkYXRlcjo6c3RvcmVQcmV2aW91c1JlbmRlcmVyKToK KworICAgICAgICAgICAgVXNlIGl0IGZvciB0cmFja2luZyBzdGF0ZSByZWxhdGVkIHRvIHJlbmRl ciB0cmVlIHNpYmxpbmdzLiBXaXRoIHRoaXMgd2UgY29tcHV0ZSB3aGl0ZXNwYWNlIG5vZGVzCisg ICAgICAgICAgICBjb3JyZWN0bHkgZm9yIGRpc3BsYXk6Y29udGVudHMuIFRoZSB0ZXN0IGNhc2Vz IGVuZCB1cCBkZXBlbmRpbmcgb24gdGhhdC4KKworICAgICAgICAqIHN0eWxlL1JlbmRlclRyZWVV cGRhdGVyLmg6CisKIDIwMTctMTEtMDIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29t PgogCiAgICAgICAgIFJlbW92ZSBlbXB0eSBjb250aW51YXRpb25zIGluIFJlbmRlck9iamVjdDo6 cmVtb3ZlRnJvbVBhcmVudEFuZERlc3Ryb3lDbGVhbmluZ1VwQW5vbnltb3VzV3JhcHBlcnMKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gMjI0 MzI3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTUwLDExICs1NTAsOCBAQCB2b2lkIFJlbmRlckJsb2NrOjphZGRDaGlsZEln bm9yaW5nQ29udGluCiAgICAgICAgIEFTU0VSVChiZWZvcmVDaGlsZENvbnRhaW5lcik7CiAKICAg ICAgICAgaWYgKGJlZm9yZUNoaWxkQ29udGFpbmVyLT5pc0Fub255bW91cygpKSB7Ci0gICAgICAg ICAgICBpZiAoYmVmb3JlQ2hpbGRDb250YWluZXItPmlzSW5saW5lKCkpIHsKLSAgICAgICAgICAg ICAgICBBU1NFUlQoUmVuZGVyVGV4dDo6ZmluZEJ5RGlzcGxheUNvbnRlbnRzSW5saW5lV3JhcHBl ckNhbmRpZGF0ZSgqYmVmb3JlQ2hpbGRDb250YWluZXIpID09IGJlZm9yZUNoaWxkKTsKLSAgICAg ICAgICAgICAgICBhZGRDaGlsZChXVEZNb3ZlKG5ld0NoaWxkKSwgYmVmb3JlQ2hpbGRDb250YWlu ZXIpOwotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAg IFJFTEVBU0VfQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIWJlZm9yZUNoaWxkQ29u dGFpbmVyLT5pc0lubGluZSgpKTsKKwogICAgICAgICAgICAgLy8gSWYgdGhlIHJlcXVlc3RlZCBi ZWZvcmVDaGlsZCBpcyBub3Qgb25lIG9mIG91ciBjaGlsZHJlbiwgdGhlbiB0aGlzIGlzIGJlY2F1 c2UKICAgICAgICAgICAgIC8vIHRoZXJlIGlzIGFuIGFub255bW91cyBjb250YWluZXIgd2l0aGlu IHRoaXMgb2JqZWN0IHRoYXQgY29udGFpbnMgdGhlIGJlZm9yZUNoaWxkLgogICAgICAgICAgICAg UmVuZGVyRWxlbWVudCogYmVmb3JlQ2hpbGRBbm9ueW1vdXNDb250YWluZXIgPSBiZWZvcmVDaGls ZENvbnRhaW5lcjsKQEAgLTU3NCw2ICs1NzEsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjphZGRDaGls ZElnbm9yaW5nQ29udGluCiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIEFTU0VSVChiZWZv cmVDaGlsZEFub255bW91c0NvbnRhaW5lci0+aXNUYWJsZSgpKTsKKwogICAgICAgICAgICAgaWYg KG5ld0NoaWxkLT5pc1RhYmxlUGFydCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gSW5zZXJ0IGlu dG8gdGhlIGFub255bW91cyB0YWJsZS4KICAgICAgICAgICAgICAgICBiZWZvcmVDaGlsZEFub255 bW91c0NvbnRhaW5lci0+YWRkQ2hpbGQoV1RGTW92ZShuZXdDaGlsZCksIGJlZm9yZUNoaWxkKTsK QEAgLTU4MiwxMiArNTgwLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6YWRkQ2hpbGRJZ25vcmluZ0Nv bnRpbgogCiAgICAgICAgICAgICBiZWZvcmVDaGlsZCA9IHNwbGl0QW5vbnltb3VzQm94ZXNBcm91 bmRDaGlsZChiZWZvcmVDaGlsZCk7CiAKLSAgICAgICAgICAgIEFTU0VSVChiZWZvcmVDaGlsZC0+ cGFyZW50KCkgPT0gdGhpcyk7Ci0gICAgICAgICAgICBpZiAoYmVmb3JlQ2hpbGQtPnBhcmVudCgp ICE9IHRoaXMpIHsKLSAgICAgICAgICAgICAgICAvLyBXZSBzaG91bGQgbmV2ZXIgcmVhY2ggaGVy ZS4gSWYgd2UgZG8sIHdlIG5lZWQgdG8gdXNlIHRoZQotICAgICAgICAgICAgICAgIC8vIHNhZmUg ZmFsbGJhY2sgdG8gdXNlIHRoZSB0b3Btb3N0IGJlZm9yZUNoaWxkIGNvbnRhaW5lci4KLSAgICAg ICAgICAgICAgICBiZWZvcmVDaGlsZCA9IGJlZm9yZUNoaWxkQ29udGFpbmVyOwotICAgICAgICAg ICAgfQorICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElP TihiZWZvcmVDaGlsZC0+cGFyZW50KCkgPT0gdGhpcyk7CiAgICAgICAgIH0KICAgICB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAJKHJldmlzaW9u IDIyNDMyNykKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNTM4LDYgKzUzOCw3IEBAIHZvaWQgUmVuZGVyRWxlbWVudDo6aW5z ZXJ0Q2hpbGRJbnRlcm5hbCgKICAgICAgICAgYmVmb3JlQ2hpbGQgPSBiZWZvcmVDaGlsZC0+cGFy ZW50KCk7CiAKICAgICBBU1NFUlQoIWJlZm9yZUNoaWxkIHx8IGJlZm9yZUNoaWxkLT5wYXJlbnQo KSA9PSB0aGlzKTsKKyAgICBBU1NFUlQoIWlzPFJlbmRlclRleHQ+KGJlZm9yZUNoaWxkKSB8fCAh ZG93bmNhc3Q8UmVuZGVyVGV4dD4oKmJlZm9yZUNoaWxkKS5pbmxpbmVXcmFwcGVyRm9yRGlzcGxh eUNvbnRlbnRzKCkpOwogCiAgICAgLy8gVGFrZSB0aGUgb3duZXJzaGlwLgogICAgIGF1dG8qIG5l d0NoaWxkID0gbmV3Q2hpbGRQdHIucmVsZWFzZSgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5jcHAJKHJldmlzaW9uIDIyNDMyNykKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMjIsNyArMTIyLDcgQEAgdm9pZCBSZW5kZXJUYWJsZVNlY3Rpb246OmFkZENo aWxkKFJlbmRlcgogICAgICAgICBSZW5kZXJPYmplY3QqIGxhc3QgPSBiZWZvcmVDaGlsZDsKICAg ICAgICAgaWYgKCFsYXN0KQogICAgICAgICAgICAgbGFzdCA9IGxhc3RSb3coKTsKLSAgICAgICAg aWYgKGxhc3QgJiYgbGFzdC0+aXNBbm9ueW1vdXMoKSAmJiAhbGFzdC0+aXNCZWZvcmVPckFmdGVy Q29udGVudCgpKSB7CisgICAgICAgIGlmIChpczxSZW5kZXJUYWJsZVJvdz4obGFzdCkgJiYgbGFz dC0+aXNBbm9ueW1vdXMoKSAmJiAhbGFzdC0+aXNCZWZvcmVPckFmdGVyQ29udGVudCgpKSB7CiAg ICAgICAgICAgICBSZW5kZXJUYWJsZVJvdyYgcm93ID0gZG93bmNhc3Q8UmVuZGVyVGFibGVSb3c+ KCpsYXN0KTsKICAgICAgICAgICAgIGlmIChiZWZvcmVDaGlsZCA9PSAmcm93KQogICAgICAgICAg ICAgICAgIGJlZm9yZUNoaWxkID0gcm93LmZpcnN0Q2VsbCgpOwpAQCAtMTQzLDcgKzE0Myw3IEBA IHZvaWQgUmVuZGVyVGFibGVTZWN0aW9uOjphZGRDaGlsZChSZW5kZXIKICAgICAgICAgUmVuZGVy T2JqZWN0KiBsYXN0Qm94ID0gbGFzdDsKICAgICAgICAgd2hpbGUgKGxhc3RCb3ggJiYgbGFzdEJv eC0+cGFyZW50KCktPmlzQW5vbnltb3VzKCkgJiYgIWlzPFJlbmRlclRhYmxlUm93PigqbGFzdEJv eCkpCiAgICAgICAgICAgICBsYXN0Qm94ID0gbGFzdEJveC0+cGFyZW50KCk7Ci0gICAgICAgIGlm IChsYXN0Qm94ICYmIGxhc3RCb3gtPmlzQW5vbnltb3VzKCkgJiYgIWxhc3RCb3gtPmlzQmVmb3Jl T3JBZnRlckNvbnRlbnQoKSkgeworICAgICAgICBpZiAoaXM8UmVuZGVyVGFibGVSb3c+KGxhc3RC b3gpICYmIGxhc3RCb3gtPmlzQW5vbnltb3VzKCkgJiYgIWxhc3RCb3gtPmlzQmVmb3JlT3JBZnRl ckNvbnRlbnQoKSkgewogICAgICAgICAgICAgZG93bmNhc3Q8UmVuZGVyVGFibGVSb3c+KCpsYXN0 Qm94KS5hZGRDaGlsZChXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVl UG9zaXRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRy ZWVQb3NpdGlvbi5jcHAJKHJldmlzaW9uIDIyNDMyNykKKysrIFNvdXJjZS9XZWJDb3JlL3N0eWxl L1JlbmRlclRyZWVQb3NpdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI4LDExICsyOCwyMyBA QAogCiAjaW5jbHVkZSAiQ29tcG9zZWRUcmVlSXRlcmF0b3IuaCIKICNpbmNsdWRlICJQc2V1ZG9F bGVtZW50LmgiCisjaW5jbHVkZSAiUmVuZGVySW5saW5lLmgiCiAjaW5jbHVkZSAiUmVuZGVyT2Jq ZWN0LmgiCiAjaW5jbHVkZSAiU2hhZG93Um9vdC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK K3ZvaWQgUmVuZGVyVHJlZVBvc2l0aW9uOjppbnNlcnQoUmVuZGVyUHRyPFJlbmRlck9iamVjdD4g cmVuZGVyZXIpCit7CisgICAgQVNTRVJUKG1faGFzVmFsaWROZXh0U2libGluZyk7CisgICAgYXV0 byogaW5zZXJ0QmVmb3JlID0gbV9uZXh0U2libGluZzsKKyAgICBpZiAoaXM8UmVuZGVyVGV4dD4o aW5zZXJ0QmVmb3JlKSkgeworICAgICAgICBpZiAoYXV0byogd3JhcHBlcklubGluZSA9IGRvd25j YXN0PFJlbmRlclRleHQ+KCppbnNlcnRCZWZvcmUpLmlubGluZVdyYXBwZXJGb3JEaXNwbGF5Q29u dGVudHMoKSkKKyAgICAgICAgICAgIGluc2VydEJlZm9yZSA9IHdyYXBwZXJJbmxpbmU7CisgICAg fQorICAgIG1fcGFyZW50LmFkZENoaWxkKFdURk1vdmUocmVuZGVyZXIpLCBpbnNlcnRCZWZvcmUp OworfQorCiB2b2lkIFJlbmRlclRyZWVQb3NpdGlvbjo6Y29tcHV0ZU5leHRTaWJsaW5nKGNvbnN0 IE5vZGUmIG5vZGUpCiB7CiAgICAgQVNTRVJUKCFub2RlLnJlbmRlcmVyKCkpOwpJbmRleDogU291 cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVBvc2l0aW9uLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVBvc2l0aW9uLmgJKHJldmlzaW9uIDIyNDMyNykK KysrIFNvdXJjZS9XZWJDb3JlL3N0eWxlL1JlbmRlclRyZWVQb3NpdGlvbi5oCSh3b3JraW5nIGNv cHkpCkBAIC03OCwxMCArNzgsNCBAQCBpbmxpbmUgYm9vbCBSZW5kZXJUcmVlUG9zaXRpb246OmNh bkluc2VyCiAgICAgcmV0dXJuIG1fcGFyZW50LmlzQ2hpbGRBbGxvd2VkKHJlbmRlcmVyLCBtX3Bh cmVudC5zdHlsZSgpKTsKIH0KIAotaW5saW5lIHZvaWQgUmVuZGVyVHJlZVBvc2l0aW9uOjppbnNl cnQoUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gcmVuZGVyZXIpCi17Ci0gICAgQVNTRVJUKG1faGFz VmFsaWROZXh0U2libGluZyk7Ci0gICAgbV9wYXJlbnQuYWRkQ2hpbGQoV1RGTW92ZShyZW5kZXJl ciksIG1fbmV4dFNpYmxpbmcpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIuY3BwCShyZXZpc2lvbiAyMjQz MjcpCisrKyBTb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTE3NSw3ICsxNzUsNyBAQCB2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjp1cGRh dGVSZW5kZXJUcmVlCiAgICAgICAgICAgICBhdXRvJiB0ZXh0ID0gZG93bmNhc3Q8VGV4dD4obm9k ZSk7CiAgICAgICAgICAgICBhdXRvKiB0ZXh0VXBkYXRlID0gbV9zdHlsZVVwZGF0ZS0+dGV4dFVw ZGF0ZSh0ZXh0KTsKICAgICAgICAgICAgIGJvb2wgZGlkQ3JlYXRlUGFyZW50ID0gcGFyZW50KCku dXBkYXRlcyAmJiBwYXJlbnQoKS51cGRhdGVzLT51cGRhdGUuY2hhbmdlID09IFN0eWxlOjpEZXRh Y2g7Ci0gICAgICAgICAgICBib29sIG1heU5lZWRVcGRhdGVXaGl0ZXNwYWNlT25seVJlbmRlcmVy ID0gcGFyZW50KCkuZGlkQ3JlYXRlT3JEZXN0cm95Q2hpbGRSZW5kZXJlciAmJiB0ZXh0LmNvbnRh aW5zT25seVdoaXRlc3BhY2UoKTsKKyAgICAgICAgICAgIGJvb2wgbWF5TmVlZFVwZGF0ZVdoaXRl c3BhY2VPbmx5UmVuZGVyZXIgPSByZW5kZXJpbmdQYXJlbnQoKS5kaWRDcmVhdGVPckRlc3Ryb3lD aGlsZFJlbmRlcmVyICYmIHRleHQuY29udGFpbnNPbmx5V2hpdGVzcGFjZSgpOwogICAgICAgICAg ICAgaWYgKGRpZENyZWF0ZVBhcmVudCB8fCB0ZXh0VXBkYXRlIHx8IG1heU5lZWRVcGRhdGVXaGl0 ZXNwYWNlT25seVJlbmRlcmVyKQogICAgICAgICAgICAgICAgIHVwZGF0ZVRleHRSZW5kZXJlcih0 ZXh0LCB0ZXh0VXBkYXRlKTsKIApAQCAtMjE1LDE0ICsyMTUsMTkgQEAgdm9pZCBSZW5kZXJUcmVl VXBkYXRlcjo6dXBkYXRlUmVuZGVyVHJlZQogICAgIHBvcFBhcmVudHNUb0RlcHRoKDApOwogfQog Ci1SZW5kZXJUcmVlUG9zaXRpb24mIFJlbmRlclRyZWVVcGRhdGVyOjpyZW5kZXJUcmVlUG9zaXRp b24oKQorYXV0byBSZW5kZXJUcmVlVXBkYXRlcjo6cmVuZGVyaW5nUGFyZW50KCkgLT4gUGFyZW50 JgogewotICAgIGZvciAodW5zaWduZWQgaSA9IG1fcGFyZW50U3RhY2suc2l6ZSgpOyBpOyAtLWkp IHsKLSAgICAgICAgaWYgKGF1dG8mIHBvc2l0aW9uID0gbV9wYXJlbnRTdGFja1tpIC0gMV0ucmVu ZGVyVHJlZVBvc2l0aW9uKQotICAgICAgICAgICAgcmV0dXJuICpwb3NpdGlvbjsKKyAgICBmb3Ig KHVuc2lnbmVkIGkgPSBtX3BhcmVudFN0YWNrLnNpemUoKTsgaS0tOykgeworICAgICAgICBpZiAo bV9wYXJlbnRTdGFja1tpXS5yZW5kZXJUcmVlUG9zaXRpb24pCisgICAgICAgICAgICByZXR1cm4g bV9wYXJlbnRTdGFja1tpXTsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg cmV0dXJuICptX3BhcmVudFN0YWNrLmxhc3QoKS5yZW5kZXJUcmVlUG9zaXRpb247CisgICAgcmV0 dXJuIG1fcGFyZW50U3RhY2subGFzdCgpOworfQorCitSZW5kZXJUcmVlUG9zaXRpb24mIFJlbmRl clRyZWVVcGRhdGVyOjpyZW5kZXJUcmVlUG9zaXRpb24oKQoreworICAgIHJldHVybiAqcmVuZGVy aW5nUGFyZW50KCkucmVuZGVyVHJlZVBvc2l0aW9uOwogfQogCiB2b2lkIFJlbmRlclRyZWVVcGRh dGVyOjpwdXNoUGFyZW50KEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFN0eWxlOjpFbGVtZW50VXBk YXRlcyogdXBkYXRlcykKQEAgLTMxNCw3ICszMTksNyBAQCB2b2lkIFJlbmRlclRyZWVVcGRhdGVy Ojp1cGRhdGVFbGVtZW50UmVuCiAgICAgICAgIGF1dG8gdGVhcmRvd25UeXBlID0gdXBkYXRlLnN0 eWxlLT5kaXNwbGF5KCkgPT0gTk9ORSA/IFRlYXJkb3duVHlwZTo6UmVuZGVyZXJVcGRhdGVDYW5j ZWxpbmdBbmltYXRpb25zIDogVGVhcmRvd25UeXBlOjpSZW5kZXJlclVwZGF0ZTsKICAgICAgICAg dGVhckRvd25SZW5kZXJlcnMoZWxlbWVudCwgdGVhcmRvd25UeXBlKTsKIAotICAgICAgICBwYXJl bnQoKS5kaWRDcmVhdGVPckRlc3Ryb3lDaGlsZFJlbmRlcmVyID0gdHJ1ZTsKKyAgICAgICAgcmVu ZGVyaW5nUGFyZW50KCkuZGlkQ3JlYXRlT3JEZXN0cm95Q2hpbGRSZW5kZXJlciA9IHRydWU7CiAg ICAgfQogCiAgICAgYm9vbCBoYXNEaXNwbGF5Q29udGVudHMgPSB1cGRhdGUuc3R5bGUtPmRpc3Bs YXkoKSA9PSBDT05URU5UUzsKQEAgLTMyOSw3ICszMzQsNyBAQCB2b2lkIFJlbmRlclRyZWVVcGRh dGVyOjp1cGRhdGVFbGVtZW50UmVuCiAgICAgICAgICAgICBlbGVtZW50LndpbGxBdHRhY2hSZW5k ZXJlcnMoKTsKICAgICAgICAgY3JlYXRlUmVuZGVyZXIoZWxlbWVudCwgUmVuZGVyU3R5bGU6OmNs b25lKCp1cGRhdGUuc3R5bGUpKTsKIAotICAgICAgICBwYXJlbnQoKS5kaWRDcmVhdGVPckRlc3Ry b3lDaGlsZFJlbmRlcmVyID0gdHJ1ZTsKKyAgICAgICAgcmVuZGVyaW5nUGFyZW50KCkuZGlkQ3Jl YXRlT3JEZXN0cm95Q2hpbGRSZW5kZXJlciA9IHRydWU7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKQEAgLTQxMCw3ICs0MTUsNyBAQCBib29sIFJlbmRlclRyZWVVcGRhdGVyOjp0ZXh0UmVuZGVy ZXJJc05lCiAgICAgaWYgKHBhcmVudFJlbmRlcmVyLnN0eWxlKCkucHJlc2VydmVOZXdsaW5lKCkp IC8vIHByZS9wcmUtd3JhcC9wcmUtbGluZSBhbHdheXMgbWFrZSByZW5kZXJlcnMuCiAgICAgICAg IHJldHVybiB0cnVlOwogCi0gICAgYXV0byogcHJldmlvdXNSZW5kZXJlciA9IHBhcmVudCgpLnBy ZXZpb3VzQ2hpbGRSZW5kZXJlcjsKKyAgICBhdXRvKiBwcmV2aW91c1JlbmRlcmVyID0gcmVuZGVy aW5nUGFyZW50KCkucHJldmlvdXNDaGlsZFJlbmRlcmVyOwogICAgIGlmIChwcmV2aW91c1JlbmRl cmVyICYmIHByZXZpb3VzUmVuZGVyZXItPmlzQlIoKSkgLy8gPHNwYW4+PGJyLz4gPGJyLz48L3Nw YW4+CiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtNDgzLDEzICs0ODgsMTMgQEAgdm9pZCBS ZW5kZXJUcmVlVXBkYXRlcjo6dXBkYXRlVGV4dFJlbmRlcgogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAgICAgICAgIHRlYXJEb3duUmVuZGVyZXIodGV4dCk7Ci0gICAgICAgIHBhcmVu dCgpLmRpZENyZWF0ZU9yRGVzdHJveUNoaWxkUmVuZGVyZXIgPSB0cnVlOworICAgICAgICByZW5k ZXJpbmdQYXJlbnQoKS5kaWRDcmVhdGVPckRlc3Ryb3lDaGlsZFJlbmRlcmVyID0gdHJ1ZTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoIW5lZWRzUmVuZGVyZXIpCiAgICAgICAgIHJl dHVybjsKICAgICBjcmVhdGVUZXh0UmVuZGVyZXIodGV4dCwgcmVuZGVyVHJlZVBvc2l0aW9uKCks IHRleHRVcGRhdGUpOwotICAgIHBhcmVudCgpLmRpZENyZWF0ZU9yRGVzdHJveUNoaWxkUmVuZGVy ZXIgPSB0cnVlOworICAgIHJlbmRlcmluZ1BhcmVudCgpLmRpZENyZWF0ZU9yRGVzdHJveUNoaWxk UmVuZGVyZXIgPSB0cnVlOwogfQogCiB2b2lkIFJlbmRlclRyZWVVcGRhdGVyOjpzdG9yZVByZXZp b3VzUmVuZGVyZXIoTm9kZSYgbm9kZSkKQEAgLTQ5Nyw4ICs1MDIsOCBAQCB2b2lkIFJlbmRlclRy ZWVVcGRhdGVyOjpzdG9yZVByZXZpb3VzUmVuCiAgICAgYXV0byogcmVuZGVyZXIgPSBub2RlLnJl bmRlcmVyKCk7CiAgICAgaWYgKCFyZW5kZXJlcikKICAgICAgICAgcmV0dXJuOwotICAgIEFTU0VS VChwYXJlbnQoKS5wcmV2aW91c0NoaWxkUmVuZGVyZXIgIT0gcmVuZGVyZXIpOwotICAgIHBhcmVu dCgpLnByZXZpb3VzQ2hpbGRSZW5kZXJlciA9IHJlbmRlcmVyOworICAgIEFTU0VSVChyZW5kZXJp bmdQYXJlbnQoKS5wcmV2aW91c0NoaWxkUmVuZGVyZXIgIT0gcmVuZGVyZXIpOworICAgIHJlbmRl cmluZ1BhcmVudCgpLnByZXZpb3VzQ2hpbGRSZW5kZXJlciA9IHJlbmRlcmVyOwogfQogCiB2b2lk IFJlbmRlclRyZWVVcGRhdGVyOjp0ZWFyRG93blJlbmRlcmVycyhFbGVtZW50JiByb290KQpJbmRl eDogU291cmNlL1dlYkNvcmUvc3R5bGUvUmVuZGVyVHJlZVVwZGF0ZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5oCShyZXZpc2lvbiAyMjQz MjcpCisrKyBTb3VyY2UvV2ViQ29yZS9zdHlsZS9SZW5kZXJUcmVlVXBkYXRlci5oCSh3b3JraW5n IGNvcHkpCkBAIC03OCw2ICs3OCw3IEBAIHByaXZhdGU6CiAgICAgICAgIFBhcmVudChFbGVtZW50 JiwgY29uc3QgU3R5bGU6OkVsZW1lbnRVcGRhdGVzKik7CiAgICAgfTsKICAgICBQYXJlbnQmIHBh cmVudCgpIHsgcmV0dXJuIG1fcGFyZW50U3RhY2subGFzdCgpOyB9CisgICAgUGFyZW50JiByZW5k ZXJpbmdQYXJlbnQoKTsKICAgICBSZW5kZXJUcmVlUG9zaXRpb24mIHJlbmRlclRyZWVQb3NpdGlv bigpOwogCiAgICAgR2VuZXJhdGVkQ29udGVudCYgZ2VuZXJhdGVkQ29udGVudCgpIHsgcmV0dXJu ICptX2dlbmVyYXRlZENvbnRlbnQ7IH0KSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNDMyNykKKysrIExh eW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE3 LTExLTAyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBkaXNw bGF5OmNvbnRlbnRzIHNob3VsZCB3b3JrIHdpdGggZHluYW1pYyB0YWJsZSBtdXRhdGlvbnMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTE3OQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdEV4cGVj dGF0aW9uczoKKworICAgICAgICBUaGVzZSBub3cgcGFzczoKKworICAgICAgICBpbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZGlzcGxheS0zL2Rpc3BsYXktY29udGVudHMt ZHluYW1pYy10YWJsZS0wMDEtbm9uZS5odG1sCisgICAgICAgIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1kaXNwbGF5LTMvZGlzcGxheS1jb250ZW50cy1keW5hbWljLXRh YmxlLTAwMi1ub25lLmh0bWwKKwogMjAxNy0xMS0wMiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBh cHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGVtcHR5IGNvbnRpbnVhdGlvbnMgaW4gUmVuZGVy T2JqZWN0OjpyZW1vdmVGcm9tUGFyZW50QW5kRGVzdHJveUNsZWFuaW5nVXBBbm9ueW1vdXNXcmFw cGVycwpJbmRleDogTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCShyZXZpc2lvbiAyMjQzMjcpCisrKyBMYXlvdXRU ZXN0cy9UZXN0RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkpCkBAIC0xMzMwLDE0ICsxMzMwLDEy IEBAIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRtbC9zZW0KICMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKICMjIyBTVEFSVCBPRiBkaXNwbGF5OiBjb250 ZW50cyBmYWlsdXJlcwogCi13ZWJraXQub3JnL2IvMTU3NDc3IGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1kaXNwbGF5LTMvZGlzcGxheS1jb250ZW50cy1keW5hbWljLXRh YmxlLTAwMi1ub25lLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xNTc0 NzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWRpc3BsYXktMy9kaXNw bGF5LWNvbnRlbnRzLWZsZXgtMDAzLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8xNTc0NzcgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWRpc3Bs YXktMy9kaXNwbGF5LWNvbnRlbnRzLWR5bmFtaWMtdGFibGUtMDAxLWlubGluZS5odG1sIFsgSW1h Z2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTU3NDc3IGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1kaXNwbGF5LTMvZGlzcGxheS1jb250ZW50cy1keW5hbWljLWZs ZXgtMDAyLW5vbmUuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzE1NzQ3 NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZGlzcGxheS0zL2Rpc3Bs YXktY29udGVudHMtZmxleC0wMDIuaHRtbCBbIEltYWdlT25seUZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzE1NzQ3NyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtZGlzcGxh eS0zL2Rpc3BsYXktZmxvdy1yb290LTAwMS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJr aXQub3JnL2IvMTU3NDc3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1k aXNwbGF5LTMvZGlzcGxheS1jb250ZW50cy1keW5hbWljLWZsZXgtMDAzLW5vbmUuaHRtbCBbIElt YWdlT25seUZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzE1NzQ3NyBpbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtZGlzcGxheS0zL2Rpc3BsYXktY29udGVudHMtZHluYW1pYy10 YWJsZS0wMDEtbm9uZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTU3 NDc3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1kaXNwbGF5LTMvZGlz cGxheS1jb250ZW50cy1keW5hbWljLWZsZXgtMDAyLWlubGluZS5odG1sIFsgSW1hZ2VPbmx5RmFp bHVyZSBdCiB3ZWJraXQub3JnL2IvMTU3NDc3IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1kaXNwbGF5LTMvZGlzcGxheS1jb250ZW50cy1keW5hbWljLWZsZXgtMDAzLWlu bGluZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAK