166934 2017-01-11 10:50:23 -0800 Web Inspector: color, gradient, cubic-bezier, spring editors should be dismissable using ESC 2017-01-11 18:09:47 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg hi bburg commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1265831 0 bburg 2017-01-11 10:50:23 -0800 There is no straightforward way to dismiss these editors with the keyboard. This is annoying for workflow reasons and a blocker for making these accessible via FKA (full keyboard access). ESC is currently handled by the split console shortcut. 1265843 1 webkit-bug-importer 2017-01-11 11:19:37 -0800 <rdar://problem/29972995> 1265918 2 298618 hi 2017-01-11 15:19:26 -0800 Created attachment 298618 Patch 1265950 3 298618 bburg 2017-01-11 16:19:43 -0800 Comment on attachment 298618 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298618&action=review r=me, please fix typo > Source/WebInspectorUI/ChangeLog:13 > + Adds a keydown listener while visible for the Escape key that dismisses the popver. Nit: popover 1265976 4 298635 hi 2017-01-11 17:07:51 -0800 Created attachment 298635 Patch 1265979 5 298635 commit-queue 2017-01-11 17:09:43 -0800 Comment on attachment 298635 Patch Rejecting attachment 298635 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 298635, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebInspectorUI/ChangeLog contains OOPS!. Full output: http://webkit-queues.webkit.org/results/2873673 1265999 6 298642 hi 2017-01-11 17:32:36 -0800 Created attachment 298642 Patch Whoops. Forgot r+ in ChangeLog :P 1266019 7 298642 commit-queue 2017-01-11 18:09:43 -0800 Comment on attachment 298642 Patch Clearing flags on attachment: 298642 Committed r210615: <http://trac.webkit.org/changeset/210615> 1266020 8 commit-queue 2017-01-11 18:09:47 -0800 All reviewed patches have been landed. Closing bug. 298618 2017-01-11 15:19:26 -0800 2017-01-11 17:07:51 -0800 Patch bug-166934-20170111151747.patch text/plain 4493 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU2NmJjODEwNWRhZjEzMTVlMmVhY2QwOWEyNzE0 ODcwNGQ1MmZmZDguLjFlNWRkM2YxYzM1NDBjNTUxMTg3YzNlZWQ2MTcyZTA4YjE0MjZkMTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTAxLTExICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGNvbG9yLCBncmFkaWVudCwgY3ViaWMtYmV6aWVyLCBzcHJpbmcgZWRpdG9ycyBzaG91 bGQgYmUgZGlzbWlzc2FibGUgdXNpbmcgRVNDCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjY5MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3Bv dmVyLnByb3RvdHlwZS5kaXNtaXNzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVyLnBy b3RvdHlwZS5oYW5kbGVFdmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUG9wb3Zlci5wcm90 b3R5cGUuX2FkZExpc3RlbmVyc0lmTmVlZGVkKToKKyAgICAgICAgQWRkcyBhIGtleWRvd24gbGlz dGVuZXIgd2hpbGUgdmlzaWJsZSBmb3IgdGhlIEVzY2FwZSBrZXkgdGhhdCBkaXNtaXNzZXMgdGhl IHBvcHZlci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuc2V0IGtleWJv YXJkU2hvcnRjdXREaXNhYmxlZCk6CisgICAgICAgIEV4cG9zZSB0aGUgYWJpbGl0eSB0byBkaXNh YmxlIHRoZSBnbG9iYWwga2V5Ym9hcmQgc2hvcnRjdXQuICBUaGlzIGFsbG93cyB0aGUgUG9wb3Zl ciB0byBoYXZlCisgICAgICAgIGl0cyBvd24gRXNjYXBlIGtleWJvYXJkIHNob3J0Y3V0IHRvIHRh a2UgcHJlY2VkZW5jZS4KKwogMjAxNy0wMS0wOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVl QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIxMDI2MC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Bv cG92ZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3Bv dmVyLmpzCmluZGV4IDg3NGI4ODUxMmNhNmY2NGQ4ZWFmOGZhODIwZmE3ZWFiMGY5N2MzNWQuLjk2 NDYzOTk0NTE3MDY4ODc2MGNlYWNjYTM0NWI2MzMwYjZlODJjODIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcwpAQCAtNDEs OSArNDEsMTAgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMg V2ViSW5zcGVjdG9yLk9iamVjdAogICAgICAgICB0aGlzLl9jb250ZW50TmVlZHNVcGRhdGUgPSBm YWxzZTsKICAgICAgICAgdGhpcy5fZGlzbWlzc2luZyA9IGZhbHNlOwogCisgICAgICAgIHRoaXMu X2NhbnZhc0lkID0gInBvcG92ZXItIiArIChXZWJJbnNwZWN0b3IuUG9wb3Zlci5jYW52YXNJZCsr KTsKKwogICAgICAgICB0aGlzLl9lbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 Iik7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuY2xhc3NOYW1lID0gInBvcG92ZXIiOwotICAgICAg ICB0aGlzLl9jYW52YXNJZCA9ICJwb3BvdmVyLSIgKyAoV2ViSW5zcGVjdG9yLlBvcG92ZXIuY2Fu dmFzSWQrKyk7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuc3R5bGUuYmFja2dyb3VuZEltYWdlID0g Ii13ZWJraXQtY2FudmFzKCIgKyB0aGlzLl9jYW52YXNJZCArICIpIjsKICAgICAgICAgdGhpcy5f ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJ0cmFuc2l0aW9uZW5kIiwgdGhpcywgdHJ1ZSk7CiAK QEAgLTE0Nyw5ICsxNDgsMTMgQEAgV2ViSW5zcGVjdG9yLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVy IGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRo aXMuX2lzTGlzdGVuaW5nRm9yUG9wb3ZlckV2ZW50cyk7CiAgICAgICAgIHRoaXMuX2lzTGlzdGVu aW5nRm9yUG9wb3ZlckV2ZW50cyA9IGZhbHNlOworCiAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVu dExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLCB0cnVlKTsKICAgICAgICAgd2luZG93LnJlbW92 ZUV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHRoaXMsIHRydWUpOwogICAgICAgICB3aW5kb3cucmVt b3ZlRXZlbnRMaXN0ZW5lcigicmVzaXplIiwgdGhpcywgdHJ1ZSk7CisgICAgICAgIHdpbmRvdy5y ZW1vdmVFdmVudExpc3RlbmVyKCJrZXlwcmVzcyIsIHRoaXMsIHRydWUpOworCisgICAgICAgIFdl Ykluc3BlY3Rvci5xdWlja0NvbnNvbGUua2V5Ym9hcmRTaG9ydGN1dERpc2FibGVkID0gZmFsc2U7 CiAKICAgICAgICAgdGhpcy5fZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5Qb3Bv dmVyLkZhZGVPdXRDbGFzc05hbWUpOwogCkBAIC0xNjksNiArMTc0LDEwIEBAIFdlYkluc3BlY3Rv ci5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAg ICAgICAgICAgIGlmICh0aGlzLl9yZXNpemVIYW5kbGVyKQogICAgICAgICAgICAgICAgIHRoaXMu X3Jlc2l6ZUhhbmRsZXIoKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlICJrZXlw cmVzcyI6CisgICAgICAgICAgICBpZiAoZXZlbnQua2V5Q29kZSA9PT0gV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQuS2V5LkVzY2FwZS5rZXlDb2RlKQorICAgICAgICAgICAgICAgIHRoaXMu ZGlzbWlzcygpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgInRyYW5zaXRpb25l bmQiOgogICAgICAgICAgICAgaWYgKGV2ZW50LnRhcmdldCA9PT0gdGhpcy5fZWxlbWVudCkgewog ICAgICAgICAgICAgICAgIGRvY3VtZW50LmJvZHkucmVtb3ZlQ2hpbGQodGhpcy5fZWxlbWVudCk7 CkBAIC01NjgsOSArNTc3LDEzIEBAIFdlYkluc3BlY3Rvci5Qb3BvdmVyID0gY2xhc3MgUG9wb3Zl ciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5f aXNMaXN0ZW5pbmdGb3JQb3BvdmVyRXZlbnRzKSB7CiAgICAgICAgICAgICB0aGlzLl9pc0xpc3Rl bmluZ0ZvclBvcG92ZXJFdmVudHMgPSB0cnVlOworCiAgICAgICAgICAgICB3aW5kb3cuYWRkRXZl bnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcywgdHJ1ZSk7CiAgICAgICAgICAgICB3aW5kb3cu YWRkRXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgdGhpcywgdHJ1ZSk7CiAgICAgICAgICAgICB3aW5k b3cuYWRkRXZlbnRMaXN0ZW5lcigicmVzaXplIiwgdGhpcywgdHJ1ZSk7CisgICAgICAgICAgICB3 aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigia2V5cHJlc3MiLCB0aGlzLCB0cnVlKTsKKworICAgICAg ICAgICAgV2ViSW5zcGVjdG9yLnF1aWNrQ29uc29sZS5rZXlib2FyZFNob3J0Y3V0RGlzYWJsZWQg PSB0cnVlOwogICAgICAgICB9CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcwppbmRleCA4NGE1 M2U0YWI0MzhlZDk5MjlkNTUzNjJhODVlMGYxMDM1MjA0NDYzLi42ZWM5ZTc3YzA5YmY0ZDQzNTFj YjU5MTg3MWRhZDRjYTI2Y2YzOWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzCkBAIC0xMDUsNiArMTA1 LDExIEBAIFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUgPSBjbGFzcyBRdWlja0NvbnNvbGUgZXh0 ZW5kcyBXZWJJbnNwZWN0b3IuVmlldwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlLkV2ZW50LkRpZFJlc2l6ZSk7CiAgICAgfQog CisgICAgc2V0IGtleWJvYXJkU2hvcnRjdXREaXNhYmxlZChkaXNhYmxlZCkKKyAgICB7CisgICAg ICAgIHRoaXMuX3RvZ2dsZU9yRm9jdXNLZXlib2FyZFNob3J0Y3V0LmRpc2FibGVkID0gZGlzYWJs ZWQ7CisgICAgfQorCiAgICAgLy8gUHJvdGVjdGVkCiAKICAgICBsYXlvdXQoKQo= 298635 2017-01-11 17:07:51 -0800 2017-01-11 17:32:36 -0800 Patch 166934.diff text/plain 4297 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU2NmJjODEuLjU1YjE0ODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTAxLTExICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNv bG9yLCBncmFkaWVudCwgY3ViaWMtYmV6aWVyLCBzcHJpbmcgZWRpdG9ycyBzaG91bGQgYmUgZGlz bWlzc2FibGUgdXNpbmcgRVNDCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjY5MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Qb3BvdmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVyLnByb3Rv dHlwZS5kaXNtaXNzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVyLnByb3RvdHlwZS5o YW5kbGVFdmVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUG9wb3Zlci5wcm90b3R5cGUuX2Fk ZExpc3RlbmVyc0lmTmVlZGVkKToKKyAgICAgICAgQWRkcyBhIGtleWRvd24gbGlzdGVuZXIgd2hp bGUgdmlzaWJsZSBmb3IgdGhlIEVzY2FwZSBrZXkgdGhhdCBkaXNtaXNzZXMgdGhlIHBvcG92ZXIu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUucHJvdG90eXBlLnNldCBrZXlib2FyZFNob3J0 Y3V0RGlzYWJsZWQpOgorICAgICAgICBFeHBvc2UgdGhlIGFiaWxpdHkgdG8gZGlzYWJsZSB0aGUg Z2xvYmFsIGtleWJvYXJkIHNob3J0Y3V0LiAgVGhpcyBhbGxvd3MgdGhlIFBvcG92ZXIgdG8gaGF2 ZQorICAgICAgICBpdHMgb3duIEVzY2FwZSBrZXlib2FyZCBzaG9ydGN1dCB0byB0YWtlIHByZWNl ZGVuY2UuCisKIDIwMTctMDEtMDkgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1xdWV1ZUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMTAyNjAuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcwpp bmRleCA4NzRiODg1Li45NjQ2Mzk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMKQEAgLTQxLDkgKzQxLDEwIEBAIFdlYklu c3BlY3Rvci5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmpl Y3QKICAgICAgICAgdGhpcy5fY29udGVudE5lZWRzVXBkYXRlID0gZmFsc2U7CiAgICAgICAgIHRo aXMuX2Rpc21pc3NpbmcgPSBmYWxzZTsKIAorICAgICAgICB0aGlzLl9jYW52YXNJZCA9ICJwb3Bv dmVyLSIgKyAoV2ViSW5zcGVjdG9yLlBvcG92ZXIuY2FudmFzSWQrKyk7CisKICAgICAgICAgdGhp cy5fZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAgICAgICB0aGlz Ll9lbGVtZW50LmNsYXNzTmFtZSA9ICJwb3BvdmVyIjsKLSAgICAgICAgdGhpcy5fY2FudmFzSWQg PSAicG9wb3Zlci0iICsgKFdlYkluc3BlY3Rvci5Qb3BvdmVyLmNhbnZhc0lkKyspOwogICAgICAg ICB0aGlzLl9lbGVtZW50LnN0eWxlLmJhY2tncm91bmRJbWFnZSA9ICItd2Via2l0LWNhbnZhcygi ICsgdGhpcy5fY2FudmFzSWQgKyAiKSI7CiAgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigidHJhbnNpdGlvbmVuZCIsIHRoaXMsIHRydWUpOwogCkBAIC0xNDcsOSArMTQ4LDEz IEBAIFdlYkluc3BlY3Rvci5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdlYkluc3Bl Y3Rvci5PYmplY3QKIAogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9pc0xpc3RlbmluZ0Zv clBvcG92ZXJFdmVudHMpOwogICAgICAgICB0aGlzLl9pc0xpc3RlbmluZ0ZvclBvcG92ZXJFdmVu dHMgPSBmYWxzZTsKKwogICAgICAgICB3aW5kb3cucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91c2Vk b3duIiwgdGhpcywgdHJ1ZSk7CiAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJz Y3JvbGwiLCB0aGlzLCB0cnVlKTsKICAgICAgICAgd2luZG93LnJlbW92ZUV2ZW50TGlzdGVuZXIo InJlc2l6ZSIsIHRoaXMsIHRydWUpOworICAgICAgICB3aW5kb3cucmVtb3ZlRXZlbnRMaXN0ZW5l cigia2V5cHJlc3MiLCB0aGlzLCB0cnVlKTsKKworICAgICAgICBXZWJJbnNwZWN0b3IucXVpY2tD b25zb2xlLmtleWJvYXJkU2hvcnRjdXREaXNhYmxlZCA9IGZhbHNlOwogCiAgICAgICAgIHRoaXMu X2VsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUG9wb3Zlci5GYWRlT3V0Q2xhc3NO YW1lKTsKIApAQCAtMTY5LDYgKzE3NCwxMCBAQCBXZWJJbnNwZWN0b3IuUG9wb3ZlciA9IGNsYXNz IFBvcG92ZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuT2JqZWN0CiAgICAgICAgICAgICBpZiAodGhp cy5fcmVzaXplSGFuZGxlcikKICAgICAgICAgICAgICAgICB0aGlzLl9yZXNpemVIYW5kbGVyKCk7 CiAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSAia2V5cHJlc3MiOgorICAgICAgICAg ICAgaWYgKGV2ZW50LmtleUNvZGUgPT09IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lktl eS5Fc2NhcGUua2V5Q29kZSkKKyAgICAgICAgICAgICAgICB0aGlzLmRpc21pc3MoKTsKKyAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlICJ0cmFuc2l0aW9uZW5kIjoKICAgICAgICAgICAg IGlmIChldmVudC50YXJnZXQgPT09IHRoaXMuX2VsZW1lbnQpIHsKICAgICAgICAgICAgICAgICBk b2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKHRoaXMuX2VsZW1lbnQpOwpAQCAtNTY4LDkgKzU3Nywx MyBAQCBXZWJJbnNwZWN0b3IuUG9wb3ZlciA9IGNsYXNzIFBvcG92ZXIgZXh0ZW5kcyBXZWJJbnNw ZWN0b3IuT2JqZWN0CiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX2lzTGlzdGVuaW5nRm9yUG9w b3ZlckV2ZW50cykgewogICAgICAgICAgICAgdGhpcy5faXNMaXN0ZW5pbmdGb3JQb3BvdmVyRXZl bnRzID0gdHJ1ZTsKKwogICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNl ZG93biIsIHRoaXMsIHRydWUpOwogICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIo InNjcm9sbCIsIHRoaXMsIHRydWUpOwogICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoInJlc2l6ZSIsIHRoaXMsIHRydWUpOworICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlz dGVuZXIoImtleXByZXNzIiwgdGhpcywgdHJ1ZSk7CisKKyAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5xdWlja0NvbnNvbGUua2V5Ym9hcmRTaG9ydGN1dERpc2FibGVkID0gdHJ1ZTsKICAgICAgICAg fQogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9RdWlja0NvbnNvbGUuanMKaW5kZXggODRhNTNlNGEuLjZlYzllNzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1aWNr Q29uc29sZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9RdWlja0NvbnNvbGUuanMKQEAgLTEwNSw2ICsxMDUsMTEgQEAgV2ViSW5zcGVjdG9yLlF1aWNr Q29uc29sZSA9IGNsYXNzIFF1aWNrQ29uc29sZSBleHRlbmRzIFdlYkluc3BlY3Rvci5WaWV3CiAg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5RdWlja0Nv bnNvbGUuRXZlbnQuRGlkUmVzaXplKTsKICAgICB9CiAKKyAgICBzZXQga2V5Ym9hcmRTaG9ydGN1 dERpc2FibGVkKGRpc2FibGVkKQorICAgIHsKKyAgICAgICAgdGhpcy5fdG9nZ2xlT3JGb2N1c0tl eWJvYXJkU2hvcnRjdXQuZGlzYWJsZWQgPSBkaXNhYmxlZDsKKyAgICB9CisKICAgICAvLyBQcm90 ZWN0ZWQKIAogICAgIGxheW91dCgpCg== 298642 2017-01-11 17:32:36 -0800 2017-01-11 18:09:43 -0800 Patch 166934.diff text/plain 4293 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU2NmJjODEuLjJiYjJjMDIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTAxLTExICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGNv bG9yLCBncmFkaWVudCwgY3ViaWMtYmV6aWVyLCBzcHJpbmcgZWRpdG9ycyBzaG91bGQgYmUgZGlz bWlzc2FibGUgdXNpbmcgRVNDCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjY5MzQKKworICAgICAgICBSZXZpZXdlZCBieSBCcmlhbiBCdXJnLgorCisg ICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlBvcG92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBl LmRpc21pc3MpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlLmhhbmRs ZUV2ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Qb3BvdmVyLnByb3RvdHlwZS5fYWRkTGlz dGVuZXJzSWZOZWVkZWQpOgorICAgICAgICBBZGRzIGEga2V5ZG93biBsaXN0ZW5lciB3aGlsZSB2 aXNpYmxlIGZvciB0aGUgRXNjYXBlIGtleSB0aGF0IGRpc21pc3NlcyB0aGUgcG9wb3Zlci4KKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25zb2xlLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5wcm90b3R5cGUuc2V0IGtleWJvYXJkU2hvcnRjdXRE aXNhYmxlZCk6CisgICAgICAgIEV4cG9zZSB0aGUgYWJpbGl0eSB0byBkaXNhYmxlIHRoZSBnbG9i YWwga2V5Ym9hcmQgc2hvcnRjdXQuICBUaGlzIGFsbG93cyB0aGUgUG9wb3ZlciB0byBoYXZlCisg ICAgICAgIGl0cyBvd24gRXNjYXBlIGtleWJvYXJkIHNob3J0Y3V0IHRvIHRha2UgcHJlY2VkZW5j ZS4KKwogMjAxNy0wMS0wOSAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIxMDI2MC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Qb3BvdmVyLmpzCmluZGV4 IDg3NGI4ODUuLjk2NDYzOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1BvcG92ZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUG9wb3Zlci5qcwpAQCAtNDEsOSArNDEsMTAgQEAgV2ViSW5zcGVj dG9yLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMgV2ViSW5zcGVjdG9yLk9iamVjdAog ICAgICAgICB0aGlzLl9jb250ZW50TmVlZHNVcGRhdGUgPSBmYWxzZTsKICAgICAgICAgdGhpcy5f ZGlzbWlzc2luZyA9IGZhbHNlOwogCisgICAgICAgIHRoaXMuX2NhbnZhc0lkID0gInBvcG92ZXIt IiArIChXZWJJbnNwZWN0b3IuUG9wb3Zlci5jYW52YXNJZCsrKTsKKwogICAgICAgICB0aGlzLl9l bGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CiAgICAgICAgIHRoaXMuX2Vs ZW1lbnQuY2xhc3NOYW1lID0gInBvcG92ZXIiOwotICAgICAgICB0aGlzLl9jYW52YXNJZCA9ICJw b3BvdmVyLSIgKyAoV2ViSW5zcGVjdG9yLlBvcG92ZXIuY2FudmFzSWQrKyk7CiAgICAgICAgIHRo aXMuX2VsZW1lbnQuc3R5bGUuYmFja2dyb3VuZEltYWdlID0gIi13ZWJraXQtY2FudmFzKCIgKyB0 aGlzLl9jYW52YXNJZCArICIpIjsKICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRFdmVudExpc3Rl bmVyKCJ0cmFuc2l0aW9uZW5kIiwgdGhpcywgdHJ1ZSk7CiAKQEAgLTE0Nyw5ICsxNDgsMTMgQEAg V2ViSW5zcGVjdG9yLlBvcG92ZXIgPSBjbGFzcyBQb3BvdmVyIGV4dGVuZHMgV2ViSW5zcGVjdG9y Lk9iamVjdAogCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuX2lzTGlzdGVuaW5nRm9yUG9w b3ZlckV2ZW50cyk7CiAgICAgICAgIHRoaXMuX2lzTGlzdGVuaW5nRm9yUG9wb3ZlckV2ZW50cyA9 IGZhbHNlOworCiAgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJtb3VzZWRvd24i LCB0aGlzLCB0cnVlKTsKICAgICAgICAgd2luZG93LnJlbW92ZUV2ZW50TGlzdGVuZXIoInNjcm9s bCIsIHRoaXMsIHRydWUpOwogICAgICAgICB3aW5kb3cucmVtb3ZlRXZlbnRMaXN0ZW5lcigicmVz aXplIiwgdGhpcywgdHJ1ZSk7CisgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJr ZXlwcmVzcyIsIHRoaXMsIHRydWUpOworCisgICAgICAgIFdlYkluc3BlY3Rvci5xdWlja0NvbnNv bGUua2V5Ym9hcmRTaG9ydGN1dERpc2FibGVkID0gZmFsc2U7CiAKICAgICAgICAgdGhpcy5fZWxl bWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5Qb3BvdmVyLkZhZGVPdXRDbGFzc05hbWUp OwogCkBAIC0xNjksNiArMTc0LDEwIEBAIFdlYkluc3BlY3Rvci5Qb3BvdmVyID0gY2xhc3MgUG9w b3ZlciBleHRlbmRzIFdlYkluc3BlY3Rvci5PYmplY3QKICAgICAgICAgICAgIGlmICh0aGlzLl9y ZXNpemVIYW5kbGVyKQogICAgICAgICAgICAgICAgIHRoaXMuX3Jlc2l6ZUhhbmRsZXIoKTsKICAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlICJrZXlwcmVzcyI6CisgICAgICAgICAgICBp ZiAoZXZlbnQua2V5Q29kZSA9PT0gV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5LkVz Y2FwZS5rZXlDb2RlKQorICAgICAgICAgICAgICAgIHRoaXMuZGlzbWlzcygpOworICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgInRyYW5zaXRpb25lbmQiOgogICAgICAgICAgICAgaWYg KGV2ZW50LnRhcmdldCA9PT0gdGhpcy5fZWxlbWVudCkgewogICAgICAgICAgICAgICAgIGRvY3Vt ZW50LmJvZHkucmVtb3ZlQ2hpbGQodGhpcy5fZWxlbWVudCk7CkBAIC01NjgsOSArNTc3LDEzIEBA IFdlYkluc3BlY3Rvci5Qb3BvdmVyID0gY2xhc3MgUG9wb3ZlciBleHRlbmRzIFdlYkluc3BlY3Rv ci5PYmplY3QKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5faXNMaXN0ZW5pbmdGb3JQb3BvdmVy RXZlbnRzKSB7CiAgICAgICAgICAgICB0aGlzLl9pc0xpc3RlbmluZ0ZvclBvcG92ZXJFdmVudHMg PSB0cnVlOworCiAgICAgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3du IiwgdGhpcywgdHJ1ZSk7CiAgICAgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigic2Ny b2xsIiwgdGhpcywgdHJ1ZSk7CiAgICAgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigi cmVzaXplIiwgdGhpcywgdHJ1ZSk7CisgICAgICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5l cigia2V5cHJlc3MiLCB0aGlzLCB0cnVlKTsKKworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnF1 aWNrQ29uc29sZS5rZXlib2FyZFNob3J0Y3V0RGlzYWJsZWQgPSB0cnVlOwogICAgICAgICB9CiAg ICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1F1aWNrQ29uc29sZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1F1aWNrQ29uc29sZS5qcwppbmRleCA4NGE1M2U0YS4uNmVjOWU3NyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUXVpY2tDb25z b2xlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1F1 aWNrQ29uc29sZS5qcwpAQCAtMTA1LDYgKzEwNSwxMSBAQCBXZWJJbnNwZWN0b3IuUXVpY2tDb25z b2xlID0gY2xhc3MgUXVpY2tDb25zb2xlIGV4dGVuZHMgV2ViSW5zcGVjdG9yLlZpZXcKICAgICAg ICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29s ZS5FdmVudC5EaWRSZXNpemUpOwogICAgIH0KIAorICAgIHNldCBrZXlib2FyZFNob3J0Y3V0RGlz YWJsZWQoZGlzYWJsZWQpCisgICAgeworICAgICAgICB0aGlzLl90b2dnbGVPckZvY3VzS2V5Ym9h cmRTaG9ydGN1dC5kaXNhYmxlZCA9IGRpc2FibGVkOworICAgIH0KKwogICAgIC8vIFByb3RlY3Rl ZAogCiAgICAgbGF5b3V0KCkK