56084 2011-03-10 02:46:18 -0800 Web Inspector: [Text editor] Substitute live-edit mode activation by double-click 2011-03-10 08:46:28 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 53588 0 aandrey webkit-unassigned apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 365064 0 aandrey 2011-03-10 02:46:18 -0800 Make the viewer editable on double click, instead of turning on the live-edit mode. This is still guarded by a flag, and will not be a default behavior yet. We should think more of the UX. 365065 1 85301 aandrey 2011-03-10 02:50:13 -0800 Created attachment 85301 Patch 365131 2 85315 aandrey 2011-03-10 06:42:29 -0800 Created attachment 85315 Patch 365215 3 85315 podivilov 2011-03-10 08:46:16 -0800 Comment on attachment 85315 Patch Clearing flags on attachment: 85315 Committed r80728: <http://trac.webkit.org/changeset/80728> 365216 4 podivilov 2011-03-10 08:46:28 -0800 All reviewed patches have been landed. Closing bug. 85301 2011-03-10 02:50:13 -0800 2011-03-10 06:42:23 -0800 Patch bug-56084-20110310135010.patch text/plain 6188 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODA2NDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NDM4MDdlYTRkNzU2M2Rh NWRhOGFhZjdiNTIxZmVhNThkNjEwMTdkLi4xMTcyMTYyNzdhNTZjZDJlZGIxM2VhZDE1NDFmMzQ3 ZDM4NTBhMWZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDMtMTAgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtUZXh0IGVkaXRvcl0gU3Vi c3RpdHV0ZSBsaXZlLWVkaXQgbW9kZSBhY3RpdmF0aW9uIGJ5IGRvdWJsZS1jbGljaworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYwODQKKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZS5fc3RhcnRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUuX3JlZ2lzdGVyU2hvcnRjdXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5wcm90b3R5cGUuX2hhbmRsZUtleURvd24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5faGFuZGxlU2F2ZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLl9oYW5kbGVSZXZlcnRFZGl0aW5nKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2RvdWJsZUNsaWNrKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwucHJvdG90eXBlLmdldCB0ZXh0KToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanM6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUuZ2V0IHJlYWRPbmx5KToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5nZXQgcmVhZE9ubHkpOgorCiAy MDExLTAzLTA5ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgVW5yZXZpZXdlZC4gRml4ZWQgYSBjcmFzaCBpbiBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OmRpZFJlY2VpdmVSZXNwb25zZSgpIHdoZW4gbG9hZGVyIGlzIG51bGwgKGJyb2tlbiBpbiByODA2 MzkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJj ZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFt ZS5qcwppbmRleCAzMTIwMTU5MDZkODZjMTQ5MmUzNmNkYmY0OWUxY2EzM2UwZDNkZjNlLi41YjM3 YThmMzRjNDI4ZjAyOGJkZDg1Yzg2Y2Q3OTI0MWJmMWFmMjJkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKQEAgLTQ2LDYgKzQ2LDEx IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKGRlbGVnYXRlLCB1cmwpCiAg ICAgdGhpcy5fbWVzc2FnZXMgPSBbXTsKICAgICB0aGlzLl9yb3dNZXNzYWdlcyA9IHt9OwogICAg IHRoaXMuX21lc3NhZ2VCdWJibGVzID0ge307CisKKyAgICBpZiAoUHJlZmVyZW5jZXMuc291cmNl RWRpdG9yRW5hYmxlZCkgeworICAgICAgICB0aGlzLl9yZWdpc3RlclNob3J0Y3V0cygpOworICAg ICAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigia2V5ZG93biIsIHRoaXMuX2hhbmRs ZUtleURvd24uYmluZCh0aGlzKSwgZmFsc2UpOworICAgIH0KIH0KIAogV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lLkV2ZW50cyA9IHsKQEAgLTE3Myw2ICsxNzgsOSBAQCBXZWJJbnNwZWN0b3IuU291 cmNlRnJhbWUucHJvdG90eXBlID0gewogCiAgICAgX3N0YXJ0RWRpdGluZzogZnVuY3Rpb24oKQog ICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudCA9PT0gdW5k ZWZpbmVkKQorICAgICAgICAgICAgdGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50ID0gdGhp cy5fdGV4dE1vZGVsLnRleHQ7CisKICAgICAgICAgV2ViSW5zcGVjdG9yLnNlYXJjaENvbnRyb2xs ZXIuY2FuY2VsU2VhcmNoKCk7CiAgICAgICAgIHRoaXMuY2xlYXJNZXNzYWdlcygpOwogICAgIH0s CkBAIC03NjMsNiArNzcxLDQ3IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUg PSB7CiAgICAgICAgIGZvcm1hdHRlci5mb3JtYXRDb250ZW50KHRoaXMuX2NvbnRlbnQsIGRpZEZv cm1hdC5iaW5kKHRoaXMpKQogICAgIH0sCiAKKyAgICBfcmVnaXN0ZXJTaG9ydGN1dHM6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIHRoaXMuX3Nob3J0Y3V0cyA9IHt9OworICAgICAgICB0aGlz Ll9zaG9ydGN1dHNbV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQubWFrZUtleSgicyIsIFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVycy5DdHJsT3JNZXRhKV0gPSB0aGlz Ll9oYW5kbGVTYXZlLmJpbmQodGhpcyk7CisgICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0LktleXMuRXNjLmNvZGUpXSA9IHRoaXMuX2hhbmRsZVJldmVydEVkaXRpbmcuYmluZCh0aGlz KTsKKyAgICB9LAorCisgICAgX2hhbmRsZUtleURvd246IGZ1bmN0aW9uKGUpCisgICAgeworICAg ICAgICB2YXIgc2hvcnRjdXRLZXkgPSBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtl S2V5RnJvbUV2ZW50KGUpOworICAgICAgICB2YXIgaGFuZGxlciA9IHRoaXMuX3Nob3J0Y3V0c1tz aG9ydGN1dEtleV07CisgICAgICAgIGlmIChoYW5kbGVyKSB7CisgICAgICAgICAgICBoYW5kbGVy LmNhbGwodGhpcyk7CisgICAgICAgICAgICBlLnByZXZlbnREZWZhdWx0KCk7CisgICAgICAgICAg ICBlLnN0b3BQcm9wYWdhdGlvbigpOworICAgICAgICB9CisgICAgfSwKKworICAgIF9oYW5kbGVT YXZlOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAoIXRoaXMuX2RlbGVnYXRlLmNhbkVk aXRTY3JpcHRTb3VyY2UoKSkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB2YXIgbmV3 U291cmNlID0gdGhpcy5fdGV4dE1vZGVsLnRleHQ7CisgICAgICAgIGlmICh0aGlzLl9vcmlnaW5h bFRleHRNb2RlbENvbnRlbnQgIT09IG5ld1NvdXJjZSkKKyAgICAgICAgICAgIHRoaXMuX2RlbGVn YXRlLmVkaXRTY3JpcHRTb3VyY2UobmV3U291cmNlKTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX29y aWdpbmFsVGV4dE1vZGVsQ29udGVudDsKKyAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZWFkT25s eSA9IHRydWU7CisgICAgfSwKKworICAgIF9oYW5kbGVSZXZlcnRFZGl0aW5nOiBmdW5jdGlvbigp CisgICAgeworICAgICAgICBpZiAodGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50ICE9PSB1 bmRlZmluZWQpIHsKKyAgICAgICAgICAgIHZhciBjdXJyZW50U291cmNlID0gdGhpcy5fdGV4dE1v ZGVsLnRleHQ7CisgICAgICAgICAgICBpZiAodGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50 ICE9PSBjdXJyZW50U291cmNlKQorICAgICAgICAgICAgICAgIHRoaXMuX3RleHRNb2RlbC5zZXRU ZXh0KG51bGwsIHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudCk7CisgICAgICAgIH0KKyAg ICAgICAgZGVsZXRlIHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudDsKKyAgICAgICAgdGhp cy5fdGV4dFZpZXdlci5yZWFkT25seSA9IHRydWU7CisgICAgfSwKKwogICAgIF9kb3VibGVDbGlj azogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAgICBpZiAoIXRoaXMuX2RlbGVnYXRlLmNh bkVkaXRTY3JpcHRTb3VyY2UoKSkKQEAgLTc3Miw2ICs4MjEsMTQgQEAgV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKCFsaW5lUm93KQogICAgICAgICAg ICAgcmV0dXJuOyAgLy8gRG8gbm90IHRyaWdnZXIgZWRpdGluZyBmcm9tIGxpbmUgbnVtYmVycy4K IAorICAgICAgICBpZiAoUHJlZmVyZW5jZXMuc291cmNlRWRpdG9yRW5hYmxlZCkgeworICAgICAg ICAgICAgaWYgKHRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkpIHsKKyAgICAgICAgICAgICAgICB0 aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gZmFsc2U7CisgICAgICAgICAgICAgICAgd2luZG93 LmdldFNlbGVjdGlvbigpLmNvbGxhcHNlVG9TdGFydCgpOworICAgICAgICAgICAgfQorICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5lZGl0 TGluZShsaW5lUm93LCB0aGlzLl9kaWRFZGl0TGluZS5iaW5kKHRoaXMsIGxpbmVSb3cubGluZU51 bWJlcikpOwogICAgIH0sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGV4dEVkaXRvck1vZGVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UZXh0RWRpdG9yTW9kZWwuanMKaW5kZXggZjIzY2U3NmM3MGI0Njc5NjgyYTM0ZDBk ZjNjZGFlNWUxODMyYTlhYi4uYjE0YTNiN2I1NmFiNTk1OTNjNWFhYWVjOWM0NGEyZDVlZTI1ZmY2 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0RWRp dG9yTW9kZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0 RWRpdG9yTW9kZWwuanMKQEAgLTcyLDYgKzcyLDExIEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TW9kZWwucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdGhpcy5fbGluZXMubGVuZ3RoOwog ICAgIH0sCiAKKyAgICBnZXQgdGV4dCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fbGlu ZXMuam9pbigiXG4iKTsKKyAgICB9LAorCiAgICAgbGluZTogZnVuY3Rpb24obGluZU51bWJlcikK ICAgICB7CiAgICAgICAgIGlmIChsaW5lTnVtYmVyID49IHRoaXMuX2xpbmVzLmxlbmd0aCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwppbmRl eCA0Y2ViYWUzOWU3N2UzMjY4OWYyZWMxMGJhOGNjOTY4YmQ4N2JmNDM3Li4wNjFkN2E2YzkwY2Ex NmUzZWM3Y2FiYTkyOWY2MWY5NzY5YjQwZjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCkBAIC01OCw2ICs1OCwxMSBAQCBXZWJJbnNw ZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX21haW5QYW5lbC5y ZWFkT25seSA9IHJlYWRPbmx5OwogICAgIH0sCiAKKyAgICBnZXQgcmVhZE9ubHkoKQorICAgIHsK KyAgICAgICAgcmV0dXJuIHRoaXMuX21haW5QYW5lbC5yZWFkT25seTsKKyAgICB9LAorCiAgICAg c2V0IHN0YXJ0RWRpdGluZ0xpc3RlbmVyKHN0YXJ0RWRpdGluZ0xpc3RlbmVyKQogICAgIHsKICAg ICAgICAgdGhpcy5fc3RhcnRFZGl0aW5nTGlzdGVuZXIgPSBzdGFydEVkaXRpbmdMaXN0ZW5lcjsK QEAgLTcyNyw2ICs3MzIsMTEgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLmVuZERvbVVwZGF0ZXMoKTsKICAgICB9LAogCisgICAg Z2V0IHJlYWRPbmx5KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9yZWFkT25seTsKKyAg ICB9LAorCiAgICAgbWFya0FuZFJldmVhbFJhbmdlOiBmdW5jdGlvbihyYW5nZSkKICAgICB7CiAg ICAgICAgIGlmICh0aGlzLl9yYW5nZVRvTWFyaykgewo= 85315 2011-03-10 06:42:29 -0800 2011-03-10 08:46:16 -0800 Patch bug-56084-20110310174226.patch text/plain 7498 aandrey U3VidmVyc2lvbiBSZXZpc2lvbjogODA2NDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0NDM4MDdlYTRkNzU2M2Rh NWRhOGFhZjdiNTIxZmVhNThkNjEwMTdkLi44MDc4M2E3NTUzOTRkOGFiZTI1ZjI4Mjg5MTA3ZTFh NGYxNDliMmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDMtMTAgIEFuZHJl eSBBZGFpa2luICA8YWFuZHJleUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtUZXh0IGVkaXRvcl0gU3Vi c3RpdHV0ZSBsaXZlLWVkaXQgbW9kZSBhY3RpdmF0aW9uIGJ5IGRvdWJsZS1jbGljaworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTYwODQKKworICAgICAg ICBBbHNvIGZpeGVkIGEgcmVncmVzc2lvbjogY29uc29sZSB3YXMgbm90IG9wZW5pbmcvY2xvc2lu ZyBvbiBFU0Mga2V5IHByZXNzIGJlY2F1c2UgdGFiSW5kZXg9IjAiIGF0dHJpYnV0ZSB3YXMgcHJl c2VydmVkIGZvciBhIHJlYWRPbmx5IHZpZXdlci4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvU291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fc3RhcnRFZGl0 aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX3JlZ2lz dGVyU2hvcnRjdXRzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5 cGUuX2hhbmRsZUtleURvd24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnBy b3RvdHlwZS5faGFuZGxlU2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlLl9oYW5kbGVSZXZlcnRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5wcm90b3R5cGUuX2RvdWJsZUNsaWNrKToKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0 RWRpdG9yTW9kZWwucHJvdG90eXBlLmdldCB0ZXh0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1RleHRWaWV3ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5w cm90b3R5cGUuZ2V0IHJlYWRPbmx5KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnBy b3RvdHlwZS5zZXQgcmVhZE9ubHkpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluUGFuZWwucHJvdG90eXBlLmdldCByZWFkT25seSk6CisKIDIwMTEtMDMtMDkgIEFuZHJleSBL b3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiBGaXhl ZCBhIGNyYXNoIGluIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVjZWl2ZVJlc3BvbnNl KCkgd2hlbiBsb2FkZXIgaXMgbnVsbCAoYnJva2VuIGluIHI4MDYzOSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IDMxMjAxNTkw NmQ4NmMxNDkyZTM2Y2RiZjQ5ZTFjYTMzZTBkM2RmM2UuLjBhMzgyOTEwZGY3ZDdmYWEwNWFmMDAw ZWFhMzNiNjlkMWY0NWVlNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtNDYsNiArNDYsMTEgQEAgV2ViSW5zcGVjdG9yLlNv dXJjZUZyYW1lID0gZnVuY3Rpb24oZGVsZWdhdGUsIHVybCkKICAgICB0aGlzLl9tZXNzYWdlcyA9 IFtdOwogICAgIHRoaXMuX3Jvd01lc3NhZ2VzID0ge307CiAgICAgdGhpcy5fbWVzc2FnZUJ1YmJs ZXMgPSB7fTsKKworICAgIGlmIChQcmVmZXJlbmNlcy5zb3VyY2VFZGl0b3JFbmFibGVkKSB7Cisg ICAgICAgIHRoaXMuX3JlZ2lzdGVyU2hvcnRjdXRzKCk7CisgICAgICAgIHRoaXMuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJrZXlkb3duIiwgdGhpcy5faGFuZGxlS2V5RG93bi5iaW5kKHRoaXMp LCBmYWxzZSk7CisgICAgfQogfQogCiBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUuRXZlbnRzID0g ewpAQCAtMTczLDYgKzE3OCw5IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUg PSB7CiAKICAgICBfc3RhcnRFZGl0aW5nOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICBpZiAo dGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250ZW50ID09PSB1bmRlZmluZWQpCisgICAgICAgICAg ICB0aGlzLl9vcmlnaW5hbFRleHRNb2RlbENvbnRlbnQgPSB0aGlzLl90ZXh0TW9kZWwudGV4dDsK KwogICAgICAgICBXZWJJbnNwZWN0b3Iuc2VhcmNoQ29udHJvbGxlci5jYW5jZWxTZWFyY2goKTsK ICAgICAgICAgdGhpcy5jbGVhck1lc3NhZ2VzKCk7CiAgICAgfSwKQEAgLTc2Myw2ICs3NzEsNDQg QEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgZm9ybWF0 dGVyLmZvcm1hdENvbnRlbnQodGhpcy5fY29udGVudCwgZGlkRm9ybWF0LmJpbmQodGhpcykpCiAg ICAgfSwKIAorICAgIF9yZWdpc3RlclNob3J0Y3V0czogZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgdGhpcy5fc2hvcnRjdXRzID0ge307CisgICAgICAgIHRoaXMuX3Nob3J0Y3V0c1tXZWJJbnNw ZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5tYWtlS2V5KCJzIiwgV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQuTW9kaWZpZXJzLkN0cmxPck1ldGEpXSA9IHRoaXMuX2hhbmRsZVNhdmUuYmluZCh0 aGlzKTsKKyAgICAgICAgdGhpcy5fc2hvcnRjdXRzW1dlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0Lm1ha2VLZXkoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuS2V5cy5Fc2MuY29kZSld ID0gdGhpcy5faGFuZGxlUmV2ZXJ0RWRpdGluZy5iaW5kKHRoaXMpOworICAgIH0sCisKKyAgICBf aGFuZGxlS2V5RG93bjogZnVuY3Rpb24oZSkKKyAgICB7CisgICAgICAgIHZhciBzaG9ydGN1dEtl eSA9IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lm1ha2VLZXlGcm9tRXZlbnQoZSk7Cisg ICAgICAgIHZhciBoYW5kbGVyID0gdGhpcy5fc2hvcnRjdXRzW3Nob3J0Y3V0S2V5XTsKKyAgICAg ICAgaWYgKGhhbmRsZXIpIHsKKyAgICAgICAgICAgIGhhbmRsZXIuY2FsbCh0aGlzKTsKKyAgICAg ICAgICAgIGUucHJldmVudERlZmF1bHQoKTsKKyAgICAgICAgICAgIGUuc3RvcFByb3BhZ2F0aW9u KCk7CisgICAgICAgIH0KKyAgICB9LAorCisgICAgX2hhbmRsZVNhdmU6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIGlmICghdGhpcy5fZGVsZWdhdGUuY2FuRWRpdFNjcmlwdFNvdXJjZSgpKQor ICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHZhciBuZXdTb3VyY2UgPSB0aGlzLl90ZXh0 TW9kZWwudGV4dDsKKyAgICAgICAgaWYgKHRoaXMuX29yaWdpbmFsVGV4dE1vZGVsQ29udGVudCAh PT0gbmV3U291cmNlKQorICAgICAgICAgICAgdGhpcy5fZGVsZWdhdGUuZWRpdFNjcmlwdFNvdXJj ZShuZXdTb3VyY2UpOworICAgICAgICBkZWxldGUgdGhpcy5fb3JpZ2luYWxUZXh0TW9kZWxDb250 ZW50OworICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gdHJ1ZTsKKyAgICB9LAor CisgICAgX2hhbmRsZVJldmVydEVkaXRpbmc6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlm ICh0aGlzLl9vcmlnaW5hbFRleHRNb2RlbENvbnRlbnQgIT09IHVuZGVmaW5lZCkKKyAgICAgICAg ICAgIHRoaXMuX3RleHRNb2RlbC5zZXRUZXh0KG51bGwsIHRoaXMuX29yaWdpbmFsVGV4dE1vZGVs Q29udGVudCk7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9vcmlnaW5hbFRleHRNb2RlbENvbnRlbnQ7 CisgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkgPSB0cnVlOworICAgIH0sCisKICAg ICBfZG91YmxlQ2xpY2s6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlz Ll9kZWxlZ2F0ZS5jYW5FZGl0U2NyaXB0U291cmNlKCkpCkBAIC03NzIsNiArODE4LDE0IEBAIFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmICghbGluZVJv dykKICAgICAgICAgICAgIHJldHVybjsgIC8vIERvIG5vdCB0cmlnZ2VyIGVkaXRpbmcgZnJvbSBs aW5lIG51bWJlcnMuCiAKKyAgICAgICAgaWYgKFByZWZlcmVuY2VzLnNvdXJjZUVkaXRvckVuYWJs ZWQpIHsKKyAgICAgICAgICAgIGlmICh0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5KSB7CisgICAg ICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSA9IGZhbHNlOworICAgICAgICAg ICAgICAgIHdpbmRvdy5nZXRTZWxlY3Rpb24oKS5jb2xsYXBzZVRvU3RhcnQoKTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIHRoaXMuX3Rl eHRWaWV3ZXIuZWRpdExpbmUobGluZVJvdywgdGhpcy5fZGlkRWRpdExpbmUuYmluZCh0aGlzLCBs aW5lUm93LmxpbmVOdW1iZXIpKTsKICAgICB9LAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRFZGl0b3JNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dEVkaXRvck1vZGVsLmpzCmluZGV4IGYyM2NlNzZjNzBi NDY3OTY4MmEzNGQwZGYzY2RhZTVlMTgzMmE5YWIuLmIxNGEzYjdiNTZhYjU5NTkzYzVhYWFlYzlj NDRhMmQ1ZWUyNWZmNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGV4dEVkaXRvck1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVGV4dEVkaXRvck1vZGVsLmpzCkBAIC03Miw2ICs3MiwxMSBAQCBXZWJJbnNwZWN0 b3IuVGV4dEVkaXRvck1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2xp bmVzLmxlbmd0aDsKICAgICB9LAogCisgICAgZ2V0IHRleHQoKQorICAgIHsKKyAgICAgICAgcmV0 dXJuIHRoaXMuX2xpbmVzLmpvaW4oIlxuIik7CisgICAgfSwKKwogICAgIGxpbmU6IGZ1bmN0aW9u KGxpbmVOdW1iZXIpCiAgICAgewogICAgICAgICBpZiAobGluZU51bWJlciA+PSB0aGlzLl9saW5l cy5sZW5ndGgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1RleHRWaWV3ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRW aWV3ZXIuanMKaW5kZXggNGNlYmFlMzllNzdlMzI2ODlmMmVjMTBiYThjYzk2OGJkODdiZjQzNy4u NTcyNjAwYWZkMWYzZmMxMTc2MjY3MmM2NGMwZWEzNTkyNDc5ODQxYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcwpAQCAtNTgsNiArNTgs MTEgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogICAgICAgICB0aGlz Ll9tYWluUGFuZWwucmVhZE9ubHkgPSByZWFkT25seTsKICAgICB9LAogCisgICAgZ2V0IHJlYWRP bmx5KCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9tYWluUGFuZWwucmVhZE9ubHk7Cisg ICAgfSwKKwogICAgIHNldCBzdGFydEVkaXRpbmdMaXN0ZW5lcihzdGFydEVkaXRpbmdMaXN0ZW5l cikKICAgICB7CiAgICAgICAgIHRoaXMuX3N0YXJ0RWRpdGluZ0xpc3RlbmVyID0gc3RhcnRFZGl0 aW5nTGlzdGVuZXI7CkBAIC02ODAsMTEgKzY4NSw5IEBAIFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsID0gZnVuY3Rpb24odGV4dE1vZGVsLCB1cmwsIHN5bmNTY3JvbGxMaXN0ZW5lciwK IAogICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOwogICAg IHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAidGV4dC1lZGl0b3ItY29udGVudHMiOwotICAgIHRo aXMuZWxlbWVudC50YWJJbmRleCA9IDA7CiAKICAgICB0aGlzLl9jb250YWluZXIgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAgICB0aGlzLl9jb250YWluZXIuY2xhc3NOYW1lID0g ImlubmVyLWNvbnRhaW5lciI7Ci0gICAgdGhpcy5fY29udGFpbmVyLnRhYkluZGV4ID0gMDsKICAg ICB0aGlzLmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fY29udGFpbmVyKTsKIAogICAgIHRoaXMu ZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJzY3JvbGwiLCB0aGlzLl9zY3JvbGwuYmluZCh0aGlz KSwgZmFsc2UpOwpAQCAtNzIwLDEzICs3MjMsMjYgQEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluUGFuZWwucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuYmVnaW5Eb21VcGRhdGVzKCk7 CiAgICAgICAgIHRoaXMuX3JlYWRPbmx5ID0gcmVhZE9ubHk7Ci0gICAgICAgIGlmICh0aGlzLl9y ZWFkT25seSkKKyAgICAgICAgaWYgKHRoaXMuX3JlYWRPbmx5KSB7CisgICAgICAgICAgICB0aGlz LmVsZW1lbnQucmVtb3ZlQXR0cmlidXRlKCJ0YWJJbmRleCIpOworICAgICAgICAgICAgdGhpcy5f Y29udGFpbmVyLnJlbW92ZUF0dHJpYnV0ZSgidGFiSW5kZXgiKTsKICAgICAgICAgICAgIHRoaXMu X2NvbnRhaW5lci5yZW1vdmVTdHlsZUNsYXNzKCJ0ZXh0LWVkaXRvci1lZGl0YWJsZSIpOwotICAg ICAgICBlbHNlCisgICAgICAgICAgICAvLyBSZW1vdmUgdGhlIGZvY3VzIGZyb20gdGhlIGVkaXRh YmxlIGFyZWEuCisgICAgICAgICAgICB0aGlzLl9jb250YWluZXIuYmx1cigpOworICAgICAgICAg ICAgdGhpcy5lbGVtZW50LmJsdXIoKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHRo aXMuZWxlbWVudC5zZXRBdHRyaWJ1dGUoInRhYkluZGV4IiwgIjAiKTsKKyAgICAgICAgICAgIHRo aXMuX2NvbnRhaW5lci5zZXRBdHRyaWJ1dGUoInRhYkluZGV4IiwgIjAiKTsKICAgICAgICAgICAg IHRoaXMuX2NvbnRhaW5lci5hZGRTdHlsZUNsYXNzKCJ0ZXh0LWVkaXRvci1lZGl0YWJsZSIpOwor ICAgICAgICB9CiAgICAgICAgIHRoaXMuZW5kRG9tVXBkYXRlcygpOwogICAgIH0sCiAKKyAgICBn ZXQgcmVhZE9ubHkoKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3JlYWRPbmx5OworICAg IH0sCisKICAgICBtYXJrQW5kUmV2ZWFsUmFuZ2U6IGZ1bmN0aW9uKHJhbmdlKQogICAgIHsKICAg ICAgICAgaWYgKHRoaXMuX3JhbmdlVG9NYXJrKSB7Cg==