64081 2011-07-07 06:15:24 -0700 Web Inspector: prevent default action during drag'n'drop in the Elements panel. 2011-07-07 09:20:28 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 433403 0 pfeldman 2011-07-07 06:15:24 -0700 Patch to follow. 433405 1 99972 pfeldman 2011-07-07 06:18:09 -0700 Created attachment 99972 Patch 433407 2 99972 yurys 2011-07-07 06:23:57 -0700 Comment on attachment 99972 Patch Please make sure that ondragleave clears selection. 433410 3 99974 pfeldman 2011-07-07 06:36:23 -0700 Created attachment 99974 Patch 433497 4 pfeldman 2011-07-07 09:20:28 -0700 Committed r90561: <http://trac.webkit.org/changeset/90561> 99972 2011-07-07 06:18:09 -0700 2011-07-07 06:36:16 -0700 Patch bug-64081-20110707171806.patch text/plain 5550 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTA1NTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0Y2U1NDE5ZWVhODM4NTZj N2FmYTE5M2U1ZDY4MTdhNWQxNWI2YTRlLi4xMjRkMGJlZWU5YTYyYTg0MGEzYjliNmJiZWI5YzE2 Y2RiYTk4NjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMDcgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogcHJldmVudCBkZWZhdWx0IGFjdGlvbiBkdXJpbmcgZHJhZyduJ2Ryb3AgaW4gdGhlIEVsZW1l bnRzIHBhbmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjQwODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5fb25kcmFnc3RhcnQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLl9vbmRyYWdvdmVyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5fb25k cmFnZW5kKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzOgor ICAgICAgICAoVHJlZU91dGxpbmUucHJvdG90eXBlLnRyZWVFbGVtZW50RnJvbVBvaW50KToKKwog MjAxMS0wNy0wNyAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogU2VhcmNoaW5nIG9uIHRoZSBOZXR3b3JrIHBhbmVsIGRvZXNu J3QgZG8gYW55dGhpbmc/CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggODVmNzJhZTZhMTFjMGY4NDIw MDRjM2NmNDQ3ZmYyMDFiMmNkYjFhNC4uYWYwZjNlYTBiMzlhMjU1NzRlZDk5YzAyZjFiNjIyNGU4 YmExOGRiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtMzUsNyArMzUsNyBAQCBXZWJJbnNwZWN0 b3IuRWxlbWVudHNUcmVlT3V0bGluZSA9IGZ1bmN0aW9uKCkgewogICAgIHRoaXMuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJtb3VzZW91dCIsIHRoaXMuX29ubW91c2VvdXQuYmluZCh0aGlzKSwg ZmFsc2UpOwogICAgIHRoaXMuZWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJkcmFnc3RhcnQiLCB0 aGlzLl9vbmRyYWdzdGFydC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5lbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImRyYWdvdmVyIiwgdGhpcy5fb25kcmFnb3Zlci5iaW5kKHRoaXMpLCBm YWxzZSk7Ci0gICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdsZWF2ZSIsIHRo aXMuX29uZHJhZ2xlYXZlLmJpbmQodGhpcyksIGZhbHNlKTsKKyAgICB0aGlzLmVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigiZHJvcCIsIHRoaXMuX29uZHJvcC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAg ICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdlbmQiLCB0aGlzLl9vbmRyYWdl bmQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAgICAgVHJlZU91dGxpbmUuY2FsbCh0aGlzLCB0aGlz LmVsZW1lbnQpOwpAQCAtMjc1LDcgKzI3NSw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVP dXRsaW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAg ICBldmVudC5kYXRhVHJhbnNmZXIuc2V0RGF0YSgidGV4dC9wbGFpbiIsIHRyZWVFbGVtZW50Lmxp c3RJdGVtRWxlbWVudC50ZXh0Q29udGVudCk7Ci0gICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5l ZmZlY3RBbGxvd2VkID0gImNvcHkiOworICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuZWZmZWN0 QWxsb3dlZCA9ICJjb3B5TW92ZSI7CiAgICAgICAgIHRoaXMuX25vZGVCZWluZ0RyYWdnZWQgPSB0 cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsKIAogICAgICAgICBXZWJJbnNwZWN0b3IuaGln aGxpZ2h0RE9NTm9kZSgwKTsKQEAgLTI4OCwzMCArMjg4LDcgQEAgV2ViSW5zcGVjdG9yLkVsZW1l bnRzVHJlZU91dGxpbmUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9jbGVhckRyYWdPdmVy VHJlZUVsZW1lbnRNYXJrZXIoKTsKIAogICAgICAgICBpZiAoIXRoaXMuX25vZGVCZWluZ0RyYWdn ZWQpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIAotICAgICAgICB2YXIgdHJlZUVsZW1l bnQgPSB0aGlzLl90cmVlRWxlbWVudEZyb21FdmVudChldmVudCk7Ci0gICAgICAgIGlmICghdGhp cy5faXNWYWxpZERyYWdTb3VyY2VPclRhcmdldCh0cmVlRWxlbWVudCkpCi0gICAgICAgICAgICBy ZXR1cm47Ci0KLSAgICAgICAgdmFyIG5vZGUgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVj dDsKLSAgICAgICAgd2hpbGUgKG5vZGUpIHsKLSAgICAgICAgICAgIGlmIChub2RlID09PSB0aGlz Ll9ub2RlQmVpbmdEcmFnZ2VkKQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAg IG5vZGUgPSBub2RlLnBhcmVudE5vZGU7Ci0gICAgICAgIH0KLQotICAgICAgICB0cmVlRWxlbWVu dC51cGRhdGVTZWxlY3Rpb24oKTsKLSAgICAgICAgdHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50 LmFkZFN0eWxlQ2xhc3MoImVsZW1lbnRzLWRyYWctb3ZlciIpOwotICAgICAgICB0aGlzLl9kcmFn T3ZlclRyZWVFbGVtZW50ID0gdHJlZUVsZW1lbnQ7Ci0gICAgfSwKLQotICAgIF9vbmRyYWdsZWF2 ZTogZnVuY3Rpb24oZXZlbnQpCi0gICAgewotICAgICAgICB0aGlzLl9jbGVhckRyYWdPdmVyVHJl ZUVsZW1lbnRNYXJrZXIoKTsKLQotICAgICAgICBpZiAoIXRoaXMuX25vZGVCZWluZ0RyYWdnZWQp Ci0gICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAg IAogICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLl90cmVlRWxlbWVudEZyb21FdmVudChl dmVudCk7CiAgICAgICAgIGlmICghdGhpcy5faXNWYWxpZERyYWdTb3VyY2VPclRhcmdldCh0cmVl RWxlbWVudCkpCkBAIC0zMjAsMTMgKzI5NywxNiBAQCBXZWJJbnNwZWN0b3IuRWxlbWVudHNUcmVl T3V0bGluZS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBub2RlID0gdHJlZUVsZW1lbnQucmVw cmVzZW50ZWRPYmplY3Q7CiAgICAgICAgIHdoaWxlIChub2RlKSB7CiAgICAgICAgICAgICBpZiAo bm9kZSA9PT0gdGhpcy5fbm9kZUJlaW5nRHJhZ2dlZCkKLSAgICAgICAgICAgICAgICByZXR1cm47 CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgbm9kZSA9IG5vZGUu cGFyZW50Tm9kZTsKICAgICAgICAgfQogCiAgICAgICAgIHRyZWVFbGVtZW50LnVwZGF0ZVNlbGVj dGlvbigpOwogICAgICAgICB0cmVlRWxlbWVudC5saXN0SXRlbUVsZW1lbnQuYWRkU3R5bGVDbGFz cygiZWxlbWVudHMtZHJhZy1vdmVyIik7CiAgICAgICAgIHRoaXMuX2RyYWdPdmVyVHJlZUVsZW1l bnQgPSB0cmVlRWxlbWVudDsKKyAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKKyAgICAg ICAgZXZlbnQuZGF0YVRyYW5zZmVyLmRyb3BFZmZlY3QgPSAnbW92ZSc7CisgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9LAogCiAgICAgX2lzVmFsaWREcmFnU291cmNlT3JUYXJnZXQ6IGZ1bmN0 aW9uKHRyZWVFbGVtZW50KQpAQCAtMzQ3LDggKzMyNyw5IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50 c1RyZWVPdXRsaW5lLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwK IAotICAgIF9vbmRyYWdlbmQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIF9vbmRyb3A6IGZ1bmN0aW9u KGV2ZW50KQogICAgIHsKKyAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKICAgICAgICAg aWYgKHRoaXMuX25vZGVCZWluZ0RyYWdnZWQgJiYgdGhpcy5fZHJhZ092ZXJUcmVlRWxlbWVudCkg ewogICAgICAgICAgICAgdmFyIHBhcmVudE5vZGU7CiAgICAgICAgICAgICB2YXIgYW5jaG9yTm9k ZTsKQEAgLTM3OSw2ICszNjAsMTMgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUu cHJvdG90eXBlID0gewogICAgICAgICBkZWxldGUgdGhpcy5fbm9kZUJlaW5nRHJhZ2dlZDsKICAg ICB9LAogCisgICAgX29uZHJhZ2VuZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICBl dmVudC5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICB0aGlzLl9jbGVhckRyYWdPdmVyVHJlZUVs ZW1lbnRNYXJrZXIoKTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX25vZGVCZWluZ0RyYWdnZWQ7Cisg ICAgfSwKKwogICAgIF9jbGVhckRyYWdPdmVyVHJlZUVsZW1lbnRNYXJrZXI6IGZ1bmN0aW9uKCkK ICAgICB7CiAgICAgICAgIGlmICh0aGlzLl9kcmFnT3ZlclRyZWVFbGVtZW50KSB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcwppbmRleCAy N2JjODM5MTExOTYwZGIwMTM1Y2VmODNlNjgzZDc4MDRmYWQ3YzlmLi4wNGEyMTg3MmU0N2I1ZmVh MGRlNzBiOWQzNjc3YjRjODZlYTQ0M2FmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvdHJlZW91dGxpbmUuanMKQEAgLTMzMiw2ICszMzIsOSBAQCBUcmVlT3V0 bGluZS5wcm90b3R5cGUuZmluZFRyZWVFbGVtZW50ID0gZnVuY3Rpb24ocmVwcmVzZW50ZWRPYmpl Y3QsIGlzQW5jZXN0b3IsCiBUcmVlT3V0bGluZS5wcm90b3R5cGUudHJlZUVsZW1lbnRGcm9tUG9p bnQgPSBmdW5jdGlvbih4LCB5KQogewogICAgIHZhciBub2RlID0gdGhpcy5fY2hpbGRyZW5MaXN0 Tm9kZS5vd25lckRvY3VtZW50LmVsZW1lbnRGcm9tUG9pbnQoeCwgeSk7CisgICAgaWYgKCFub2Rl KQorICAgICAgICByZXR1cm4gbnVsbDsKKwogICAgIHZhciBsaXN0Tm9kZSA9IG5vZGUuZW5jbG9z aW5nTm9kZU9yU2VsZldpdGhOb2RlTmFtZUluQXJyYXkoWyJvbCIsICJsaSJdKTsKICAgICBpZiAo bGlzdE5vZGUpCiAgICAgICAgIHJldHVybiBsaXN0Tm9kZS5wYXJlbnRUcmVlRWxlbWVudCB8fCBs aXN0Tm9kZS50cmVlRWxlbWVudDsK 99974 2011-07-07 06:36:23 -0700 2011-07-07 06:39:53 -0700 Patch bug-64081-20110707173621.patch text/plain 6307 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTA1NTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0Y2U1NDE5ZWVhODM4NTZj N2FmYTE5M2U1ZDY4MTdhNWQxNWI2YTRlLi4xMjRkMGJlZWU5YTYyYTg0MGEzYjliNmJiZWI5YzE2 Y2RiYTk4NjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMDcgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogcHJldmVudCBkZWZhdWx0IGFjdGlvbiBkdXJpbmcgZHJhZyduJ2Ryb3AgaW4gdGhlIEVsZW1l bnRzIHBhbmVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjQwODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5fb25kcmFnc3RhcnQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlLl9vbmRyYWdvdmVyKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZS5fb25k cmFnZW5kKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzOgor ICAgICAgICAoVHJlZU91dGxpbmUucHJvdG90eXBlLnRyZWVFbGVtZW50RnJvbVBvaW50KToKKwog MjAxMS0wNy0wNyAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgV2ViIEluc3BlY3RvcjogU2VhcmNoaW5nIG9uIHRoZSBOZXR3b3JrIHBhbmVsIGRvZXNu J3QgZG8gYW55dGhpbmc/CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKaW5kZXggODVmNzJhZTZhMTFjMGY4NDIw MDRjM2NmNDQ3ZmYyMDFiMmNkYjFhNC4uMDM3NTMxODM3YWEwZWJjYWUxOTc5MzJlYjU5MTM0NzJk MWEwNjljYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9F bGVtZW50c1RyZWVPdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcwpAQCAtMzYsNiArMzYsNyBAQCBXZWJJbnNwZWN0 b3IuRWxlbWVudHNUcmVlT3V0bGluZSA9IGZ1bmN0aW9uKCkgewogICAgIHRoaXMuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJkcmFnc3RhcnQiLCB0aGlzLl9vbmRyYWdzdGFydC5iaW5kKHRoaXMp LCBmYWxzZSk7CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoImRyYWdvdmVyIiwg dGhpcy5fb25kcmFnb3Zlci5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5lbGVtZW50LmFk ZEV2ZW50TGlzdGVuZXIoImRyYWdsZWF2ZSIsIHRoaXMuX29uZHJhZ2xlYXZlLmJpbmQodGhpcyks IGZhbHNlKTsKKyAgICB0aGlzLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiZHJvcCIsIHRoaXMu X29uZHJvcC5iaW5kKHRoaXMpLCBmYWxzZSk7CiAgICAgdGhpcy5lbGVtZW50LmFkZEV2ZW50TGlz dGVuZXIoImRyYWdlbmQiLCB0aGlzLl9vbmRyYWdlbmQuYmluZCh0aGlzKSwgZmFsc2UpOwogCiAg ICAgVHJlZU91dGxpbmUuY2FsbCh0aGlzLCB0aGlzLmVsZW1lbnQpOwpAQCAtMjc1LDcgKzI3Niw3 IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZSA9IHsKICAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICBldmVudC5kYXRhVHJhbnNmZXIuc2V0RGF0 YSgidGV4dC9wbGFpbiIsIHRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC50ZXh0Q29udGVudCk7 Ci0gICAgICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5lZmZlY3RBbGxvd2VkID0gImNvcHkiOworICAg ICAgICBldmVudC5kYXRhVHJhbnNmZXIuZWZmZWN0QWxsb3dlZCA9ICJjb3B5TW92ZSI7CiAgICAg ICAgIHRoaXMuX25vZGVCZWluZ0RyYWdnZWQgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVj dDsKIAogICAgICAgICBXZWJJbnNwZWN0b3IuaGlnaGxpZ2h0RE9NTm9kZSgwKTsKQEAgLTI4NSw0 OCArMjg2LDMzIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZSA9 IHsKIAogICAgIF9vbmRyYWdvdmVyOiBmdW5jdGlvbihldmVudCkKICAgICB7Ci0gICAgICAgIHRo aXMuX2NsZWFyRHJhZ092ZXJUcmVlRWxlbWVudE1hcmtlcigpOwotCiAgICAgICAgIGlmICghdGhp cy5fbm9kZUJlaW5nRHJhZ2dlZCkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICAgICAgCiAgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IHRoaXMuX3Ry ZWVFbGVtZW50RnJvbUV2ZW50KGV2ZW50KTsKICAgICAgICAgaWYgKCF0aGlzLl9pc1ZhbGlkRHJh Z1NvdXJjZU9yVGFyZ2V0KHRyZWVFbGVtZW50KSkKLSAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAgICB2YXIgbm9kZSA9IHRyZWVFbGVtZW50LnJl cHJlc2VudGVkT2JqZWN0OwogICAgICAgICB3aGlsZSAobm9kZSkgewogICAgICAgICAgICAgaWYg KG5vZGUgPT09IHRoaXMuX25vZGVCZWluZ0RyYWdnZWQpCi0gICAgICAgICAgICAgICAgcmV0dXJu OworICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIG5vZGUgPSBub2Rl LnBhcmVudE5vZGU7CiAgICAgICAgIH0KIAogICAgICAgICB0cmVlRWxlbWVudC51cGRhdGVTZWxl Y3Rpb24oKTsKICAgICAgICAgdHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmFkZFN0eWxlQ2xh c3MoImVsZW1lbnRzLWRyYWctb3ZlciIpOwogICAgICAgICB0aGlzLl9kcmFnT3ZlclRyZWVFbGVt ZW50ID0gdHJlZUVsZW1lbnQ7CisgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAg ICAgIGV2ZW50LmRhdGFUcmFuc2Zlci5kcm9wRWZmZWN0ID0gJ21vdmUnOworICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgfSwKIAogICAgIF9vbmRyYWdsZWF2ZTogZnVuY3Rpb24oZXZlbnQpCiAg ICAgewogICAgICAgICB0aGlzLl9jbGVhckRyYWdPdmVyVHJlZUVsZW1lbnRNYXJrZXIoKTsKLQot ICAgICAgICBpZiAoIXRoaXMuX25vZGVCZWluZ0RyYWdnZWQpCi0gICAgICAgICAgICByZXR1cm47 Ci0gICAgICAgIAotICAgICAgICB2YXIgdHJlZUVsZW1lbnQgPSB0aGlzLl90cmVlRWxlbWVudEZy b21FdmVudChldmVudCk7Ci0gICAgICAgIGlmICghdGhpcy5faXNWYWxpZERyYWdTb3VyY2VPclRh cmdldCh0cmVlRWxlbWVudCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICAgICAg dmFyIG5vZGUgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsKLSAgICAgICAgd2hpbGUg KG5vZGUpIHsKLSAgICAgICAgICAgIGlmIChub2RlID09PSB0aGlzLl9ub2RlQmVpbmdEcmFnZ2Vk KQotICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIG5vZGUgPSBub2RlLnBhcmVu dE5vZGU7Ci0gICAgICAgIH0KLQotICAgICAgICB0cmVlRWxlbWVudC51cGRhdGVTZWxlY3Rpb24o KTsKLSAgICAgICAgdHJlZUVsZW1lbnQubGlzdEl0ZW1FbGVtZW50LmFkZFN0eWxlQ2xhc3MoImVs ZW1lbnRzLWRyYWctb3ZlciIpOwotICAgICAgICB0aGlzLl9kcmFnT3ZlclRyZWVFbGVtZW50ID0g dHJlZUVsZW1lbnQ7CisgICAgICAgIGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CisgICAgICAgIHJl dHVybiBmYWxzZTsKICAgICB9LAogCiAgICAgX2lzVmFsaWREcmFnU291cmNlT3JUYXJnZXQ6IGZ1 bmN0aW9uKHRyZWVFbGVtZW50KQpAQCAtMzQ3LDE3ICszMzMsMTkgQEAgV2ViSW5zcGVjdG9yLkVs ZW1lbnRzVHJlZU91dGxpbmUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4gdHJ1ZTsKICAg ICB9LAogCi0gICAgX29uZHJhZ2VuZDogZnVuY3Rpb24oZXZlbnQpCisgICAgX29uZHJvcDogZnVu Y3Rpb24oZXZlbnQpCiAgICAgewotICAgICAgICBpZiAodGhpcy5fbm9kZUJlaW5nRHJhZ2dlZCAm JiB0aGlzLl9kcmFnT3ZlclRyZWVFbGVtZW50KSB7CisgICAgICAgIGV2ZW50LnByZXZlbnREZWZh dWx0KCk7CisgICAgICAgIHZhciB0cmVlRWxlbWVudCA9IHRoaXMuX3RyZWVFbGVtZW50RnJvbUV2 ZW50KGV2ZW50KTsKKyAgICAgICAgaWYgKHRoaXMuX25vZGVCZWluZ0RyYWdnZWQgJiYgdHJlZUVs ZW1lbnQpIHsKICAgICAgICAgICAgIHZhciBwYXJlbnROb2RlOwogICAgICAgICAgICAgdmFyIGFu Y2hvck5vZGU7CiAKLSAgICAgICAgICAgIGlmICh0aGlzLl9kcmFnT3ZlclRyZWVFbGVtZW50Ll9l bGVtZW50Q2xvc2VUYWcpIHsKKyAgICAgICAgICAgIGlmICh0cmVlRWxlbWVudC5fZWxlbWVudENs b3NlVGFnKSB7CiAgICAgICAgICAgICAgICAgLy8gRHJvcCBvbnRvIGNsb3NpbmcgdGFnIC0+IGlu c2VydCBhcyBsYXN0IGNoaWxkLgotICAgICAgICAgICAgICAgIHBhcmVudE5vZGUgPSB0aGlzLl9k cmFnT3ZlclRyZWVFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0OworICAgICAgICAgICAgICAgIHBh cmVudE5vZGUgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsKICAgICAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAgICAgdmFyIGRyYWdUYXJnZXROb2RlID0gdGhpcy5fZHJhZ092 ZXJUcmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsKKyAgICAgICAgICAgICAgICB2YXIgZHJh Z1RhcmdldE5vZGUgPSB0cmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdDsKICAgICAgICAgICAg ICAgICBwYXJlbnROb2RlID0gZHJhZ1RhcmdldE5vZGUucGFyZW50Tm9kZTsKICAgICAgICAgICAg ICAgICBhbmNob3JOb2RlID0gZHJhZ1RhcmdldE5vZGU7CiAgICAgICAgICAgICB9CkBAIC0zNzQs NyArMzYyLDEzIEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVPdXRsaW5lLnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHRoaXMuX25vZGVCZWluZ0RyYWdnZWQubW92 ZVRvKHBhcmVudE5vZGUsIGFuY2hvck5vZGUsIGNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgICAg ICB9Ci0gICAgICAgIAorCisgICAgICAgIGRlbGV0ZSB0aGlzLl9ub2RlQmVpbmdEcmFnZ2VkOwor ICAgIH0sCisKKyAgICBfb25kcmFnZW5kOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAgICAg IGV2ZW50LnByZXZlbnREZWZhdWx0KCk7CiAgICAgICAgIHRoaXMuX2NsZWFyRHJhZ092ZXJUcmVl RWxlbWVudE1hcmtlcigpOwogICAgICAgICBkZWxldGUgdGhpcy5fbm9kZUJlaW5nRHJhZ2dlZDsK ICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90 cmVlb3V0bGluZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdHJlZW91 dGxpbmUuanMKaW5kZXggMjdiYzgzOTExMTk2MGRiMDEzNWNlZjgzZTY4M2Q3ODA0ZmFkN2M5Zi4u MDRhMjE4NzJlNDdiNWZlYTBkZTcwYjlkMzY3N2I0Yzg2ZWE0NDNhZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzCkBAIC0zMzIsNiAr MzMyLDkgQEAgVHJlZU91dGxpbmUucHJvdG90eXBlLmZpbmRUcmVlRWxlbWVudCA9IGZ1bmN0aW9u KHJlcHJlc2VudGVkT2JqZWN0LCBpc0FuY2VzdG9yLAogVHJlZU91dGxpbmUucHJvdG90eXBlLnRy ZWVFbGVtZW50RnJvbVBvaW50ID0gZnVuY3Rpb24oeCwgeSkKIHsKICAgICB2YXIgbm9kZSA9IHRo aXMuX2NoaWxkcmVuTGlzdE5vZGUub3duZXJEb2N1bWVudC5lbGVtZW50RnJvbVBvaW50KHgsIHkp OworICAgIGlmICghbm9kZSkKKyAgICAgICAgcmV0dXJuIG51bGw7CisKICAgICB2YXIgbGlzdE5v ZGUgPSBub2RlLmVuY2xvc2luZ05vZGVPclNlbGZXaXRoTm9kZU5hbWVJbkFycmF5KFsib2wiLCAi bGkiXSk7CiAgICAgaWYgKGxpc3ROb2RlKQogICAgICAgICByZXR1cm4gbGlzdE5vZGUucGFyZW50 VHJlZUVsZW1lbnQgfHwgbGlzdE5vZGUudHJlZUVsZW1lbnQ7Cg==