86809 2012-05-17 22:46:48 -0700 Web Inspector: remove File abstraction from the AdvancedSearchController, migrate it to UISourceCode. 2012-05-18 01:52:20 -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 627352 0 pfeldman 2012-05-17 22:46:48 -0700 This change migrates AdvancedSearchController from "Object" to "UISourceCode". I don't see why we need this abstraction and as a side effect, it makes search across scripts work for styles. 627360 1 142635 pfeldman 2012-05-17 22:52:53 -0700 Created attachment 142635 Patch 627475 2 pfeldman 2012-05-18 01:52:20 -0700 Committed r117564: <http://trac.webkit.org/changeset/117564> 142635 2012-05-17 22:52:53 -0700 2012-05-18 00:49:27 -0700 Patch bug-86809-20120518095251.patch text/plain 13673 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RmNTgxZDU4ZjFmM2Fl OTgyNGJkMjBmNjBmZDYxYzVlOGI1YWY0NS4uMGVmMDU0M2QyZjRjMWEyYTkxYjkyODU5YzUzMGJm MDVlODBjYzI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA1LTE3ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbW92ZSBGaWxlIGFic3RyYWN0aW9uIGZyb20gdGhlIEFkdmFuY2VkU2VhcmNoQ29udHJv bGxlciwgbWlncmF0ZSBpdCB0byBVSVNvdXJjZUNvZGUuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjgwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIG1pZ3JhdGVzIEFkdmFuY2VkU2Vh cmNoQ29udHJvbGxlciBmcm9tICJPYmplY3QiIHRvICJVSVNvdXJjZUNvZGUiLgorICAgICAgICBJ IGRvbid0IHNlZSB3aHkgd2UgbmVlZCB0aGlzIGFic3RyYWN0aW9uIGFuZCBhcyBhIHNpZGUgZWZm ZWN0LCBpdCBtYWtlcyBzZWFyY2gKKyAgICAgICAgYWNyb3NzIHNjcmlwdHMgd29yayBmb3Igc3R5 bGVzLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQWR2YW5jZWRTZWFyY2hDb250cm9sbGVyLmpzOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNlYXJjaFJlc3VsdCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUucHJvdG90eXBlLl9jcmVhdGVBbmNob3IpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVCYXNlZFNlYXJjaFJlc3VsdHNQYW5lLnByb3RvdHlw ZS5hZGRTZWFyY2hSZXN1bHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZpbGVCYXNlZFNlYXJj aFJlc3VsdHNQYW5lLnByb3RvdHlwZS5fYXBwZW5kU2VhcmNoTWF0Y2hlcyk6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUucHJvdG90eXBlLl9yZWdleE1h dGNoUmFuZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRz UGFuZS5TZWFyY2hSZXN1bHQpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0 c1NlYXJjaFNjb3BlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNTZWFyY2hTY29w ZS5wcm90b3R5cGUuY3JlYXRlU2VhcmNoUmVzdWx0c1BhbmUpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9yZWdpc3Rl clNob3J0Y3V0cyk6CisKIDIwMTItMDUtMTcgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KIAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTE0MTk5MzM+IFByb2JsZW1zIHdpdGggZmxp cHBlZCB3cml0aW5nIG1vZGVzIGFuZCBjb21wb3NpdGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvRW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUv RW5nbGlzaC5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCmluZGV4IDEwNGM2ZDA4MzUxNGE2Yjk4 YjFlMTc1YjBlNmQzOGFlNGYwZDMzZDUuLmNlZWEzODg4ZmVmMzE1YmQzZDk3ZWUwMDhmNjI1YWUy ODQyZjQxODggMTAwNjQ0CkdJVCBiaW5hcnkgcGF0Y2gKZGVsdGEgNDkKemNtVi0xME03cjhuRldy UzElUnt4c3dJO1lvRVZvLUJtb1lXJj9OeUZsUU50KG0hS3ZBNz8pQCEwVDdjZ0l8e2NACkhDSUxQ c3M4QTE3CgpkZWx0YSA1NQp6Y21lQzEkPVd4UXdQNmU2RCVJJl9EdlclU1NNMUBMb31qP1VHeVFA cHFYYkNFWjJBSDxBUyorU1FEQ3h4SFBgazQKSUhBWHUlMDJGNXQ3WFNiTgoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQWR2YW5jZWRTZWFyY2hDb250cm9s bGVyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJj aENvbnRyb2xsZXIuanMKaW5kZXggYzIxNWY5OWZlNGZkNGIyMDVjNmY0OTZmOWQxMzQ3MWExNzg0 ZWFhMi4uYWNjOWRmZTUzM2QzN2EwYzQzNmI5NzBkYzllNGM1MWIxN2IwZjU1NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRy b2xsZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNl ZFNlYXJjaENvbnRyb2xsZXIuanMKQEAgLTkyLDcgKzkyLDcgQEAgV2ViSW5zcGVjdG9yLkFkdmFu Y2VkU2VhcmNoQ29udHJvbGxlci5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFy YW0ge251bWJlcn0gc2VhcmNoSWQKLSAgICAgKiBAcGFyYW0ge09iamVjdH0gc2VhcmNoUmVzdWx0 CisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUu U2VhcmNoUmVzdWx0fSBzZWFyY2hSZXN1bHQKICAgICAgKi8KICAgICBfb25TZWFyY2hSZXN1bHQ6 IGZ1bmN0aW9uKHNlYXJjaElkLCBzZWFyY2hSZXN1bHQpCiAgICAgewpAQCAtMzIzLDcgKzMyMyw3 IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hWaWV3LnByb3RvdHlwZSA9IHsKICAgICB9LAogCiAgICAg LyoqCi0gICAgICogQHBhcmFtIHtPYmplY3R9IHNlYXJjaFJlc3VsdAorICAgICAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLkZpbGVCYXNlZFNlYXJjaFJlc3VsdHNQYW5lLlNlYXJjaFJlc3VsdH0gc2Vh cmNoUmVzdWx0CiAgICAgICovCiAgICAgYWRkU2VhcmNoUmVzdWx0OiBmdW5jdGlvbihzZWFyY2hS ZXN1bHQpCiAgICAgewpAQCAtNDM3LDcgKzQzNyw3IEBAIFdlYkluc3BlY3Rvci5TZWFyY2hTY29w ZSA9IGZ1bmN0aW9uKCkKIFdlYkluc3BlY3Rvci5TZWFyY2hTY29wZS5wcm90b3R5cGUgPSB7CiAg ICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuU2VhcmNoQ29uZmlnfSBzZWFyY2hD b25maWcKLSAgICAgKiBAcGFyYW0ge2Z1bmN0aW9uKE9iamVjdCl9IHNlYXJjaFJlc3VsdENhbGxi YWNrCisgICAgICogQHBhcmFtIHtmdW5jdGlvbihXZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNo UmVzdWx0c1BhbmUuU2VhcmNoUmVzdWx0KX0gc2VhcmNoUmVzdWx0Q2FsbGJhY2sKICAgICAgKiBA cGFyYW0ge2Z1bmN0aW9uKGJvb2xlYW4pfSBzZWFyY2hGaW5pc2hlZENhbGxiYWNrCiAgICAgICov CiAgICAgcGVyZm9ybVNlYXJjaDogZnVuY3Rpb24oc2VhcmNoQ29uZmlnLCBzZWFyY2hSZXN1bHRD YWxsYmFjaywgc2VhcmNoRmluaXNoZWRDYWxsYmFjaykgeyB9LApAQCAtNDUzLDYgKzQ1MywxNyBA QCBXZWJJbnNwZWN0b3IuU2VhcmNoU2NvcGUucHJvdG90eXBlID0gewogCiAvKioKICAqIEBjb25z dHJ1Y3RvcgorICogQHBhcmFtIHtudW1iZXJ9IG9mZnNldAorICogQHBhcmFtIHtudW1iZXJ9IGxl bmd0aAorICovCitXZWJJbnNwZWN0b3IuU2VhcmNoUmVzdWx0ID0gZnVuY3Rpb24ob2Zmc2V0LCBs ZW5ndGgpCit7CisgICAgdGhpcy5vZmZzZXQgPSBvZmZzZXQ7CisgICAgdGhpcy5sZW5ndGggPSBs ZW5ndGg7ICAgIAorfQorCisvKioKKyAqIEBjb25zdHJ1Y3RvcgogICogQHBhcmFtIHtXZWJJbnNw ZWN0b3IuU2VhcmNoQ29uZmlnfSBzZWFyY2hDb25maWcKICAqLwogV2ViSW5zcGVjdG9yLlNlYXJj aFJlc3VsdHNQYW5lID0gZnVuY3Rpb24oc2VhcmNoQ29uZmlnKQpAQCAtNDcxLDcgKzQ4Miw3IEBA IFdlYkluc3BlY3Rvci5TZWFyY2hSZXN1bHRzUGFuZS5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAog ICAgIC8qKgotICAgICAqIEBwYXJhbSB7T2JqZWN0fSBzZWFyY2hSZXN1bHQKKyAgICAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRzUGFuZS5TZWFyY2hSZXN1bHR9 IHNlYXJjaFJlc3VsdAogICAgICAqLwogICAgIGFkZFNlYXJjaFJlc3VsdDogZnVuY3Rpb24oc2Vh cmNoUmVzdWx0KSB7IH0KIH0KQEAgLTUwMywzNCArNTE0LDM1IEBAIFdlYkluc3BlY3Rvci5GaWxl QmFzZWRTZWFyY2hSZXN1bHRzUGFuZS5maWxlTWF0Y2hlc1Nob3duQXRPbmNlID0gMjA7CiAKIFdl Ykluc3BlY3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRzUGFuZS5wcm90b3R5cGUgPSB7CiAgICAg LyoqCi0gICAgICogQHBhcmFtIHtPYmplY3R9IGZpbGUKKyAgICAgKiBAcGFyYW0ge1dlYkluc3Bl Y3Rvci5VSVNvdXJjZUNvZGV9IHVpU291cmNlQ29kZQogICAgICAqIEBwYXJhbSB7bnVtYmVyfSBs aW5lTnVtYmVyCiAgICAgICogQHBhcmFtIHtudW1iZXJ9IGNvbHVtbk51bWJlcgogICAgICAqIEBy ZXR1cm4ge0VsZW1lbnR9CiAgICAgICovCi0gICAgY3JlYXRlQW5jaG9yOiBmdW5jdGlvbihmaWxl LCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpIHsgfSwKLQotICAgIC8qKgotICAgICAqIEBwYXJh bSB7T2JqZWN0fSBmaWxlCi0gICAgICogQHJldHVybiB7c3RyaW5nfQotICAgICAqLwotICAgIGZp bGVOYW1lOiBmdW5jdGlvbihmaWxlKSB7IH0sCisgICAgX2NyZWF0ZUFuY2hvcjogZnVuY3Rpb24o dWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCisgICAgeworICAgICAgICB2 YXIgYW5jaG9yID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYSIpOworICAgICAgICBhbmNob3Iu cHJlZmVycmVkUGFuZWwgPSAic2NyaXB0cyI7CisgICAgICAgIGFuY2hvci5ocmVmID0gdWlTb3Vy Y2VDb2RlLnVybDsKKyAgICAgICAgYW5jaG9yLnVpU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsK KyAgICAgICAgYW5jaG9yLmxpbmVOdW1iZXIgPSBsaW5lTnVtYmVyOworICAgICAgICByZXR1cm4g YW5jaG9yOworICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge09iamVjdH0gc2VhcmNo UmVzdWx0CisgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0 c1BhbmUuU2VhcmNoUmVzdWx0fSBzZWFyY2hSZXN1bHQKICAgICAgKi8KICAgICBhZGRTZWFyY2hS ZXN1bHQ6IGZ1bmN0aW9uKHNlYXJjaFJlc3VsdCkKICAgICB7CiAgICAgICAgIHRoaXMuX3NlYXJj aFJlc3VsdHMucHVzaChzZWFyY2hSZXN1bHQpOwotICAgICAgICB2YXIgZmlsZSA9IHNlYXJjaFJl c3VsdC5maWxlOwotICAgICAgICB2YXIgZmlsZU5hbWUgPSB0aGlzLmZpbGVOYW1lKGZpbGUpOwor ICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gc2VhcmNoUmVzdWx0LnVpU291cmNlQ29kZTsKICAg ICAgICAgdmFyIHNlYXJjaE1hdGNoZXMgPSBzZWFyY2hSZXN1bHQuc2VhcmNoTWF0Y2hlczsKIAot ICAgICAgICB2YXIgZmlsZVRyZWVFbGVtZW50ID0gdGhpcy5fYWRkRmlsZVRyZWVFbGVtZW50KGZp bGVOYW1lLCBzZWFyY2hNYXRjaGVzLmxlbmd0aCwgdGhpcy5fc2VhcmNoUmVzdWx0cy5sZW5ndGgg LSAxKTsKKyAgICAgICAgdmFyIGZpbGVUcmVlRWxlbWVudCA9IHRoaXMuX2FkZEZpbGVUcmVlRWxl bWVudCh1aVNvdXJjZUNvZGUudXJsLCBzZWFyY2hNYXRjaGVzLmxlbmd0aCwgdGhpcy5fc2VhcmNo UmVzdWx0cy5sZW5ndGggLSAxKTsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtP YmplY3R9IHNlYXJjaFJlc3VsdAorICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLkZpbGVCYXNl ZFNlYXJjaFJlc3VsdHNQYW5lLlNlYXJjaFJlc3VsdH0gc2VhcmNoUmVzdWx0CiAgICAgICogQHBh cmFtIHtUcmVlRWxlbWVudH0gZmlsZVRyZWVFbGVtZW50CiAgICAgICovCiAgICAgX2ZpbGVUcmVl RWxlbWVudEV4cGFuZGVkOiBmdW5jdGlvbihzZWFyY2hSZXN1bHQsIGZpbGVUcmVlRWxlbWVudCkK QEAgLTU1MCwyMyArNTYyLDIyIEBAIFdlYkluc3BlY3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRz UGFuZS5wcm90b3R5cGUgPSB7CiAKICAgICAvKioKICAgICAgKiBAcGFyYW0ge1RyZWVFbGVtZW50 fSBmaWxlVHJlZUVsZW1lbnQKLSAgICAgKiBAcGFyYW0ge09iamVjdH0gc2VhcmNoUmVzdWx0Cisg ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUuU2Vh cmNoUmVzdWx0fSBzZWFyY2hSZXN1bHQKICAgICAgKiBAcGFyYW0ge251bWJlcn0gZnJvbUluZGV4 CiAgICAgICogQHBhcmFtIHtudW1iZXJ9IHRvSW5kZXgKICAgICAgKi8KICAgICBfYXBwZW5kU2Vh cmNoTWF0Y2hlczogZnVuY3Rpb24oZmlsZVRyZWVFbGVtZW50LCBzZWFyY2hSZXN1bHQsIGZyb21J bmRleCwgdG9JbmRleCkKICAgICB7Ci0gICAgICAgIHZhciBmaWxlID0gc2VhcmNoUmVzdWx0LmZp bGU7Ci0gICAgICAgIHZhciBmaWxlTmFtZSA9IHRoaXMuZmlsZU5hbWUoZmlsZSk7CisgICAgICAg IHZhciB1aVNvdXJjZUNvZGUgPSBzZWFyY2hSZXN1bHQudWlTb3VyY2VDb2RlOwogICAgICAgICB2 YXIgc2VhcmNoTWF0Y2hlcyA9IHNlYXJjaFJlc3VsdC5zZWFyY2hNYXRjaGVzOwotICAgICAgICAK KwogICAgICAgICB2YXIgcmVnZXggPSBjcmVhdGVTZWFyY2hSZWdleCh0aGlzLl9zZWFyY2hDb25m aWcucXVlcnksICF0aGlzLl9zZWFyY2hDb25maWcuaWdub3JlQ2FzZSwgdGhpcy5fc2VhcmNoQ29u ZmlnLmlzUmVnZXgpOwogICAgICAgICBmb3IgKHZhciBpID0gZnJvbUluZGV4OyBpIDwgdG9JbmRl eDsgKytpKSB7CiAgICAgICAgICAgICB2YXIgbGluZU51bWJlciA9IHNlYXJjaE1hdGNoZXNbaV0u bGluZU51bWJlcjsKICAgICAgICAgICAgIHZhciBsaW5lQ29udGVudCA9IHNlYXJjaE1hdGNoZXNb aV0ubGluZUNvbnRlbnQ7CiAgICAgICAgICAgICB2YXIgbWF0Y2hSYW5nZXMgPSB0aGlzLl9yZWdl eE1hdGNoUmFuZ2VzKGxpbmVDb250ZW50LCByZWdleCk7CiAgICAgICAgICAgICAKLSAgICAgICAg ICAgIHZhciBhbmNob3IgPSB0aGlzLmNyZWF0ZUFuY2hvcihmaWxlLCBsaW5lTnVtYmVyLCBtYXRj aFJhbmdlc1swXS5vZmZzZXQpOworICAgICAgICAgICAgdmFyIGFuY2hvciA9IHRoaXMuX2NyZWF0 ZUFuY2hvcih1aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIG1hdGNoUmFuZ2VzWzBdLm9mZnNldCk7 CiAgICAgICAgICAgICAKICAgICAgICAgICAgIHZhciBudW1iZXJTdHJpbmcgPSBudW1iZXJUb1N0 cmluZ1dpdGhTcGFjZXNQYWRkaW5nKGxpbmVOdW1iZXIgKyAxLCA0KTsKICAgICAgICAgICAgIHZh ciBsaW5lTnVtYmVyU3BhbiA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInNwYW4iKTsKQEAgLTU4 Nyw3ICs1OTgsNyBAQCBXZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUucHJv dG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtUcmVlRWxlbWVudH0gZmlsZVRy ZWVFbGVtZW50Ci0gICAgICogQHBhcmFtIHtPYmplY3R9IHNlYXJjaFJlc3VsdAorICAgICAqIEBw YXJhbSB7V2ViSW5zcGVjdG9yLkZpbGVCYXNlZFNlYXJjaFJlc3VsdHNQYW5lLlNlYXJjaFJlc3Vs dH0gc2VhcmNoUmVzdWx0CiAgICAgICogQHBhcmFtIHtudW1iZXJ9IHN0YXJ0TWF0Y2hJbmRleAog ICAgICAqLwogICAgIF9hcHBlbmRTaG93TW9yZU1hdGNoZXNFbGVtZW50OiBmdW5jdGlvbihmaWxl VHJlZUVsZW1lbnQsIHNlYXJjaFJlc3VsdCwgc3RhcnRNYXRjaEluZGV4KQpAQCAtNjAxLDcgKzYx Miw3IEBAIFdlYkluc3BlY3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRzUGFuZS5wcm90b3R5cGUg PSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7T2JqZWN0fSBzZWFyY2hSZXN1 bHQKKyAgICAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRzUGFu ZS5TZWFyY2hSZXN1bHR9IHNlYXJjaFJlc3VsdAogICAgICAqIEBwYXJhbSB7bnVtYmVyfSBzdGFy dE1hdGNoSW5kZXgKICAgICAgKiBAcGFyYW0ge1RyZWVFbGVtZW50fSBzaG93TW9yZU1hdGNoZXNF bGVtZW50CiAgICAgICovCkBAIC02NTQsNyArNjY1LDcgQEAgV2ViSW5zcGVjdG9yLkZpbGVCYXNl ZFNlYXJjaFJlc3VsdHNQYW5lLnByb3RvdHlwZSA9IHsKICAgICAvKioKICAgICAgKiBAcGFyYW0g e3N0cmluZ30gbGluZUNvbnRlbnQKICAgICAgKiBAcGFyYW0ge1JlZ0V4cH0gcmVnZXgKLSAgICAg KiBAcmV0dXJuIHtBcnJheS48T2JqZWN0Pn0KKyAgICAgKiBAcmV0dXJuIHtBcnJheS48V2ViSW5z cGVjdG9yLlNlYXJjaFJlc3VsdD59CiAgICAgICovCiAgICAgX3JlZ2V4TWF0Y2hSYW5nZXM6IGZ1 bmN0aW9uKGxpbmVDb250ZW50LCByZWdleCkKICAgICB7CkBAIC02NjMsMTQgKzY3NCwxNCBAQCBX ZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUucHJvdG90eXBlID0gewogICAg ICAgICB2YXIgb2Zmc2V0ID0gMDsKICAgICAgICAgdmFyIG1hdGNoUmFuZ2VzID0gW107CiAgICAg ICAgIHdoaWxlICgocmVnZXgubGFzdEluZGV4IDwgbGluZUNvbnRlbnQubGVuZ3RoKSAmJiAobWF0 Y2ggPSByZWdleC5leGVjKGxpbmVDb250ZW50KSkpCi0gICAgICAgICAgICBtYXRjaFJhbmdlcy5w dXNoKHsgb2Zmc2V0OiBtYXRjaC5pbmRleCwgbGVuZ3RoOiBtYXRjaFswXS5sZW5ndGggfSk7Ci0g ICAgICAgIAorICAgICAgICAgICAgbWF0Y2hSYW5nZXMucHVzaChuZXcgV2ViSW5zcGVjdG9yLlNl YXJjaFJlc3VsdChtYXRjaC5pbmRleCwgbWF0Y2hbMF0ubGVuZ3RoKSk7CisKICAgICAgICAgcmV0 dXJuIG1hdGNoUmFuZ2VzOwogICAgIH0sCiAgICAgCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtz dHJpbmd9IGxpbmVDb250ZW50Ci0gICAgICogQHBhcmFtIHtBcnJheS48T2JqZWN0Pn0gbWF0Y2hS YW5nZXMKKyAgICAgKiBAcGFyYW0ge0FycmF5LjxXZWJJbnNwZWN0b3IuU2VhcmNoUmVzdWx0Pn0g bWF0Y2hSYW5nZXMKICAgICAgKi8KICAgICBfY3JlYXRlQ29udGVudFNwYW46IGZ1bmN0aW9uKGxp bmVDb250ZW50LCBtYXRjaFJhbmdlcykKICAgICB7CkBAIC02ODYsMTEgKzY5NywxMSBAQCBXZWJJ bnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUucHJvdG90eXBlLl9fcHJvdG9fXyA9 IFdlYkluc3BlY3Rvci5TZWFyYwogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgotICogQHBhcmFtIHtP YmplY3R9IGZpbGUKKyAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gdWlTb3Vy Y2VDb2RlCiAgKiBAcGFyYW0ge0FycmF5LjxPYmplY3Q+fSBzZWFyY2hNYXRjaGVzCiAgKi8KLVdl Ykluc3BlY3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRzUGFuZS5TZWFyY2hSZXN1bHQgPSBmdW5j dGlvbihmaWxlLCBzZWFyY2hNYXRjaGVzKSB7Ci0gICAgdGhpcy5maWxlID0gZmlsZTsKK1dlYklu c3BlY3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRzUGFuZS5TZWFyY2hSZXN1bHQgPSBmdW5jdGlv bih1aVNvdXJjZUNvZGUsIHNlYXJjaE1hdGNoZXMpIHsKKyAgICB0aGlzLnVpU291cmNlQ29kZSA9 IHVpU291cmNlQ29kZTsKICAgICB0aGlzLnNlYXJjaE1hdGNoZXMgPSBzZWFyY2hNYXRjaGVzOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Njcmlw dHNTZWFyY2hTY29wZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1NlYXJjaFNjb3BlLmpzCmluZGV4IDgwMzdjYjY2YzAwYzk1MDRlM2U0ZWJlZDI1MzA1OWRj NmY3NWUzZmYuLmNlMTY2NGM1MTc4YTU2ZjA3NDE2YmMwNWIwNzM5MDYzYWQ1ZTI0NWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1NlYXJjaFNj b3BlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Nl YXJjaFNjb3BlLmpzCkBAIC00Miw3ICs0Miw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzU2VhcmNo U2NvcGUgPSBmdW5jdGlvbih1aVNvdXJjZUNvZGVQcm92aWRlcikKIFdlYkluc3BlY3Rvci5TY3Jp cHRzU2VhcmNoU2NvcGUucHJvdG90eXBlID0gewogICAgIC8qKgogICAgICAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlNlYXJjaENvbmZpZ30gc2VhcmNoQ29uZmlnCi0gICAgICogQHBhcmFtIHtmdW5j dGlvbihPYmplY3QpfSBzZWFyY2hSZXN1bHRDYWxsYmFjaworICAgICAqIEBwYXJhbSB7ZnVuY3Rp b24oV2ViSW5zcGVjdG9yLkZpbGVCYXNlZFNlYXJjaFJlc3VsdHNQYW5lLlNlYXJjaFJlc3VsdCl9 IHNlYXJjaFJlc3VsdENhbGxiYWNrCiAgICAgICogQHBhcmFtIHtmdW5jdGlvbihib29sZWFuKX0g c2VhcmNoRmluaXNoZWRDYWxsYmFjawogICAgICAqLwogICAgIHBlcmZvcm1TZWFyY2g6IGZ1bmN0 aW9uKHNlYXJjaENvbmZpZywgc2VhcmNoUmVzdWx0Q2FsbGJhY2ssIHNlYXJjaEZpbmlzaGVkQ2Fs bGJhY2spCkBAIC05Nyw3ICs5Nyw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzU2VhcmNoU2NvcGUu cHJvdG90eXBlID0gewogICAgICAqLwogICAgIGNyZWF0ZVNlYXJjaFJlc3VsdHNQYW5lOiBmdW5j dGlvbihzZWFyY2hDb25maWcpCiAgICAgewotICAgICAgICByZXR1cm4gbmV3IFdlYkluc3BlY3Rv ci5TY3JpcHRzU2VhcmNoUmVzdWx0c1BhbmUoc2VhcmNoQ29uZmlnKTsKKyAgICAgICAgcmV0dXJu IG5ldyBXZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUoc2VhcmNoQ29uZmln KTsKICAgICB9LAogCiAgICAgLyoqCkBAIC0xMjYsNjUgKzEyNiw0IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzU2VhcmNoU2NvcGUucHJvdG90eXBlID0gewogCiBXZWJJbnNwZWN0b3IuU2NyaXB0c1Nl YXJjaFNjb3BlLnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuU2VhcmNoU2NvcGUu cHJvdG90eXBlOwogCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGV4dGVuZHMge1dlYkluc3Bl Y3Rvci5GaWxlQmFzZWRTZWFyY2hSZXN1bHRzUGFuZX0KLSAqIEBwYXJhbSB7V2ViSW5zcGVjdG9y LlNlYXJjaENvbmZpZ30gc2VhcmNoQ29uZmlnCi0gKi8KLVdlYkluc3BlY3Rvci5TY3JpcHRzU2Vh cmNoUmVzdWx0c1BhbmUgPSBmdW5jdGlvbihzZWFyY2hDb25maWcpCi17Ci0gICAgV2ViSW5zcGVj dG9yLkZpbGVCYXNlZFNlYXJjaFJlc3VsdHNQYW5lLmNhbGwodGhpcywgc2VhcmNoQ29uZmlnKQot Ci0gICAgdGhpcy5fbGlua2lmaWVyID0gbmV3IFdlYkluc3BlY3Rvci5MaW5raWZpZXIobmV3IFdl Ykluc3BlY3Rvci5TY3JpcHRzU2VhcmNoUmVzdWx0c1BhbmUuTGlua2lmaWVyRm9ybWF0dGVyKCkp OwotfQotCi1XZWJJbnNwZWN0b3IuU2NyaXB0c1NlYXJjaFJlc3VsdHNQYW5lLnByb3RvdHlwZSA9 IHsKLSAgICAvKioKLSAgICAgKiBAcGFyYW0ge09iamVjdH0gZmlsZQotICAgICAqIEBwYXJhbSB7 bnVtYmVyfSBsaW5lTnVtYmVyCi0gICAgICogQHBhcmFtIHtudW1iZXJ9IGNvbHVtbk51bWJlcgot ICAgICAqLwotICAgIGNyZWF0ZUFuY2hvcjogZnVuY3Rpb24oZmlsZSwgbGluZU51bWJlciwgY29s dW1uTnVtYmVyKQotICAgIHsKLSAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IC8qKiBAdHlwZSB7 V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0gKi8gZmlsZTsKLSAgICAgICAgdmFyIHJhd0xvY2F0 aW9uID0gdWlTb3VyY2VDb2RlLnVpTG9jYXRpb25Ub1Jhd0xvY2F0aW9uKGxpbmVOdW1iZXIsIGNv bHVtbk51bWJlcik7Ci0gICAgICAgIHZhciBhbmNob3IgPSB0aGlzLl9saW5raWZpZXIubGlua2lm eVJhd0xvY2F0aW9uKHJhd0xvY2F0aW9uKTsKLSAgICAgICAgYW5jaG9yLnJlbW92ZUNoaWxkcmVu KCk7Ci0gICAgICAgIHJldHVybiBhbmNob3I7Ci0gICAgfSwKLSAgICAKLSAgICAvKioKLSAgICAg KiBAcGFyYW0ge09iamVjdH0gZmlsZQotICAgICAqIEByZXR1cm4ge3N0cmluZ30KLSAgICAgKi8K LSAgICBmaWxlTmFtZTogZnVuY3Rpb24oZmlsZSkKLSAgICB7Ci0gICAgICAgIHZhciB1aVNvdXJj ZUNvZGUgPSBmaWxlOwotICAgICAgICByZXR1cm4gdWlTb3VyY2VDb2RlLnVybDsKLSAgICB9LAot fQotCi1XZWJJbnNwZWN0b3IuU2NyaXB0c1NlYXJjaFJlc3VsdHNQYW5lLnByb3RvdHlwZS5fX3By b3RvX18gPSBXZWJJbnNwZWN0b3IuRmlsZUJhc2VkU2VhcmNoUmVzdWx0c1BhbmUucHJvdG90eXBl OwotCi0vKioKLSAqIEBjb25zdHJ1Y3RvcgotICogQGltcGxlbWVudHMge1dlYkluc3BlY3Rvci5M aW5raWZpZXJGb3JtYXR0ZXJ9Ci0gKi8KLVdlYkluc3BlY3Rvci5TY3JpcHRzU2VhcmNoUmVzdWx0 c1BhbmUuTGlua2lmaWVyRm9ybWF0dGVyID0gZnVuY3Rpb24oKQotewotfQotCi1XZWJJbnNwZWN0 b3IuU2NyaXB0c1NlYXJjaFJlc3VsdHNQYW5lLkxpbmtpZmllckZvcm1hdHRlci5wcm90b3R5cGUg PSB7Ci0gICAgLyoqCi0gICAgICogQHBhcmFtIHtFbGVtZW50fSBhbmNob3IKLSAgICAgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5VSUxvY2F0aW9ufSB1aUxvY2F0aW9uCi0gICAgICovCi0gICAgZm9y bWF0TGl2ZUFuY2hvcjogZnVuY3Rpb24oYW5jaG9yLCB1aUxvY2F0aW9uKQotICAgIHsKLSAgICAg ICAgLy8gRW1wdHkgYmVjYXVzZSB3ZSBkb24ndCB3YW50IHRvIGV2ZXIgdXBkYXRlIGFuY2hvciBj b250ZW50cyBhZnRlciBjcmVhdGlvbi4KLSAgICB9Ci19Ci0KLVdlYkluc3BlY3Rvci5TY3JpcHRz U2VhcmNoUmVzdWx0c1BhbmUuTGlua2lmaWVyRm9ybWF0dGVyLnByb3RvdHlwZS5fX3Byb3RvX18g PSBXZWJJbnNwZWN0b3IuTGlua2lmaWVyRm9ybWF0dGVyLnByb3RvdHlwZTsKLQogV2ViSW5zcGVj dG9yLnNldHRpbmdzLnNlYXJjaEluQ29udGVudFNjcmlwdHMgPSBXZWJJbnNwZWN0b3Iuc2V0dGlu Z3MuY3JlYXRlU2V0dGluZygic2VhcmNoSW5Db250ZW50U2NyaXB0cyIsIGZhbHNlKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggY2Nm ZDk1N2Q3ZTdhY2Q1MmQwYjQwOGNlOGQzMDA4MGZiOGIzNWZmMy4uNDM5Y2NiMzA3MjExNmY0MDg3 NDQ1Y2E3ODU4MGUwYzdmN2MxNzI1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTY1Myw3ICs2NTMsNyBAQCBXZWJJbnNwZWN0b3Iu X3JlZ2lzdGVyU2hvcnRjdXRzID0gZnVuY3Rpb24oKQogICAgIHNlY3Rpb24uYWRkS2V5KHNob3J0 Y3V0LnNob3J0Y3V0VG9TdHJpbmcoImYiLCBzaG9ydGN1dC5Nb2RpZmllcnMuQ3RybE9yTWV0YSks IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2VhcmNoIikpOwogICAgIAogICAgIHZhciBhZHZhbmNl ZFNlYXJjaFNob3J0Y3V0ID0gV2ViSW5zcGVjdG9yLkFkdmFuY2VkU2VhcmNoQ29udHJvbGxlci5j cmVhdGVTaG9ydGN1dCgpOwotICAgIHNlY3Rpb24uYWRkS2V5KGFkdmFuY2VkU2VhcmNoU2hvcnRj dXQubmFtZSwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWFyY2ggYWNyb3NzIGFsbCBzY3JpcHRz IikpOworICAgIHNlY3Rpb24uYWRkS2V5KGFkdmFuY2VkU2VhcmNoU2hvcnRjdXQubmFtZSwgV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTZWFyY2ggYWNyb3NzIGFsbCBzb3VyY2VzIikpOwogICAgIAog ICAgIGlmIChXZWJJbnNwZWN0b3IuaXNNYWMoKSkgewogICAgICAgICBrZXlzID0gWwo=