94818 2012-08-23 08:11:16 -0700 Web Inspector: make treeoutline.js compiler-friendly 2012-08-23 11:07:14 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 94829 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 703001 0 pfeldman 2012-08-23 08:11:16 -0700 This change declares base methods on TreeElement so that we did not need to check for their existence. 703009 1 160167 pfeldman 2012-08-23 08:16:45 -0700 Created attachment 160167 Patch 703012 2 160167 apavlov 2012-08-23 08:21:28 -0700 Comment on attachment 160167 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160167&action=review > Source/WebCore/inspector/front-end/treeoutline.js:1014 > +// Overriden by subclasses. typo: "Overridden" 703023 3 pfeldman 2012-08-23 08:36:26 -0700 Committed r126430: <http://trac.webkit.org/changeset/126430> 160167 2012-08-23 08:16:45 -0700 2012-08-23 08:21:28 -0700 Patch bug-94818-20120823191641.patch text/plain 13057 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDFiZDhjZDdiNjlhMmNi YjNmMzljYzgwMzFjODZlNDBmMTg0ODZhYy4uMjc1NTU3N2FmZTY5NzIxYjEyZmE4NTllNjRkYmZi N2M4OGE1YzJmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ1IEBACiAyMDEyLTA4LTIzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1ha2UgdHJlZW91dGxpbmUuanMgY29tcGlsZXItZnJpZW5kbHkKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0ODE4CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZGVjbGFyZXMgYmFz ZSBtZXRob2RzIG9uIFRyZWVFbGVtZW50IHNvIHRoYXQgd2UgZGlkIG5vdCBuZWVkIHRvIGNoZWNr IGZvciB0aGVpciBleGlzdGVuY2UuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Fk dmFuY2VkU2VhcmNoQ29udHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlQmFz ZWRTZWFyY2hSZXN1bHRzUGFuZS5wcm90b3R5cGUuX2FwcGVuZFNob3dNb3JlTWF0Y2hlc0VsZW1l bnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVCYXNlZFNlYXJjaFJlc3VsdHNQYW5lLnBy b3RvdHlwZS5fYWRkRmlsZVRyZWVFbGVtZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRWxlbWVu dHNUcmVlRWxlbWVudC5wcm90b3R5cGUub25zZWxlY3QpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBh bmUucHJvdG90eXBlLmV4cGFuZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUu cHJvdG90eXBlLm9uZXhwYW5kKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TaWRlYmFyUGFuZS5w cm90b3R5cGUuY29sbGFwc2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvdHJlZW91 dGxpbmUuanM6CisgICAgICAgIChUcmVlT3V0bGluZS5wcm90b3R5cGUuX3RyZWVLZXlEb3duKToK KyAgICAgICAgKFRyZWVPdXRsaW5lLnByb3RvdHlwZS5fc2VhcmNoSW5wdXRLZXlEb3duKToKKyAg ICAgICAgKFRyZWVFbGVtZW50LnByb3RvdHlwZS5fZmlyZURpZENoYW5nZSk6CisgICAgICAgIChU cmVlRWxlbWVudC5wcm90b3R5cGUuX2F0dGFjaCk6CisgICAgICAgIChUcmVlRWxlbWVudC50cmVl RWxlbWVudERvdWJsZUNsaWNrZWQpOgorICAgICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLmNv bGxhcHNlKToKKyAgICAgICAgKFRyZWVFbGVtZW50LnByb3RvdHlwZS5leHBhbmQpOgorICAgICAg ICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLnJldmVhbCk6CisgICAgICAgIChUcmVlRWxlbWVudC5w cm90b3R5cGUuc2VsZWN0KToKKyAgICAgICAgKFRyZWVFbGVtZW50LnByb3RvdHlwZS5kZXNlbGVj dCk6CisgICAgICAgIChUcmVlRWxlbWVudC5wcm90b3R5cGUub25wb3B1bGF0ZSk6CisgICAgICAg IChUcmVlRWxlbWVudC5wcm90b3R5cGUub25lbnRlcik6CisgICAgICAgIChUcmVlRWxlbWVudC5w cm90b3R5cGUub25kZWxldGUpOgorICAgICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc3Bh Y2UpOgorICAgICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoKToKKyAgICAgICAg KFRyZWVFbGVtZW50LnByb3RvdHlwZS5vbmV4cGFuZCk6CisgICAgICAgIChUcmVlRWxlbWVudC5w cm90b3R5cGUub25jb2xsYXBzZSk6CisgICAgICAgIChUcmVlRWxlbWVudC5wcm90b3R5cGUub25k YmxjbGljayk6CisgICAgICAgIChUcmVlRWxlbWVudC5wcm90b3R5cGUub25yZXZlYWwpOgorICAg ICAgICAoVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc2VsZWN0KToKKworMjAxMi0wOC0yMyAgUGF2 ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBXZWIgSW5zcGVj dG9yOiBleHRyYWN0IFBhcnNlZFVSTCBpbnRvIGEgc2VwYXJhdGUgZmlsZS4KICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0ODE3CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQWR2YW5jZWRTZWFyY2hDb250cm9s bGVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJj aENvbnRyb2xsZXIuanMKaW5kZXggNjk1MDU5Mzc1ODA0NzgzOTZhYzI5NGM5ZDI3OTdhNTNkY2Rj ZTkwMi4uYmU1MWJkNzY0Nzc0ZjNiZTkyOWM4NjM3OGIxNDNhNTBkNmY1Njk2YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRy b2xsZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNl ZFNlYXJjaENvbnRyb2xsZXIuanMKQEAgLTU4NSw3ICs1ODUsNyBAQCBXZWJJbnNwZWN0b3IuRmls ZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUucHJvdG90eXBlID0gewogICAgICAgICB2YXIgc2hvd01v cmVNYXRjaGVzRWxlbWVudCA9IG5ldyBUcmVlRWxlbWVudChzaG93TW9yZU1hdGNoZXNUZXh0LCBu dWxsLCBmYWxzZSk7CiAgICAgICAgIGZpbGVUcmVlRWxlbWVudC5hcHBlbmRDaGlsZChzaG93TW9y ZU1hdGNoZXNFbGVtZW50KTsKICAgICAgICAgc2hvd01vcmVNYXRjaGVzRWxlbWVudC5saXN0SXRl bUVsZW1lbnQuYWRkU3R5bGVDbGFzcygic2hvdy1tb3JlLW1hdGNoZXMiKTsKLSAgICAgICAgc2hv d01vcmVNYXRjaGVzRWxlbWVudC5vbnNlbGVjdCA9IHRoaXMuX3Nob3dNb3JlTWF0Y2hlc0VsZW1l bnRTZWxlY3RlZC5iaW5kKHRoaXMsIHNlYXJjaFJlc3VsdCwgc3RhcnRNYXRjaEluZGV4KTsKKyAg ICAgICAgc2hvd01vcmVNYXRjaGVzRWxlbWVudC5vbnNlbGVjdCA9IHRoaXMuX3Nob3dNb3JlTWF0 Y2hlc0VsZW1lbnRTZWxlY3RlZC5iaW5kKHRoaXMsIHNlYXJjaFJlc3VsdCwgc3RhcnRNYXRjaElu ZGV4LCBzaG93TW9yZU1hdGNoZXNFbGVtZW50KTsKICAgICB9LAogCiAgICAgLyoqCkBAIC02Mjks NyArNjI5LDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVCYXNlZFNlYXJjaFJlc3VsdHNQYW5lLnByb3Rv dHlwZSA9IHsKICAgICAgICAgZmlsZVRyZWVFbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5hcHBlbmRD aGlsZChtYXRjaGVzQ291bnRTcGFuKTsKICAgICAgICAgCiAgICAgICAgIHZhciBzZWFyY2hSZXN1 bHQgPSB0aGlzLl9zZWFyY2hSZXN1bHRzW3NlYXJjaFJlc3VsdEluZGV4XTsKLSAgICAgICAgZmls ZVRyZWVFbGVtZW50Lm9uZXhwYW5kID0gdGhpcy5fZmlsZVRyZWVFbGVtZW50RXhwYW5kZWQuYmlu ZCh0aGlzLCBzZWFyY2hSZXN1bHQpOworICAgICAgICBmaWxlVHJlZUVsZW1lbnQub25leHBhbmQg PSB0aGlzLl9maWxlVHJlZUVsZW1lbnRFeHBhbmRlZC5iaW5kKHRoaXMsIHNlYXJjaFJlc3VsdCwg ZmlsZVRyZWVFbGVtZW50KTsKIAogICAgICAgICAvLyBFeHBhbmQgdW50aWwgYXQgbGVhc3QgY2Vy dGFpbiBhbW91bnQgb2YgbWF0Y2hlcyBpcyBleHBhbmRlZC4KICAgICAgICAgaWYgKHRoaXMuX21h dGNoZXNFeHBhbmRlZENvdW50IDwgV2ViSW5zcGVjdG9yLkZpbGVCYXNlZFNlYXJjaFJlc3VsdHNQ YW5lLm1hdGNoZXNFeHBhbmRlZEJ5RGVmYXVsdENvdW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCmluZGV4 IDE4Y2FiOGFlNGRkZDFkN2I3OWFhNzU1NTAzMmRmYjhhY2IwN2I4MGQuLmZhM2JmZTk0ZjY0NDE4 OWQ2M2I1YjY4ZWY3Yjg3NjBiYzUyYzU2YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKQEAgLTEwNDIs NyArMTA0Miw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1RyZWVFbGVtZW50LnByb3RvdHlwZSA9 IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICBvbnNlbGVjdDogZnVuY3Rpb24odHJlZUVsZW1l bnQsIHNlbGVjdGVkQnlVc2VyKQorICAgIG9uc2VsZWN0OiBmdW5jdGlvbihzZWxlY3RlZEJ5VXNl cikKICAgICB7CiAgICAgICAgIHRoaXMudHJlZU91dGxpbmUuc3VwcHJlc3NSZXZlYWxBbmRTZWxl Y3QgPSB0cnVlOwogICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLnNlbGVjdERPTU5vZGUodGhpcy5y ZXByZXNlbnRlZE9iamVjdCwgc2VsZWN0ZWRCeVVzZXIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3RlbmVyc1NpZGViYXJQYW5lLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FdmVudExpc3RlbmVyc1NpZGViYXJQ YW5lLmpzCmluZGV4IGQ4YzQ1ZDg3OTJiYjRlMDBlYWMyOTIyYzIyZGNhNWRkMjJjNmY0NDUuLjkz MjRhNTQ2N2Q4MjBlZTg4MDAxNDUwZTVlMGJhMDA0ZDAyZGNhODggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXZlbnRMaXN0ZW5lcnNTaWRlYmFyUGFuZS5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V2ZW50TGlzdGVuZXJz U2lkZWJhclBhbmUuanMKQEAgLTE3NSw3ICsxNzUsNyBAQCBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0 ZW5lcnNTZWN0aW9uLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuUHJvcGVydGll cwogICovCiBXZWJJbnNwZWN0b3IuRXZlbnRMaXN0ZW5lckJhciA9IGZ1bmN0aW9uKGV2ZW50TGlz dGVuZXIsIG5vZGVJZCwgbGlua2lmaWVyKQogewotICAgIFdlYkluc3BlY3Rvci5PYmplY3RQcm9w ZXJ0aWVzU2VjdGlvbi5jYWxsKHRoaXMpOworICAgIFdlYkluc3BlY3Rvci5PYmplY3RQcm9wZXJ0 aWVzU2VjdGlvbi5jYWxsKHRoaXMsIFdlYkluc3BlY3Rvci5SZW1vdGVPYmplY3QuZnJvbVByaW1p dGl2ZVZhbHVlKCIiKSk7CiAKICAgICB0aGlzLmV2ZW50TGlzdGVuZXIgPSBldmVudExpc3RlbmVy OwogICAgIHRoaXMuX25vZGVJZCA9IG5vZGVJZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NpZGViYXJQYW5lLmpzCmluZGV4IGI3ZmE3NDdkZDNkOWI4NDgyMTNl MWYxY2FmYmM0ZTQ1ZTgwMjVmMTYuLmFmNmVkMWFiZGRmZTBmZWNiODE0ODY4ZTI3YzBkZDRkMWY5 NTE4NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2lk ZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TaWRl YmFyUGFuZS5qcwpAQCAtMTA4LDggKzEwOCwxMSBAQCBXZWJJbnNwZWN0b3IuU2lkZWJhclBhbmUu cHJvdG90eXBlID0gewogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB0aGlzLl9leHBhbmRl ZCA9IHRydWU7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJleHBhbmRlZCIp OwotICAgICAgICBpZiAodGhpcy5vbmV4cGFuZCkKLSAgICAgICAgICAgIHRoaXMub25leHBhbmQo dGhpcyk7CisgICAgICAgIHRoaXMub25leHBhbmQoKTsKKyAgICB9LAorCisgICAgb25leHBhbmQ6 IGZ1bmN0aW9uKCkKKyAgICB7CiAgICAgfSwKIAogICAgIGNvbGxhcHNlOiBmdW5jdGlvbigpCkBA IC0xMTgsOCArMTIxLDYgQEAgV2ViSW5zcGVjdG9yLlNpZGViYXJQYW5lLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5fZXhwYW5kZWQgPSBmYWxzZTsKICAg ICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImV4cGFuZGVkIik7Ci0gICAgICAg IGlmICh0aGlzLm9uY29sbGFwc2UpCi0gICAgICAgICAgICB0aGlzLm9uY29sbGFwc2UodGhpcyk7 CiAgICAgfSwKIAogICAgIHRvZ2dsZUV4cGFuZGVkOiBmdW5jdGlvbigpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90cmVlb3V0bGluZS5qcwppbmRleCBkZGJkYmIw ZTg1NmQ0ZDcxNTcwYWM1NzdkYmM0NWNkNzM4MTY0NzgxLi42NzdmZGRkMzJiNWJlNWE2OWFhODNi ZDk1YmJjNDdlMmIxYmNlNGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvdHJlZW91dGxpbmUuanMKQEAgLTEyMiw5ICsxMjIsNiBAQCBUcmVlT3V0bGluZS5w cm90b3R5cGUuaW5zZXJ0Q2hpbGQgPSBmdW5jdGlvbihjaGlsZCwgaW5kZXgpCiAgICAgfQogCiAg ICAgY2hpbGQuX2F0dGFjaCgpOwotCi0gICAgaWYgKHRoaXMudHJlZU91dGxpbmUub25hZGQpCi0g ICAgICAgIHRoaXMudHJlZU91dGxpbmUub25hZGQoY2hpbGQpOwogfQogCiBUcmVlT3V0bGluZS5w cm90b3R5cGUucmVtb3ZlQ2hpbGRBdEluZGV4ID0gZnVuY3Rpb24oY2hpbGRJbmRleCkKQEAgLTI4 NiwxNSArMjgzLDYgQEAgVHJlZU91dGxpbmUucHJvdG90eXBlLmZpbmRUcmVlRWxlbWVudCA9IGZ1 bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0LCBpc0FuY2VzdG9yLAogICAgIHJldHVybiB0aGlzLmdl dENhY2hlZFRyZWVFbGVtZW50KHJlcHJlc2VudGVkT2JqZWN0KTsKIH0KIAotVHJlZU91dGxpbmUu cHJvdG90eXBlLl90cmVlRWxlbWVudERpZENoYW5nZSA9IGZ1bmN0aW9uKHRyZWVFbGVtZW50KQot ewotICAgIGlmICh0cmVlRWxlbWVudC50cmVlT3V0bGluZSAhPT0gdGhpcykKLSAgICAgICAgcmV0 dXJuOwotCi0gICAgaWYgKHRoaXMub25jaGFuZ2UpCi0gICAgICAgIHRoaXMub25jaGFuZ2UodHJl ZUVsZW1lbnQpOwotfQotCiBUcmVlT3V0bGluZS5wcm90b3R5cGUudHJlZUVsZW1lbnRGcm9tUG9p bnQgPSBmdW5jdGlvbih4LCB5KQogewogICAgIHZhciBub2RlID0gdGhpcy5fY2hpbGRyZW5MaXN0 Tm9kZS5vd25lckRvY3VtZW50LmVsZW1lbnRGcm9tUG9pbnQoeCwgeSk7CkBAIC0zNzYsMTYgKzM2 NCwxMiBAQCBUcmVlT3V0bGluZS5wcm90b3R5cGUuX3RyZWVLZXlEb3duID0gZnVuY3Rpb24oZXZl bnQpCiAgICAgICAgICAgICAgICAgICAgIHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5leHBhbmQo KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQotICAgIH0gZWxzZSBpZiAoZXZlbnQua2V5Q29k ZSA9PT0gOCAvKiBCYWNrc3BhY2UgKi8gfHwgZXZlbnQua2V5Q29kZSA9PT0gNDYgLyogRGVsZXRl ICovKSB7Ci0gICAgICAgIGlmICh0aGlzLnNlbGVjdGVkVHJlZUVsZW1lbnQub25kZWxldGUpCi0g ICAgICAgICAgICBoYW5kbGVkID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50Lm9uZGVsZXRlKCk7 Ci0gICAgfSBlbHNlIGlmIChpc0VudGVyS2V5KGV2ZW50KSkgewotICAgICAgICBpZiAodGhpcy5z ZWxlY3RlZFRyZWVFbGVtZW50Lm9uZW50ZXIpCi0gICAgICAgICAgICBoYW5kbGVkID0gdGhpcy5z ZWxlY3RlZFRyZWVFbGVtZW50Lm9uZW50ZXIoKTsKLSAgICB9IGVsc2UgaWYgKGV2ZW50LmtleUNv ZGUgPT09IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0LktleXMuU3BhY2UuY29kZSkgewot ICAgICAgICBpZiAodGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50Lm9uc3BhY2UpCi0gICAgICAgICAg ICBoYW5kbGVkID0gdGhpcy5zZWxlY3RlZFRyZWVFbGVtZW50Lm9uc3BhY2UoKTsKLSAgICB9Cisg ICAgfSBlbHNlIGlmIChldmVudC5rZXlDb2RlID09PSA4IC8qIEJhY2tzcGFjZSAqLyB8fCBldmVu dC5rZXlDb2RlID09PSA0NiAvKiBEZWxldGUgKi8pCisgICAgICAgIGhhbmRsZWQgPSB0aGlzLnNl bGVjdGVkVHJlZUVsZW1lbnQub25kZWxldGUoKTsKKyAgICBlbHNlIGlmIChpc0VudGVyS2V5KGV2 ZW50KSkKKyAgICAgICAgaGFuZGxlZCA9IHRoaXMuc2VsZWN0ZWRUcmVlRWxlbWVudC5vbmVudGVy KCk7CisgICAgZWxzZSBpZiAoZXZlbnQua2V5Q29kZSA9PT0gV2ViSW5zcGVjdG9yLktleWJvYXJk U2hvcnRjdXQuS2V5cy5TcGFjZS5jb2RlKQorICAgICAgICBoYW5kbGVkID0gdGhpcy5zZWxlY3Rl ZFRyZWVFbGVtZW50Lm9uc3BhY2UoKTsKIAogICAgIGlmIChuZXh0U2VsZWN0ZWRFbGVtZW50KSB7 CiAgICAgICAgIG5leHRTZWxlY3RlZEVsZW1lbnQucmV2ZWFsKCk7CkBAIC01MDUsOCArNDg5LDcg QEAgVHJlZU91dGxpbmUucHJvdG90eXBlLl9zZWFyY2hJbnB1dEtleURvd24gPSBmdW5jdGlvbihl dmVudCkKICAgICB9IGVsc2UgaWYgKGlzRW50ZXJLZXkoZXZlbnQpKSB7CiAgICAgICAgIHZhciBs YXN0U2VhcmNoTWF0Y2hFbGVtZW50ID0gdGhpcy5fY3VycmVudFNlYXJjaE1hdGNoRWxlbWVudDsK ICAgICAgICAgdGhpcy5fc2VhcmNoRmluaXNoZWQoKTsKLSAgICAgICAgaWYgKGxhc3RTZWFyY2hN YXRjaEVsZW1lbnQgJiYgbGFzdFNlYXJjaE1hdGNoRWxlbWVudC5vbmVudGVyKQotICAgICAgICAg ICAgbGFzdFNlYXJjaE1hdGNoRWxlbWVudC5vbmVudGVyKCk7CisgICAgICAgIGxhc3RTZWFyY2hN YXRjaEVsZW1lbnQub25lbnRlcigpOwogICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKICAgICB9CiAK QEAgLTcxMyw5ICs2OTYsNiBAQCBUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgX2ZpcmVE aWRDaGFuZ2U6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIGRlbGV0ZSB0aGlzLl9kaWRDaGFu Z2VUaW1lb3V0SWRlbnRpZmllcjsKLQotICAgICAgICBpZiAodGhpcy50cmVlT3V0bGluZSkKLSAg ICAgICAgICAgIHRoaXMudHJlZU91dGxpbmUuX3RyZWVFbGVtZW50RGlkQ2hhbmdlKHRoaXMpOwog ICAgIH0sCiAKICAgICBkaWRDaGFuZ2U6IGZ1bmN0aW9uKCkKQEAgLTc3Myw4ICs3NTMsNyBAQCBU cmVlRWxlbWVudC5wcm90b3R5cGUuX2F0dGFjaCA9IGZ1bmN0aW9uKCkKICAgICAgICAgdGhpcy5f bGlzdEl0ZW1Ob2RlLmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgVHJlZUVsZW1lbnQudHJlZUVs ZW1lbnRUb2dnbGVkLCBmYWxzZSk7CiAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5hZGRFdmVu dExpc3RlbmVyKCJkYmxjbGljayIsIFRyZWVFbGVtZW50LnRyZWVFbGVtZW50RG91YmxlQ2xpY2tl ZCwgZmFsc2UpOwogCi0gICAgICAgIGlmICh0aGlzLm9uYXR0YWNoKQotICAgICAgICAgICAgdGhp cy5vbmF0dGFjaCh0aGlzKTsKKyAgICAgICAgdGhpcy5vbmF0dGFjaCgpOwogICAgIH0KIAogICAg IHZhciBuZXh0U2libGluZyA9IG51bGw7CkBAIC04NDAsMTEgKzgxOSwxMCBAQCBUcmVlRWxlbWVu dC50cmVlRWxlbWVudERvdWJsZUNsaWNrZWQgPSBmdW5jdGlvbihldmVudCkKICAgICBpZiAoIWVs ZW1lbnQgfHwgIWVsZW1lbnQudHJlZUVsZW1lbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlm IChlbGVtZW50LnRyZWVFbGVtZW50Lm9uZGJsY2xpY2spIHsKLSAgICAgICAgdmFyIGhhbmRsZWQg PSBlbGVtZW50LnRyZWVFbGVtZW50Lm9uZGJsY2xpY2suY2FsbChlbGVtZW50LnRyZWVFbGVtZW50 LCBldmVudCk7Ci0gICAgICAgIGlmIChoYW5kbGVkKQotICAgICAgICAgICAgcmV0dXJuOwotICAg IH0gZWxzZSBpZiAoZWxlbWVudC50cmVlRWxlbWVudC5oYXNDaGlsZHJlbiAmJiAhZWxlbWVudC50 cmVlRWxlbWVudC5leHBhbmRlZCkKKyAgICB2YXIgaGFuZGxlZCA9IGVsZW1lbnQudHJlZUVsZW1l bnQub25kYmxjbGljay5jYWxsKGVsZW1lbnQudHJlZUVsZW1lbnQsIGV2ZW50KTsKKyAgICBpZiAo aGFuZGxlZCkKKyAgICAgICAgcmV0dXJuOworICAgIGlmIChlbGVtZW50LnRyZWVFbGVtZW50Lmhh c0NoaWxkcmVuICYmICFlbGVtZW50LnRyZWVFbGVtZW50LmV4cGFuZGVkKQogICAgICAgICBlbGVt ZW50LnRyZWVFbGVtZW50LmV4cGFuZCgpOwogfQogCkBAIC04NjAsOCArODM4LDcgQEAgVHJlZUVs ZW1lbnQucHJvdG90eXBlLmNvbGxhcHNlID0gZnVuY3Rpb24oKQogICAgIGlmICh0aGlzLnRyZWVP dXRsaW5lKQogICAgICAgICB0aGlzLnRyZWVPdXRsaW5lLl9leHBhbmRlZFN0YXRlTWFwLnB1dCh0 aGlzLnJlcHJlc2VudGVkT2JqZWN0LCBmYWxzZSk7CiAKLSAgICBpZiAodGhpcy5vbmNvbGxhcHNl KQotICAgICAgICB0aGlzLm9uY29sbGFwc2UodGhpcyk7CisgICAgdGhpcy5vbmNvbGxhcHNlKCk7 CiB9CiAKIFRyZWVFbGVtZW50LnByb3RvdHlwZS5jb2xsYXBzZVJlY3Vyc2l2ZWx5ID0gZnVuY3Rp b24oKQpAQCAtODc5LDkgKzg1Niw5IEBAIFRyZWVFbGVtZW50LnByb3RvdHlwZS5leHBhbmQgPSBm dW5jdGlvbigpCiAgICAgaWYgKCF0aGlzLmhhc0NoaWxkcmVuIHx8ICh0aGlzLmV4cGFuZGVkICYm ICF0aGlzLl9zaG91bGRSZWZyZXNoQ2hpbGRyZW4gJiYgdGhpcy5fY2hpbGRyZW5MaXN0Tm9kZSkp CiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIFNldCB0aGlzIGJlZm9yZSBvbnBvcHVsYXRlLiBT aW5jZSBvbnBvcHVsYXRlIGNhbiBhZGQgZWxlbWVudHMgYW5kIGNhbGwgb25hZGQsIHRoaXMgbWFr ZXMKKyAgICAvLyBTZXQgdGhpcyBiZWZvcmUgb25wb3B1bGF0ZS4gU2luY2Ugb25wb3B1bGF0ZSBj YW4gYWRkIGVsZW1lbnRzLCB0aGlzIG1ha2VzCiAgICAgLy8gc3VyZSB0aGUgZXhwYW5kZWQgZmxh ZyBpcyB0cnVlIGJlZm9yZSBjYWxsaW5nIHRob3NlIGZ1bmN0aW9ucy4gVGhpcyBwcmV2ZW50cyB0 aGUgcG9zc2liaWxpdHkKLSAgICAvLyBvZiBhbiBpbmZpbml0ZSBsb29wIGlmIG9ucG9wdWxhdGUg b3Igb25hZGQgd2VyZSB0byBjYWxsIGV4cGFuZC4KKyAgICAvLyBvZiBhbiBpbmZpbml0ZSBsb29w IGlmIG9ucG9wdWxhdGUgd2VyZSB0byBjYWxsIGV4cGFuZC4KIAogICAgIHRoaXMuZXhwYW5kZWQg PSB0cnVlOwogICAgIGlmICh0aGlzLnRyZWVPdXRsaW5lKQpAQCAtOTE1LDggKzg5Miw3IEBAIFRy ZWVFbGVtZW50LnByb3RvdHlwZS5leHBhbmQgPSBmdW5jdGlvbigpCiAgICAgaWYgKHRoaXMuX2No aWxkcmVuTGlzdE5vZGUpCiAgICAgICAgIHRoaXMuX2NoaWxkcmVuTGlzdE5vZGUuY2xhc3NMaXN0 LmFkZCgiZXhwYW5kZWQiKTsKIAotICAgIGlmICh0aGlzLm9uZXhwYW5kKQotICAgICAgICB0aGlz Lm9uZXhwYW5kKHRoaXMpOworICAgIHRoaXMub25leHBhbmQoKTsKIH0KIAogVHJlZUVsZW1lbnQu cHJvdG90eXBlLmV4cGFuZFJlY3Vyc2l2ZWx5ID0gZnVuY3Rpb24obWF4RGVwdGgpCkBAIC05NjIs OCArOTM4LDcgQEAgVHJlZUVsZW1lbnQucHJvdG90eXBlLnJldmVhbCA9IGZ1bmN0aW9uKCkKICAg ICAgICAgY3VycmVudEFuY2VzdG9yID0gY3VycmVudEFuY2VzdG9yLnBhcmVudDsKICAgICB9CiAK LSAgICBpZiAodGhpcy5vbnJldmVhbCkKLSAgICAgICAgdGhpcy5vbnJldmVhbCh0aGlzKTsKKyAg ICB0aGlzLm9ucmV2ZWFsKHRoaXMpOwogfQogCiBUcmVlRWxlbWVudC5wcm90b3R5cGUucmV2ZWFs ZWQgPSBmdW5jdGlvbigpCkBAIC0xMDA5LDkgKzk4NCw3IEBAIFRyZWVFbGVtZW50LnByb3RvdHlw ZS5zZWxlY3QgPSBmdW5jdGlvbihvbWl0Rm9jdXMsIHNlbGVjdGVkQnlVc2VyKQogICAgIGlmICh0 aGlzLl9saXN0SXRlbU5vZGUpCiAgICAgICAgIHRoaXMuX2xpc3RJdGVtTm9kZS5jbGFzc0xpc3Qu YWRkKCJzZWxlY3RlZCIpOwogCi0gICAgaWYgKHRoaXMub25zZWxlY3QpCi0gICAgICAgIHJldHVy biB0aGlzLm9uc2VsZWN0KHRoaXMsIHNlbGVjdGVkQnlVc2VyKTsKLSAgICByZXR1cm4gZmFsc2U7 CisgICAgcmV0dXJuIHRoaXMub25zZWxlY3Qoc2VsZWN0ZWRCeVVzZXIpOwogfQogCiAvKioKQEAg LTEwMzUsMTYgKzEwMDgsMjEgQEAgVHJlZUVsZW1lbnQucHJvdG90eXBlLmRlc2VsZWN0ID0gZnVu Y3Rpb24oc3VwcmVzc09uRGVzZWxlY3QpCiAgICAgdGhpcy50cmVlT3V0bGluZS5zZWxlY3RlZFRy ZWVFbGVtZW50ID0gbnVsbDsKICAgICBpZiAodGhpcy5fbGlzdEl0ZW1Ob2RlKQogICAgICAgICB0 aGlzLl9saXN0SXRlbU5vZGUuY2xhc3NMaXN0LnJlbW92ZSgic2VsZWN0ZWQiKTsKLQotICAgIGlm ICh0aGlzLm9uZGVzZWxlY3QgJiYgIXN1cHJlc3NPbkRlc2VsZWN0KQotICAgICAgICB0aGlzLm9u ZGVzZWxlY3QodGhpcyk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLVRyZWVFbGVtZW50LnByb3Rv dHlwZS5vbnBvcHVsYXRlID0gZnVuY3Rpb24oKQotewotICAgIC8vIE92ZXJyaWRlbiBieSBzdWJj bGFzc2VzLgotfQorLy8gT3ZlcnJpZGVuIGJ5IHN1YmNsYXNzZXMuCitUcmVlRWxlbWVudC5wcm90 b3R5cGUub25wb3B1bGF0ZSA9IGZ1bmN0aW9uKCkgeyB9CitUcmVlRWxlbWVudC5wcm90b3R5cGUu b25lbnRlciA9IGZ1bmN0aW9uKCkgeyB9CitUcmVlRWxlbWVudC5wcm90b3R5cGUub25kZWxldGUg PSBmdW5jdGlvbigpIHsgfQorVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uc3BhY2UgPSBmdW5jdGlv bigpIHsgfQorVHJlZUVsZW1lbnQucHJvdG90eXBlLm9uYXR0YWNoID0gZnVuY3Rpb24oKSB7IH0K K1RyZWVFbGVtZW50LnByb3RvdHlwZS5vbmV4cGFuZCA9IGZ1bmN0aW9uKCkgeyB9CitUcmVlRWxl bWVudC5wcm90b3R5cGUub25jb2xsYXBzZSA9IGZ1bmN0aW9uKCkgeyB9CitUcmVlRWxlbWVudC5w cm90b3R5cGUub25kYmxjbGljayA9IGZ1bmN0aW9uKCkgeyB9CitUcmVlRWxlbWVudC5wcm90b3R5 cGUub25yZXZlYWwgPSBmdW5jdGlvbigpIHsgfQorLyoqIEBwYXJhbSB7Ym9vbGVhbn0gc2VsZWN0 ZWRCeVVzZXIgKi8KK1RyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVjdCA9IGZ1bmN0aW9uKHNl bGVjdGVkQnlVc2VyKSB7IH0KIAogLyoqCiAgKiBAcGFyYW0ge2Jvb2xlYW59IHNraXBVbnJldmVh bGVkCg==