60271 2011-05-05 08:44:45 -0700 Web Inspector: move double click handling from TextEditor to SourceFrame. 2011-05-16 03:15:39 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 398736 0 podivilov 2011-05-05 08:44:45 -0700 It is SourceFrame's responsibility to check if content is editable and to configure TextEditor component (e.g. set editable range) when user tries to initiate editing. 398743 1 92422 podivilov 2011-05-05 08:48:23 -0700 Created attachment 92422 Patch. 398744 2 podivilov 2011-05-05 08:49:12 -0700 Also renamed two delegate's methods: startEditing -> beforeTextChanged endEditing -> afterTextChanged 404396 3 podivilov 2011-05-16 03:15:39 -0700 Committed r86552: <http://trac.webkit.org/changeset/86552> 92422 2011-05-05 08:48:23 -0700 2011-05-13 11:15:53 -0700 Patch. patch text/plain 9494 podivilov ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3Y2E4OGQ2Li4wYmM4MDg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTEtMDUtMDUgIFBhdmVsIFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIElu c3BlY3RvcjogbW92ZSBkb3VibGUgY2xpY2sgaGFuZGxpbmcgZnJvbSBUZXh0RWRpdG9yIHRvIFNv dXJjZUZyYW1lLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjAyNzEKKworICAgICAgICBJdCBpcyBTb3VyY2VGcmFtZSdzIHJlc3BvbnNpYmlsaXR5IHRv IGNoZWNrIGlmIGNvbnRlbnQgaXMgZWRpdGFibGUgYW5kCisgICAgICAgIHRvIGNvbmZpZ3VyZSBU ZXh0RWRpdG9yIGNvbXBvbmVudCAoZS5nLiBzZXQgZWRpdGFibGUgcmFuZ2UpIHdoZW4gdXNlcgor ICAgICAgICB0cmllcyB0byBpbml0aWF0ZSBlZGl0aW5nLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VTb3VyY2VGcmFtZS5wcm90b3R5cGUuZG91YmxlQ2xpY2spOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJldmlzaW9uU291cmNlRnJhbWUucHJvdG90eXBlLmRvdWJsZUNsaWNrKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5iZWZvcmVUZXh0Q2hhbmdlZCk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmFmdGVyVGV4dENoYW5nZWQpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5kb3VibGVDbGljayk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmNvbW1pdEVkaXRpbmcu ZGlkRWRpdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3Rv dHlwZS5jb21taXRFZGl0aW5nKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5w cm90b3R5cGUuY2FuY2VsRWRpdGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUucHJvdG90eXBlLl9zZXRSZWFkT25seSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90 eXBlLnNldCByZWFkT25seSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90 b3R5cGUuX2VudGVySW50ZXJuYWxUZXh0Q2hhbmdlTW9kZSk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGV4dFZpZXdlci5wcm90b3R5cGUuX2V4aXRJbnRlcm5hbFRleHRDaGFuZ2VNb2RlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZS5fZG91YmxlQ2xpY2spOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlLl9jb21taXRFZGl0aW5n KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZS5fY2FuY2VsRWRp dGluZyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVnYXRlLnByb3RvdHlw ZS5kb3VibGVDbGljayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVnYXRl LnByb3RvdHlwZS5iZWZvcmVUZXh0Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4 dFZpZXdlckRlbGVnYXRlLnByb3RvdHlwZS5hZnRlclRleHRDaGFuZ2VkKToKKwogMjAxMS0wNS0w NCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwppbmRleCBhM2QyYjQyLi5iNGFmNzNlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcwpA QCAtMTM2LDkgKzEzNiwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJjZTsKICAgICB9LAogCi0gICAg aXNDb250ZW50RWRpdGFibGU6IGZ1bmN0aW9uKCkKKyAgICBkb3VibGVDbGljazogZnVuY3Rpb24o bGluZU51bWJlcikKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJjZS5pc0VkaXRh YmxlKCk7CisgICAgICAgIGlmICghdGhpcy5fcmVzb3VyY2UuaXNFZGl0YWJsZSgpKQorICAgICAg ICAgICAgcmV0dXJuOworICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnNldFJlYWRPbmx5KGZhbHNl KTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLm1hcmtCZWluZ0VkaXRlZCh0aGlzLl90ZXh0Vmlld2Vy LmVsZW1lbnQsIHRydWUpOwogICAgIH0sCiAKICAgICBlZGl0Q29udGVudDogZnVuY3Rpb24obmV3 VGV4dCwgY2FsbGJhY2spCkBAIC0xNDgsNyArMTUxLDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9yZXNvdXJjZS5zZXRDb250 ZW50KG5ld1RleHQsIG1ham9yQ2hhbmdlLCBjYWxsYmFjayk7CiAgICAgfSwKIAotICAgIGVuZEVk aXRpbmc6IGZ1bmN0aW9uKG9sZFJhbmdlLCBuZXdSYW5nZSkKKyAgICBhZnRlclRleHRDaGFuZ2Vk OiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCiAgICAgewogICAgICAgICBmdW5jdGlvbiBj b21taXRJbmNyZW1lbnRhbEVkaXQoKQogICAgICAgICB7CkBAIC0xOTYsOSArMTk5LDggQEAgV2Vi SW5zcGVjdG9yLlJldmlzaW9uU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICByZXR1 cm4gdGhpcy5fcmV2aXNpb24ucmVzb3VyY2U7CiAgICAgfSwKIAotICAgIGlzQ29udGVudEVkaXRh YmxlOiBmdW5jdGlvbigpCisgICAgZG91YmxlQ2xpY2s6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpCiAg ICAgewotICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfSwKIAogICAgIHJlcXVlc3RDb250ZW50 OiBmdW5jdGlvbihjYWxsYmFjaykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NvdXJjZUZyYW1lLmpzCmluZGV4IDZkN2UxNzEuLmVhZmUxZmEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwpAQCAtMjMz LDE3ICsyMzMsNyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAg ICAgICBkZWxldGUgdGhpcy5fdmlld2VyU3RhdGU7CiAgICAgfSwKIAotICAgIGlzQ29udGVudEVk aXRhYmxlOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fZGVsZWdhdGUu Y2FuRWRpdFNjcmlwdFNvdXJjZSgpOwotICAgIH0sCi0KLSAgICByZWFkT25seVN0YXRlQ2hhbmdl ZDogZnVuY3Rpb24ocmVhZE9ubHkpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IubWFya0Jl aW5nRWRpdGVkKHRoaXMuX3RleHRWaWV3ZXIuZWxlbWVudCwgIXJlYWRPbmx5KTsKLSAgICB9LAot Ci0gICAgc3RhcnRFZGl0aW5nOiBmdW5jdGlvbigpCisgICAgYmVmb3JlVGV4dENoYW5nZWQ6IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGlmICghdGhpcy5fdmlld2VyU3RhdGUpIHsKICAgICAg ICAgICAgIHRoaXMuX3NhdmVWaWV3ZXJTdGF0ZSgpOwpAQCAtMjU0LDcgKzI0NCw3IEBAIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuY2xlYXJNZXNz YWdlcygpOwogICAgIH0sCiAKLSAgICBlbmRFZGl0aW5nOiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3 UmFuZ2UpCisgICAgYWZ0ZXJUZXh0Q2hhbmdlZDogZnVuY3Rpb24ob2xkUmFuZ2UsIG5ld1Jhbmdl KQogICAgIHsKICAgICAgICAgaWYgKCFvbGRSYW5nZSB8fCAhbmV3UmFuZ2UpCiAgICAgICAgICAg ICByZXR1cm47CkBAIC04ODMsMjMgKzg3MywzNSBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlc2l6ZSgpOwogICAgIH0s CiAKKyAgICBkb3VibGVDbGljazogZnVuY3Rpb24obGluZU51bWJlcikKKyAgICB7CisgICAgICAg IGlmICghdGhpcy5fZGVsZWdhdGUuY2FuRWRpdFNjcmlwdFNvdXJjZSgpKQorICAgICAgICAgICAg cmV0dXJuOworCisgICAgICAgIGlmICh0aGlzLl9jb21taXRFZGl0aW5nSW5Qcm9ncmVzcykKKyAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICB0aGlzLl9zZXRSZWFkT25seShmYWxzZSk7Cisg ICAgfSwKKwogICAgIGNvbW1pdEVkaXRpbmc6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKICAg ICAgICAgaWYgKCF0aGlzLl92aWV3ZXJTdGF0ZSkgewogICAgICAgICAgICAgLy8gTm8gZWRpdGlu ZyB3YXMgYWN0dWFsbHkgZG9uZS4KLSAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnNldFNjcmlw dFNvdXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOworICAgICAgICAgICAgdGhpcy5fc2V0UmVhZE9u bHkodHJ1ZSk7CiAgICAgICAgICAgICBjYWxsYmFjaygpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gZGlkRWRpdENvbnRlbnQoZXJyb3IpCiAgICAg ICAgIHsKKyAgICAgICAgICAgIHRoaXMuX2NvbW1pdEVkaXRpbmdJblByb2dyZXNzID0gZmFsc2U7 CiAgICAgICAgICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgICAgICAgICBpZiAoZXJyb3IuZGF0 YSAmJiBlcnJvci5kYXRhWzBdKSB7CiAgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5s b2coZXJyb3IuZGF0YVswXSwgV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VMZXZl bC5FcnJvcik7CiAgICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93Q29uc29sZSgp OwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBjYWxsYmFjayhlcnJvcik7Cisg ICAgICAgICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seSA9IGZhbHNlOwogICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KIApAQCAtOTE4LDEwICs5MjAsMTAgQEAg V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0KIAog ICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3ZpZXdlclN0YXRlOwotICAgICAgICAgICAgdGhpcy5f ZGVsZWdhdGUuc2V0U2NyaXB0U291cmNlSXNCZWluZ0VkaXRlZChmYWxzZSk7Ci0KLSAgICAgICAg ICAgIGNhbGxiYWNrKCk7CisgICAgICAgICAgICB0aGlzLl9zZXRSZWFkT25seSh0cnVlKTsKICAg ICAgICAgfQorICAgICAgICB0aGlzLl9jb21taXRFZGl0aW5nSW5Qcm9ncmVzcyA9IHRydWU7Cisg ICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkgPSB0cnVlOwogICAgICAgICB0aGlzLmVk aXRDb250ZW50KHRoaXMuX3RleHRNb2RlbC50ZXh0LCBkaWRFZGl0Q29udGVudC5iaW5kKHRoaXMp KTsKICAgICB9LAogCkBAIC05MzMsNyArOTM1LDE1IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFt ZS5wcm90b3R5cGUgPSB7CiAgICAgY2FuY2VsRWRpdGluZzogZnVuY3Rpb24oKQogICAgIHsKICAg ICAgICAgdGhpcy5fcmVzdG9yZVZpZXdlclN0YXRlKCk7Ci0gICAgICAgIHRoaXMuX2RlbGVnYXRl LnNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOworICAgICAgICB0aGlzLl9zZXRS ZWFkT25seSh0cnVlKTsKKyAgICB9LAorCisgICAgX3NldFJlYWRPbmx5OiBmdW5jdGlvbihyZWFk T25seSkKKyAgICB7CisgICAgICAgIHRoaXMuX3RleHRWaWV3ZXIucmVhZE9ubHkgPSByZWFkT25s eTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLm1hcmtCZWluZ0VkaXRlZCh0aGlzLl90ZXh0Vmlld2Vy LmVsZW1lbnQsICFyZWFkT25seSk7CisgICAgICAgIGlmIChyZWFkT25seSkKKyAgICAgICAgICAg IHRoaXMuX2RlbGVnYXRlLnNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQoZmFsc2UpOwogICAg IH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9U ZXh0Vmlld2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmll d2VyLmpzCmluZGV4IGFiMGNkM2YuLmQ1YjBjMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGV4dFZpZXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RleHRWaWV3ZXIuanMKQEAgLTcyLDcgKzcyLDYgQEAgV2ViSW5z cGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5fbWFpblBh bmVsLnJlYWRPbmx5ID09PSByZWFkT25seSkKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg dGhpcy5fbWFpblBhbmVsLnJlYWRPbmx5ID0gcmVhZE9ubHk7Ci0gICAgICAgIHRoaXMuX2RlbGVn YXRlLnJlYWRPbmx5U3RhdGVDaGFuZ2VkKHJlYWRPbmx5KTsKICAgICB9LAogCiAgICAgZ2V0IHJl YWRPbmx5KCkKQEAgLTE3NywxMyArMTc2LDEzIEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyLnBy b3RvdHlwZSA9IHsKICAgICBfZW50ZXJJbnRlcm5hbFRleHRDaGFuZ2VNb2RlOiBmdW5jdGlvbigp CiAgICAgewogICAgICAgICB0aGlzLl9pbnRlcm5hbFRleHRDaGFuZ2VNb2RlID0gdHJ1ZTsKLSAg ICAgICAgdGhpcy5fZGVsZWdhdGUuc3RhcnRFZGl0aW5nKCk7CisgICAgICAgIHRoaXMuX2RlbGVn YXRlLmJlZm9yZVRleHRDaGFuZ2VkKCk7CiAgICAgfSwKIAogICAgIF9leGl0SW50ZXJuYWxUZXh0 Q2hhbmdlTW9kZTogZnVuY3Rpb24ob2xkUmFuZ2UsIG5ld1JhbmdlKQogICAgIHsKICAgICAgICAg dGhpcy5faW50ZXJuYWxUZXh0Q2hhbmdlTW9kZSA9IGZhbHNlOwotICAgICAgICB0aGlzLl9kZWxl Z2F0ZS5lbmRFZGl0aW5nKG9sZFJhbmdlLCBuZXdSYW5nZSk7CisgICAgICAgIHRoaXMuX2RlbGVn YXRlLmFmdGVyVGV4dENoYW5nZWQob2xkUmFuZ2UsIG5ld1JhbmdlKTsKICAgICB9LAogCiAgICAg X3VwZGF0ZVBhbmVsT2Zmc2V0czogZnVuY3Rpb24oKQpAQCAtMjI5LDE4ICsyMjgsMTQgQEAgV2Vi SW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90eXBlID0gewogCiAgICAgX2RvdWJsZUNsaWNrOiBm dW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5yZWFkT25seSB8fCB0aGlz Ll9jb21taXRFZGl0aW5nSW5Qcm9ncmVzcykKKyAgICAgICAgaWYgKCF0aGlzLnJlYWRPbmx5KQog ICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHZhciBsaW5lUm93ID0gZXZlbnQudGFyZ2V0 LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoIndlYmtpdC1saW5lLWNvbnRlbnQiKTsKICAg ICAgICAgaWYgKCFsaW5lUm93KQogICAgICAgICAgICAgcmV0dXJuOyAgLy8gRG8gbm90IHRyaWdn ZXIgZWRpdGluZyBmcm9tIGxpbmUgbnVtYmVycy4KIAotICAgICAgICBpZiAoIXRoaXMuX2RlbGVn YXRlLmlzQ29udGVudEVkaXRhYmxlKCkpCi0gICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAg dGhpcy5yZWFkT25seSA9IGZhbHNlOwotICAgICAgICB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuY29s bGFwc2VUb1N0YXJ0KCk7CisgICAgICAgIHRoaXMuX2RlbGVnYXRlLmRvdWJsZUNsaWNrKGxpbmVS b3cubGluZU51bWJlcik7CiAgICAgfSwKIAogICAgIF9yZWdpc3RlclNob3J0Y3V0czogZnVuY3Rp b24oKQpAQCAtMzAxLDE1ICsyOTYsNyBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5 cGUgPSB7CiAgICAgICAgIGlmICh0aGlzLnJlYWRPbmx5KQogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwogCi0gICAgICAgIHRoaXMucmVhZE9ubHkgPSB0cnVlOwotICAgICAgICBmdW5jdGlvbiBk aWRDb21taXRFZGl0aW5nKGVycm9yKQotICAgICAgICB7Ci0gICAgICAgICAgICB0aGlzLl9jb21t aXRFZGl0aW5nSW5Qcm9ncmVzcyA9IGZhbHNlOwotICAgICAgICAgICAgaWYgKGVycm9yKQotICAg ICAgICAgICAgICAgIHRoaXMucmVhZE9ubHkgPSBmYWxzZTsKLSAgICAgICAgfQotICAgICAgICB0 aGlzLl9jb21taXRFZGl0aW5nSW5Qcm9ncmVzcyA9IHRydWU7Ci0gICAgICAgIHRoaXMuX2RlbGVn YXRlLmNvbW1pdEVkaXRpbmcoZGlkQ29tbWl0RWRpdGluZy5iaW5kKHRoaXMpKTsKKyAgICAgICAg dGhpcy5fZGVsZWdhdGUuY29tbWl0RWRpdGluZygpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9LAogCkBAIC0zMTgsNyArMzA1LDYgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIucHJvdG90 eXBlID0gewogICAgICAgICBpZiAodGhpcy5yZWFkT25seSkKICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKIAotICAgICAgICB0aGlzLnJlYWRPbmx5ID0gdHJ1ZTsKICAgICAgICAgdGhpcy5fZGVs ZWdhdGUuY2FuY2VsRWRpdGluZygpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CkBAIC0z MzEsMjIgKzMxNywxNyBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVnYXRlID0gZnVuY3Rp b24oKQogfQogCiBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVnYXRlLnByb3RvdHlwZSA9IHsK LSAgICBpc0NvbnRlbnRFZGl0YWJsZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgLy8gU2hv dWxkIGJlIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCi0gICAgfSwKLQotICAgIHJlYWRPbmx5 U3RhdGVDaGFuZ2VkOiBmdW5jdGlvbihyZWFkT25seSkKKyAgICBkb3VibGVDbGljazogZnVuY3Rp b24obGluZU51bWJlcikKICAgICB7CiAgICAgICAgIC8vIFNob3VsZCBiZSBpbXBsZW1lbnRlZCBi eSBzdWJjbGFzc2VzLgogICAgIH0sCiAKLSAgICBzdGFydEVkaXRpbmc6IGZ1bmN0aW9uKCkKKyAg ICBiZWZvcmVUZXh0Q2hhbmdlZDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgLy8gU2hvdWxk IGJlIGltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMuCiAgICAgfSwKIAotICAgIGVuZEVkaXRpbmc6 IGZ1bmN0aW9uKG9sZFJhbmdlLCBuZXdSYW5nZSkKKyAgICBhZnRlclRleHRDaGFuZ2VkOiBmdW5j dGlvbihvbGRSYW5nZSwgbmV3UmFuZ2UpCiAgICAgewogICAgICAgICAvLyBTaG91bGQgYmUgaW1w bGVtZW50ZWQgYnkgc3ViY2xhc3Nlcy4KICAgICB9LAo=