192120 2018-11-28 15:39:54 -0800 Web Inspector: Elements: ⌘-A should select all visible nodes 2018-12-04 10:14:38 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 192059 1 hi mattbaker commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1482714 0 hi 2018-11-28 15:39:54 -0800 . 1482975 1 webkit-bug-importer 2018-11-29 09:34:03 -0800 <rdar://problem/46344435> 1484677 2 356450 mattbaker 2018-12-03 19:49:10 -0800 Created attachment 356450 Patch 1484722 3 356450 hi 2018-12-03 21:55:30 -0800 Comment on attachment 356450 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=356450&action=review r=me > Source/WebInspectorUI/ChangeLog:10 > + (WI.TreeOutline.prototype._treeKeyDown): You should add a comment explaining how by removing the early-return, you allow `WI.SelectionController` to handle the ⌘-A and select all items. 1484843 4 356502 mattbaker 2018-12-04 09:07:15 -0800 Created attachment 356502 Patch for landing 1484879 5 commit-queue 2018-12-04 09:58:04 -0800 The commit-queue encountered the following flaky tests while processing attachment 356502: http/wpt/css/css-animations/start-animation-001.html bug 190903 (authors: dino@apple.com, fred.wang@free.fr, and graouts@apple.com) imported/w3c/web-platform-tests/xhr/event-error-order.sub.html bug 192363 (author: youennf@gmail.com) webgl/1.0.2/conformance/more/conformance/quickCheckAPI-C.html bug 192364 (author: roger_fong@apple.com) webgl/2.0.0/conformance/more/functions/copyTexSubImage2DBadArgs.html bug 192365 (author: justin_fan@apple.com) The commit-queue is continuing to process your patch. 1484882 6 commit-queue 2018-12-04 09:58:13 -0800 The commit-queue encountered the following flaky tests while processing attachment 356502: workers/bomb.html bug 192050 (author: fpizlo@apple.com) The commit-queue is continuing to process your patch. 1484888 7 356502 commit-queue 2018-12-04 10:14:37 -0800 Comment on attachment 356502 Patch for landing Clearing flags on attachment: 356502 Committed r238858: <https://trac.webkit.org/changeset/238858> 1484889 8 commit-queue 2018-12-04 10:14:38 -0800 All reviewed patches have been landed. Closing bug. 356450 2018-12-03 19:49:10 -0800 2018-12-04 09:07:13 -0800 Patch bug-192120-20181203194904.patch text/plain 7711 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4ODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh ODY3MmYwZTRlYTkxNmZmZTU1ZDEyZGYxM2Y4Y2NhZjhiNTE2YWY1Li5mYTI2YTkzNTZjNjM5OThm MTVlNzMwOTRmYzdmZjU5ZDc1YzU1OTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxOC0xMi0wMyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRWxlbWVudHM6IOKMmC1BIHNob3VsZCBzZWxlY3Qg YWxsIHZpc2libGUgbm9kZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5MjEyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDYzNDQ0MzU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpzOgorICAgICAgICAoV0kuVHJlZU91dGxpbmUucHJvdG90 eXBlLl90cmVlS2V5RG93bik6CisKIDIwMTgtMTItMDMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29A YXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEF1ZGl0OiAiQWRkIERlZmF1bHQg QXVkaXRzIiBzaG93biB3aGVuIHRoZXJlIGFyZSBubyBmaWx0ZXIgcmVzdWx0cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGlu ZS5qcwppbmRleCBhNzUxMWQ2ZDU1ZWE1MGIxMjdlODg2YjJiZmQ2OTViNDZhZTRkZmUwLi5lM2Ez ZmU0ODZlYzg0YWRkMjZiYzMzZmEzZWQ1ODc5ZTcwZmFkY2VlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UcmVlT3V0bGluZS5qcwpA QCAtNTQ1LDY2ICs1NDUsNjcgQEAgV0kuVHJlZU91dGxpbmUgPSBjbGFzcyBUcmVlT3V0bGluZSBl eHRlbmRzIFdJLk9iamVjdAogICAgICAgICBpZiAoZXZlbnQudGFyZ2V0ICE9PSB0aGlzLl9jaGls ZHJlbkxpc3ROb2RlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmICghdGhpcy5z ZWxlY3RlZFRyZWVFbGVtZW50IHx8IGV2ZW50LmNvbW1hbmRPckNvbnRyb2xLZXkpCi0gICAgICAg ICAgICByZXR1cm47Ci0KICAgICAgICAgbGV0IGlzUlRMID0gV0kucmVzb2x2ZWRMYXlvdXREaXJl Y3Rpb24oKSA9PT0gV0kuTGF5b3V0RGlyZWN0aW9uLlJUTDsKKyAgICAgICAgbGV0IGV4cGFuZEtl eUlkZW50aWZpZXIgPSBpc1JUTCA/ICJMZWZ0IiA6ICJSaWdodCI7CisgICAgICAgIGxldCBjb2xs YXBzZUtleUlkZW50aWZpZXIgPSBpc1JUTCA/ICJSaWdodCIgOiAiTGVmdCI7CiAKICAgICAgICAg dmFyIGhhbmRsZWQgPSBmYWxzZTsKICAgICAgICAgdmFyIG5leHRTZWxlY3RlZEVsZW1lbnQ7CiAK LSAgICAgICAgaWYgKCghaXNSVEwgJiYgZXZlbnQua2V5SWRlbnRpZmllciA9PT0gIkxlZnQiKSB8 fCAoaXNSVEwgJiYgZXZlbnQua2V5SWRlbnRpZmllciA9PT0gIlJpZ2h0IikpIHsKLSAgICAgICAg ICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQuZXhwYW5kZWQpIHsKLSAgICAgICAgICAg ICAgICBpZiAoZXZlbnQuYWx0S2V5KQotICAgICAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGVk VHJlZUVsZW1lbnQuY29sbGFwc2VSZWN1cnNpdmVseSgpOwotICAgICAgICAgICAgICAgIGVsc2UK LSAgICAgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LmNvbGxhcHNlKCk7 Ci0gICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7Ci0gICAgICAgICAgICB9IGVsc2UgaWYg KHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5wYXJlbnQgJiYgIXRoaXMuc2VsZWN0ZWRUcmVlRWxl bWVudC5wYXJlbnQucm9vdCkgewotICAgICAgICAgICAgICAgIGhhbmRsZWQgPSB0cnVlOwotICAg ICAgICAgICAgICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucGFyZW50LnNlbGVjdGFi bGUpIHsKLSAgICAgICAgICAgICAgICAgICAgbmV4dFNlbGVjdGVkRWxlbWVudCA9IHRoaXMuc2Vs ZWN0ZWRUcmVlRWxlbWVudC5wYXJlbnQ7Ci0gICAgICAgICAgICAgICAgICAgIHdoaWxlIChuZXh0 U2VsZWN0ZWRFbGVtZW50ICYmICFuZXh0U2VsZWN0ZWRFbGVtZW50LnNlbGVjdGFibGUpCi0gICAg ICAgICAgICAgICAgICAgICAgICBuZXh0U2VsZWN0ZWRFbGVtZW50ID0gbmV4dFNlbGVjdGVkRWxl bWVudC5wYXJlbnQ7Ci0gICAgICAgICAgICAgICAgICAgIGhhbmRsZWQgPSBuZXh0U2VsZWN0ZWRF bGVtZW50ID8gdHJ1ZSA6IGZhbHNlOwotICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAodGhpcy5z ZWxlY3RlZFRyZWVFbGVtZW50LnBhcmVudCkKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5zZWxl Y3RlZFRyZWVFbGVtZW50LnBhcmVudC5jb2xsYXBzZSgpOwotICAgICAgICAgICAgfQotICAgICAg ICB9IGVsc2UgaWYgKCghaXNSVEwgJiYgZXZlbnQua2V5SWRlbnRpZmllciA9PT0gIlJpZ2h0Iikg fHwgKGlzUlRMICYmIGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJMZWZ0IikpIHsKLSAgICAgICAg ICAgIGlmICghdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LnJldmVhbGVkKCkpIHsKLSAgICAgICAg ICAgICAgICB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucmV2ZWFsKCk7Ci0gICAgICAgICAgICAg ICAgaGFuZGxlZCA9IHRydWU7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKHRoaXMuc2VsZWN0ZWRU cmVlRWxlbWVudC5oYXNDaGlsZHJlbikgewotICAgICAgICAgICAgICAgIGhhbmRsZWQgPSB0cnVl OworICAgICAgICBpZiAodGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50KSB7CisgICAgICAgICAgICBp ZiAoZXZlbnQua2V5SWRlbnRpZmllciA9PT0gY29sbGFwc2VLZXlJZGVudGlmaWVyKSB7CiAgICAg ICAgICAgICAgICAgaWYgKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5leHBhbmRlZCkgewotICAg ICAgICAgICAgICAgICAgICBuZXh0U2VsZWN0ZWRFbGVtZW50ID0gdGhpcy5zZWxlY3RlZFRyZWVF bGVtZW50LmNoaWxkcmVuWzBdOwotICAgICAgICAgICAgICAgICAgICB3aGlsZSAobmV4dFNlbGVj dGVkRWxlbWVudCAmJiAhbmV4dFNlbGVjdGVkRWxlbWVudC5zZWxlY3RhYmxlKQotICAgICAgICAg ICAgICAgICAgICAgICAgbmV4dFNlbGVjdGVkRWxlbWVudCA9IG5leHRTZWxlY3RlZEVsZW1lbnQu bmV4dFNpYmxpbmc7Ci0gICAgICAgICAgICAgICAgICAgIGhhbmRsZWQgPSBuZXh0U2VsZWN0ZWRF bGVtZW50ID8gdHJ1ZSA6IGZhbHNlOwotICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAg ICAgICAgICAgICAgIGlmIChldmVudC5hbHRLZXkpCi0gICAgICAgICAgICAgICAgICAgICAgICB0 aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQuZXhwYW5kUmVjdXJzaXZlbHkoKTsKKyAgICAgICAgICAg ICAgICAgICAgICAgIHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5jb2xsYXBzZVJlY3Vyc2l2ZWx5 KCk7CiAgICAgICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgICAgIHRo aXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5leHBhbmQoKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5jb2xsYXBzZSgpOworICAgICAgICAgICAgICAgICAg ICBoYW5kbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHRoaXMuc2VsZWN0 ZWRUcmVlRWxlbWVudC5wYXJlbnQgJiYgIXRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5wYXJlbnQu cm9vdCkgeworICAgICAgICAgICAgICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKKyAgICAgICAgICAg ICAgICAgICAgaWYgKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5wYXJlbnQuc2VsZWN0YWJsZSkg eworICAgICAgICAgICAgICAgICAgICAgICAgbmV4dFNlbGVjdGVkRWxlbWVudCA9IHRoaXMuc2Vs ZWN0ZWRUcmVlRWxlbWVudC5wYXJlbnQ7CisgICAgICAgICAgICAgICAgICAgICAgICB3aGlsZSAo bmV4dFNlbGVjdGVkRWxlbWVudCAmJiAhbmV4dFNlbGVjdGVkRWxlbWVudC5zZWxlY3RhYmxlKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5leHRTZWxlY3RlZEVsZW1lbnQgPSBuZXh0U2Vs ZWN0ZWRFbGVtZW50LnBhcmVudDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGhhbmRsZWQgPSBu ZXh0U2VsZWN0ZWRFbGVtZW50ID8gdHJ1ZSA6IGZhbHNlOworICAgICAgICAgICAgICAgICAgICB9 IGVsc2UgaWYgKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5wYXJlbnQpCisgICAgICAgICAgICAg ICAgICAgICAgICB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucGFyZW50LmNvbGxhcHNlKCk7CiAg ICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9IGVsc2UgaWYgKGV2ZW50 LmtleUNvZGUgPT09IDggLyogQmFja3NwYWNlICovIHx8IGV2ZW50LmtleUNvZGUgPT09IDQ2IC8q IERlbGV0ZSAqLykgewotICAgICAgICAgICAgZm9yIChsZXQgdHJlZUVsZW1lbnQgb2YgdGhpcy5z ZWxlY3RlZFRyZWVFbGVtZW50cykgewotICAgICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudC5v bmRlbGV0ZSAmJiB0cmVlRWxlbWVudC5vbmRlbGV0ZSgpKQorICAgICAgICAgICAgfSBlbHNlIGlm IChldmVudC5rZXlJZGVudGlmaWVyID09PSBleHBhbmRLZXlJZGVudGlmaWVyKSB7CisgICAgICAg ICAgICAgICAgaWYgKCF0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucmV2ZWFsZWQoKSkgeworICAg ICAgICAgICAgICAgICAgICB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucmV2ZWFsKCk7CisgICAg ICAgICAgICAgICAgICAgIGhhbmRsZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIH0gZWxzZSBp ZiAodGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50Lmhhc0NoaWxkcmVuKSB7CiAgICAgICAgICAgICAg ICAgICAgIGhhbmRsZWQgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5zZWxl Y3RlZFRyZWVFbGVtZW50LmV4cGFuZGVkKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBuZXh0 U2VsZWN0ZWRFbGVtZW50ID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LmNoaWxkcmVuWzBdOwor ICAgICAgICAgICAgICAgICAgICAgICAgd2hpbGUgKG5leHRTZWxlY3RlZEVsZW1lbnQgJiYgIW5l eHRTZWxlY3RlZEVsZW1lbnQuc2VsZWN0YWJsZSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICBuZXh0U2VsZWN0ZWRFbGVtZW50ID0gbmV4dFNlbGVjdGVkRWxlbWVudC5uZXh0U2libGluZzsK KyAgICAgICAgICAgICAgICAgICAgICAgIGhhbmRsZWQgPSBuZXh0U2VsZWN0ZWRFbGVtZW50ID8g dHJ1ZSA6IGZhbHNlOworICAgICAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKGV2ZW50LmFsdEtleSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQuZXhwYW5kUmVjdXJzaXZlbHkoKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLnNl bGVjdGVkVHJlZUVsZW1lbnQuZXhwYW5kKCk7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAg ICAgICAgICAgICB9CisgICAgICAgICAgICB9IGVsc2UgaWYgKGV2ZW50LmtleUNvZGUgPT09IDgg LyogQmFja3NwYWNlICovIHx8IGV2ZW50LmtleUNvZGUgPT09IDQ2IC8qIERlbGV0ZSAqLykgewor ICAgICAgICAgICAgICAgIGZvciAobGV0IHRyZWVFbGVtZW50IG9mIHRoaXMuc2VsZWN0ZWRUcmVl RWxlbWVudHMpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHRyZWVFbGVtZW50Lm9uZGVsZXRl ICYmIHRyZWVFbGVtZW50Lm9uZGVsZXRlKCkpCisgICAgICAgICAgICAgICAgICAgICAgICBoYW5k bGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaWYgKCFoYW5k bGVkICYmIHRoaXMudHJlZU91dGxpbmUub25kZWxldGUpCisgICAgICAgICAgICAgICAgICAgIGhh bmRsZWQgPSB0aGlzLnRyZWVPdXRsaW5lLm9uZGVsZXRlKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVu dCk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKGlzRW50ZXJLZXkoZXZlbnQpKSB7CisgICAgICAg ICAgICAgICAgaWYgKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5vbmVudGVyKQorICAgICAgICAg ICAgICAgICAgICBoYW5kbGVkID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50Lm9uZW50ZXIoKTsK KyAgICAgICAgICAgICAgICBpZiAoIWhhbmRsZWQgJiYgdGhpcy50cmVlT3V0bGluZS5vbmVudGVy KQorICAgICAgICAgICAgICAgICAgICBoYW5kbGVkID0gdGhpcy50cmVlT3V0bGluZS5vbmVudGVy KHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudCk7CisgICAgICAgICAgICB9IGVsc2UgaWYgKGV2ZW50 LmtleUlkZW50aWZpZXIgPT09ICJVKzAwMjAiIC8qIFNwYWNlICovKSB7CisgICAgICAgICAgICAg ICAgaWYgKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5vbnNwYWNlKQorICAgICAgICAgICAgICAg ICAgICBoYW5kbGVkID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50Lm9uc3BhY2UoKTsKKyAgICAg ICAgICAgICAgICBpZiAoIWhhbmRsZWQgJiYgdGhpcy50cmVlT3V0bGluZS5vbnNwYWNlKQorICAg ICAgICAgICAgICAgICAgICBoYW5kbGVkID0gdGhpcy50cmVlT3V0bGluZS5vbnNwYWNlKHRoaXMu c2VsZWN0ZWRUcmVlRWxlbWVudCk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBpZiAoIWhh bmRsZWQgJiYgdGhpcy50cmVlT3V0bGluZS5vbmRlbGV0ZSkKLSAgICAgICAgICAgICAgICBoYW5k bGVkID0gdGhpcy50cmVlT3V0bGluZS5vbmRlbGV0ZSh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQp OwotICAgICAgICB9IGVsc2UgaWYgKGlzRW50ZXJLZXkoZXZlbnQpKSB7Ci0gICAgICAgICAgICBp ZiAodGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50Lm9uZW50ZXIpCi0gICAgICAgICAgICAgICAgaGFu ZGxlZCA9IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5vbmVudGVyKCk7Ci0gICAgICAgICAgICBp ZiAoIWhhbmRsZWQgJiYgdGhpcy50cmVlT3V0bGluZS5vbmVudGVyKQotICAgICAgICAgICAgICAg IGhhbmRsZWQgPSB0aGlzLnRyZWVPdXRsaW5lLm9uZW50ZXIodGhpcy5zZWxlY3RlZFRyZWVFbGVt ZW50KTsKLSAgICAgICAgfSBlbHNlIGlmIChldmVudC5rZXlJZGVudGlmaWVyID09PSAiVSswMDIw IiAvKiBTcGFjZSAqLykgewotICAgICAgICAgICAgaWYgKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVu dC5vbnNwYWNlKQotICAgICAgICAgICAgICAgIGhhbmRsZWQgPSB0aGlzLnNlbGVjdGVkVHJlZUVs ZW1lbnQub25zcGFjZSgpOwotICAgICAgICAgICAgaWYgKCFoYW5kbGVkICYmIHRoaXMudHJlZU91 dGxpbmUub25zcGFjZSkKLSAgICAgICAgICAgICAgICBoYW5kbGVkID0gdGhpcy50cmVlT3V0bGlu ZS5vbnNwYWNlKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudCk7CiAgICAgICAgIH0KIAogICAgICAg ICBpZiAoIWhhbmRsZWQpCg== 356502 2018-12-04 09:07:15 -0800 2018-12-04 10:14:37 -0800 Patch for landing bug-192120-20181204090708.patch text/plain 7823 mattbaker U3VidmVyc2lvbiBSZXZpc2lvbjogMjM4ODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh ODY3MmYwZTRlYTkxNmZmZTU1ZDEyZGYxM2Y4Y2NhZjhiNTE2YWY1Li45YWExYzFlNGUzODY0ODU3 Y2I4ZDc0NGJhZmE4NmZmYjUyMDJmNGEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOC0xMi0wNCAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRWxlbWVudHM6IOKMmC1BIHNob3VsZCBzZWxlY3Qg YWxsIHZpc2libGUgbm9kZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE5MjEyMAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDYzNDQ0MzU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9UcmVlT3V0bGluZS5qczoKKyAgICAgICAgKFdJLlRyZWVPdXRsaW5lLnByb3RvdHlw ZS5fdHJlZUtleURvd24pOgorICAgICAgICBSZW1vdmUgYW4gZWFybHkgcmV0dXJuLCBhbGxvd2lu ZyBgV0kuU2VsZWN0aW9uQ29udHJvbGxlcmAgdG8gaGFuZGxlIOKMmC1BCisgICAgICAgIGFuZCBz ZWxlY3QgYWxsIGl0ZW1zLgorCiAyMDE4LTEyLTAzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBdWRpdDogIkFkZCBEZWZhdWx0IEF1 ZGl0cyIgc2hvd24gd2hlbiB0aGVyZSBhcmUgbm8gZmlsdGVyIHJlc3VsdHMKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RyZWVPdXRsaW5lLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUu anMKaW5kZXggYTc1MTFkNmQ1NWVhNTBiMTI3ZTg4NmIyYmZkNjk1YjQ2YWU0ZGZlMC4uZTNhM2Zl NDg2ZWM4NGFkZDI2YmMzM2ZhM2VkNTg3OWU3MGZhZGNlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVHJlZU91dGxpbmUuanMKQEAg LTU0NSw2NiArNTQ1LDY3IEBAIFdJLlRyZWVPdXRsaW5lID0gY2xhc3MgVHJlZU91dGxpbmUgZXh0 ZW5kcyBXSS5PYmplY3QKICAgICAgICAgaWYgKGV2ZW50LnRhcmdldCAhPT0gdGhpcy5fY2hpbGRy ZW5MaXN0Tm9kZSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoIXRoaXMuc2Vs ZWN0ZWRUcmVlRWxlbWVudCB8fCBldmVudC5jb21tYW5kT3JDb250cm9sS2V5KQotICAgICAgICAg ICAgcmV0dXJuOwotCiAgICAgICAgIGxldCBpc1JUTCA9IFdJLnJlc29sdmVkTGF5b3V0RGlyZWN0 aW9uKCkgPT09IFdJLkxheW91dERpcmVjdGlvbi5SVEw7CisgICAgICAgIGxldCBleHBhbmRLZXlJ ZGVudGlmaWVyID0gaXNSVEwgPyAiTGVmdCIgOiAiUmlnaHQiOworICAgICAgICBsZXQgY29sbGFw c2VLZXlJZGVudGlmaWVyID0gaXNSVEwgPyAiUmlnaHQiIDogIkxlZnQiOwogCiAgICAgICAgIHZh ciBoYW5kbGVkID0gZmFsc2U7CiAgICAgICAgIHZhciBuZXh0U2VsZWN0ZWRFbGVtZW50OwogCi0g ICAgICAgIGlmICgoIWlzUlRMICYmIGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJMZWZ0IikgfHwg KGlzUlRMICYmIGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJSaWdodCIpKSB7Ci0gICAgICAgICAg ICBpZiAodGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LmV4cGFuZGVkKSB7Ci0gICAgICAgICAgICAg ICAgaWYgKGV2ZW50LmFsdEtleSkKLSAgICAgICAgICAgICAgICAgICAgdGhpcy5zZWxlY3RlZFRy ZWVFbGVtZW50LmNvbGxhcHNlUmVjdXJzaXZlbHkoKTsKLSAgICAgICAgICAgICAgICBlbHNlCi0g ICAgICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5jb2xsYXBzZSgpOwot ICAgICAgICAgICAgICAgIGhhbmRsZWQgPSB0cnVlOwotICAgICAgICAgICAgfSBlbHNlIGlmICh0 aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucGFyZW50ICYmICF0aGlzLnNlbGVjdGVkVHJlZUVsZW1l bnQucGFyZW50LnJvb3QpIHsKLSAgICAgICAgICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKLSAgICAg ICAgICAgICAgICBpZiAodGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LnBhcmVudC5zZWxlY3RhYmxl KSB7Ci0gICAgICAgICAgICAgICAgICAgIG5leHRTZWxlY3RlZEVsZW1lbnQgPSB0aGlzLnNlbGVj dGVkVHJlZUVsZW1lbnQucGFyZW50OwotICAgICAgICAgICAgICAgICAgICB3aGlsZSAobmV4dFNl bGVjdGVkRWxlbWVudCAmJiAhbmV4dFNlbGVjdGVkRWxlbWVudC5zZWxlY3RhYmxlKQotICAgICAg ICAgICAgICAgICAgICAgICAgbmV4dFNlbGVjdGVkRWxlbWVudCA9IG5leHRTZWxlY3RlZEVsZW1l bnQucGFyZW50OwotICAgICAgICAgICAgICAgICAgICBoYW5kbGVkID0gbmV4dFNlbGVjdGVkRWxl bWVudCA/IHRydWUgOiBmYWxzZTsKLSAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKHRoaXMuc2Vs ZWN0ZWRUcmVlRWxlbWVudC5wYXJlbnQpCi0gICAgICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0 ZWRUcmVlRWxlbWVudC5wYXJlbnQuY29sbGFwc2UoKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAg fSBlbHNlIGlmICgoIWlzUlRMICYmIGV2ZW50LmtleUlkZW50aWZpZXIgPT09ICJSaWdodCIpIHx8 IChpc1JUTCAmJiBldmVudC5rZXlJZGVudGlmaWVyID09PSAiTGVmdCIpKSB7Ci0gICAgICAgICAg ICBpZiAoIXRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5yZXZlYWxlZCgpKSB7Ci0gICAgICAgICAg ICAgICAgdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LnJldmVhbCgpOwotICAgICAgICAgICAgICAg IGhhbmRsZWQgPSB0cnVlOwotICAgICAgICAgICAgfSBlbHNlIGlmICh0aGlzLnNlbGVjdGVkVHJl ZUVsZW1lbnQuaGFzQ2hpbGRyZW4pIHsKLSAgICAgICAgICAgICAgICBoYW5kbGVkID0gdHJ1ZTsK KyAgICAgICAgaWYgKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudCkgeworICAgICAgICAgICAgaWYg KGV2ZW50LmtleUlkZW50aWZpZXIgPT09IGNvbGxhcHNlS2V5SWRlbnRpZmllcikgewogICAgICAg ICAgICAgICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQuZXhwYW5kZWQpIHsKLSAgICAg ICAgICAgICAgICAgICAgbmV4dFNlbGVjdGVkRWxlbWVudCA9IHRoaXMuc2VsZWN0ZWRUcmVlRWxl bWVudC5jaGlsZHJlblswXTsKLSAgICAgICAgICAgICAgICAgICAgd2hpbGUgKG5leHRTZWxlY3Rl ZEVsZW1lbnQgJiYgIW5leHRTZWxlY3RlZEVsZW1lbnQuc2VsZWN0YWJsZSkKLSAgICAgICAgICAg ICAgICAgICAgICAgIG5leHRTZWxlY3RlZEVsZW1lbnQgPSBuZXh0U2VsZWN0ZWRFbGVtZW50Lm5l eHRTaWJsaW5nOwotICAgICAgICAgICAgICAgICAgICBoYW5kbGVkID0gbmV4dFNlbGVjdGVkRWxl bWVudCA/IHRydWUgOiBmYWxzZTsKLSAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgICAgICAgICBpZiAoZXZlbnQuYWx0S2V5KQotICAgICAgICAgICAgICAgICAgICAgICAgdGhp cy5zZWxlY3RlZFRyZWVFbGVtZW50LmV4cGFuZFJlY3Vyc2l2ZWx5KCk7CisgICAgICAgICAgICAg ICAgICAgICAgICB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQuY29sbGFwc2VSZWN1cnNpdmVseSgp OwogICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgICAgICB0aGlz LnNlbGVjdGVkVHJlZUVsZW1lbnQuZXhwYW5kKCk7CisgICAgICAgICAgICAgICAgICAgICAgICB0 aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQuY29sbGFwc2UoKTsKKyAgICAgICAgICAgICAgICAgICAg aGFuZGxlZCA9IHRydWU7CisgICAgICAgICAgICAgICAgfSBlbHNlIGlmICh0aGlzLnNlbGVjdGVk VHJlZUVsZW1lbnQucGFyZW50ICYmICF0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucGFyZW50LnJv b3QpIHsKKyAgICAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CisgICAgICAgICAgICAg ICAgICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucGFyZW50LnNlbGVjdGFibGUpIHsK KyAgICAgICAgICAgICAgICAgICAgICAgIG5leHRTZWxlY3RlZEVsZW1lbnQgPSB0aGlzLnNlbGVj dGVkVHJlZUVsZW1lbnQucGFyZW50OworICAgICAgICAgICAgICAgICAgICAgICAgd2hpbGUgKG5l eHRTZWxlY3RlZEVsZW1lbnQgJiYgIW5leHRTZWxlY3RlZEVsZW1lbnQuc2VsZWN0YWJsZSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBuZXh0U2VsZWN0ZWRFbGVtZW50ID0gbmV4dFNlbGVj dGVkRWxlbWVudC5wYXJlbnQ7CisgICAgICAgICAgICAgICAgICAgICAgICBoYW5kbGVkID0gbmV4 dFNlbGVjdGVkRWxlbWVudCA/IHRydWUgOiBmYWxzZTsKKyAgICAgICAgICAgICAgICAgICAgfSBl bHNlIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQucGFyZW50KQorICAgICAgICAgICAgICAg ICAgICAgICAgdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LnBhcmVudC5jb2xsYXBzZSgpOwogICAg ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0KLSAgICAgICAgfSBlbHNlIGlmIChldmVudC5r ZXlDb2RlID09PSA4IC8qIEJhY2tzcGFjZSAqLyB8fCBldmVudC5rZXlDb2RlID09PSA0NiAvKiBE ZWxldGUgKi8pIHsKLSAgICAgICAgICAgIGZvciAobGV0IHRyZWVFbGVtZW50IG9mIHRoaXMuc2Vs ZWN0ZWRUcmVlRWxlbWVudHMpIHsKLSAgICAgICAgICAgICAgICBpZiAodHJlZUVsZW1lbnQub25k ZWxldGUgJiYgdHJlZUVsZW1lbnQub25kZWxldGUoKSkKKyAgICAgICAgICAgIH0gZWxzZSBpZiAo ZXZlbnQua2V5SWRlbnRpZmllciA9PT0gZXhwYW5kS2V5SWRlbnRpZmllcikgeworICAgICAgICAg ICAgICAgIGlmICghdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LnJldmVhbGVkKCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LnJldmVhbCgpOworICAgICAg ICAgICAgICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYg KHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5oYXNDaGlsZHJlbikgewogICAgICAgICAgICAgICAg ICAgICBoYW5kbGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHRoaXMuc2VsZWN0 ZWRUcmVlRWxlbWVudC5leHBhbmRlZCkgeworICAgICAgICAgICAgICAgICAgICAgICAgbmV4dFNl bGVjdGVkRWxlbWVudCA9IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5jaGlsZHJlblswXTsKKyAg ICAgICAgICAgICAgICAgICAgICAgIHdoaWxlIChuZXh0U2VsZWN0ZWRFbGVtZW50ICYmICFuZXh0 U2VsZWN0ZWRFbGVtZW50LnNlbGVjdGFibGUpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg bmV4dFNlbGVjdGVkRWxlbWVudCA9IG5leHRTZWxlY3RlZEVsZW1lbnQubmV4dFNpYmxpbmc7Cisg ICAgICAgICAgICAgICAgICAgICAgICBoYW5kbGVkID0gbmV4dFNlbGVjdGVkRWxlbWVudCA/IHRy dWUgOiBmYWxzZTsKKyAgICAgICAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChldmVudC5hbHRLZXkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg dGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50LmV4cGFuZFJlY3Vyc2l2ZWx5KCk7CisgICAgICAgICAg ICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5zZWxl Y3RlZFRyZWVFbGVtZW50LmV4cGFuZCgpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfSBlbHNlIGlmIChldmVudC5rZXlDb2RlID09PSA4IC8q IEJhY2tzcGFjZSAqLyB8fCBldmVudC5rZXlDb2RlID09PSA0NiAvKiBEZWxldGUgKi8pIHsKKyAg ICAgICAgICAgICAgICBmb3IgKGxldCB0cmVlRWxlbWVudCBvZiB0aGlzLnNlbGVjdGVkVHJlZUVs ZW1lbnRzKSB7CisgICAgICAgICAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudC5vbmRlbGV0ZSAm JiB0cmVlRWxlbWVudC5vbmRlbGV0ZSgpKQorICAgICAgICAgICAgICAgICAgICAgICAgaGFuZGxl ZCA9IHRydWU7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlmICghaGFuZGxl ZCAmJiB0aGlzLnRyZWVPdXRsaW5lLm9uZGVsZXRlKQorICAgICAgICAgICAgICAgICAgICBoYW5k bGVkID0gdGhpcy50cmVlT3V0bGluZS5vbmRlbGV0ZSh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQp OworICAgICAgICAgICAgfSBlbHNlIGlmIChpc0VudGVyS2V5KGV2ZW50KSkgeworICAgICAgICAg ICAgICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQub25lbnRlcikKKyAgICAgICAgICAg ICAgICAgICAgaGFuZGxlZCA9IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5vbmVudGVyKCk7Cisg ICAgICAgICAgICAgICAgaWYgKCFoYW5kbGVkICYmIHRoaXMudHJlZU91dGxpbmUub25lbnRlcikK KyAgICAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRoaXMudHJlZU91dGxpbmUub25lbnRlcih0 aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQpOworICAgICAgICAgICAgfSBlbHNlIGlmIChldmVudC5r ZXlJZGVudGlmaWVyID09PSAiVSswMDIwIiAvKiBTcGFjZSAqLykgeworICAgICAgICAgICAgICAg IGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQub25zcGFjZSkKKyAgICAgICAgICAgICAgICAg ICAgaGFuZGxlZCA9IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5vbnNwYWNlKCk7CisgICAgICAg ICAgICAgICAgaWYgKCFoYW5kbGVkICYmIHRoaXMudHJlZU91dGxpbmUub25zcGFjZSkKKyAgICAg ICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRoaXMudHJlZU91dGxpbmUub25zcGFjZSh0aGlzLnNl bGVjdGVkVHJlZUVsZW1lbnQpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKCFoYW5k bGVkICYmIHRoaXMudHJlZU91dGxpbmUub25kZWxldGUpCi0gICAgICAgICAgICAgICAgaGFuZGxl ZCA9IHRoaXMudHJlZU91dGxpbmUub25kZWxldGUodGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50KTsK LSAgICAgICAgfSBlbHNlIGlmIChpc0VudGVyS2V5KGV2ZW50KSkgewotICAgICAgICAgICAgaWYg KHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5vbmVudGVyKQotICAgICAgICAgICAgICAgIGhhbmRs ZWQgPSB0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQub25lbnRlcigpOwotICAgICAgICAgICAgaWYg KCFoYW5kbGVkICYmIHRoaXMudHJlZU91dGxpbmUub25lbnRlcikKLSAgICAgICAgICAgICAgICBo YW5kbGVkID0gdGhpcy50cmVlT3V0bGluZS5vbmVudGVyKHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVu dCk7Ci0gICAgICAgIH0gZWxzZSBpZiAoZXZlbnQua2V5SWRlbnRpZmllciA9PT0gIlUrMDAyMCIg LyogU3BhY2UgKi8pIHsKLSAgICAgICAgICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQu b25zcGFjZSkKLSAgICAgICAgICAgICAgICBoYW5kbGVkID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVt ZW50Lm9uc3BhY2UoKTsKLSAgICAgICAgICAgIGlmICghaGFuZGxlZCAmJiB0aGlzLnRyZWVPdXRs aW5lLm9uc3BhY2UpCi0gICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRoaXMudHJlZU91dGxpbmUu b25zcGFjZSh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQpOwogICAgICAgICB9CiAKICAgICAgICAg aWYgKCFoYW5kbGVkKQo=