75172 2011-12-23 07:17:02 -0800 Web Inspector: make SDK compilation component self-contained. 2011-12-26 04:28:05 -0800 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 526849 0 pfeldman 2011-12-23 07:17:02 -0800 Patch to follow. 526850 1 120464 pfeldman 2011-12-23 07:23:01 -0800 Created attachment 120464 Patch 527190 2 pfeldman 2011-12-26 04:28:05 -0800 Committed r103681: <http://trac.webkit.org/changeset/103681> 120464 2011-12-23 07:23:01 -0800 2011-12-26 02:37:26 -0800 Patch bug-75172-20111223192259.patch text/plain 14808 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzNjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDhjZGU0YzY2NmQzOWQ4 NGM1ZjFmNTJlNDBkNjYzN2M0OGQyZmE2Yy4uMTIxMjQxMzRmZTcxNzFmMDY4OTVmNzc0ZWIxM2Nl NjQ4ZmI4NjRmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMwIEBACiAyMDExLTEyLTIzICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBtYWtlIFNESyBjb21waWxhdGlvbiBjb21wb25lbnQgc2VsZi1jb250YWluZWQuCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTE3MgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2NvbXBp bGUtZnJvbnQtZW5kLnNoOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1l c3NhZ2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90eXBlLmdldCBzdGFj a1RyYWNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZUltcGwucHJvdG90 eXBlLmNsb25lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNb2RlbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwucHJvdG90eXBlLl9tZXNzYWdl UmVwZWF0Q291bnRVcGRhdGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2Fn ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UucHJvdG90eXBlLmlzRXJy b3JPcldhcm5pbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLnByb3Rv dHlwZS51cGRhdGVSZXBlYXRDb3VudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UucHJvdG90eXBlLmNsb25lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0Rl YnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdn ZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUuX2NvbnNvbGVNZXNzYWdlQWRkZWQpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VVdGlscy5qczoKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRpbHMuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IucmVz ZXRUb29sYmFyQ29sb3JzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5wb3B1bGF0ZUhyZWZDb250 ZXh0TWVudSk6CisKKzIwMTEtMTItMjMgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUu Y29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1pZ3JhdGUgdG8gbmF0aXZlIEZ1bmN0aW9u LnByb3RvdHlwZS5iaW5kOyBmaXggZnJvbnQtZW5kIGNvbXBpbGF0aW9uIHdpdGggdGhlCiAgICAg ICAgIHZlcnNpb24gb2YgY29tcGlsZXIgdGhhdCByZXNwZWN0cyBGdW5jdGlvbi5wcm90b3R5cGUu YmluZC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1 MTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1l bmQuc2ggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKaW5k ZXggYTI3YTM2MjFkZDYwNWQ5NDE1N2FkY2NkNGIyN2MwMjc0YzhhODMxNC4uNzFjMTFkODM0ODBj ZmU5MzdlNWVmZGVhOTdkYmY4OTNhNjc4MTcyOCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9jb21waWxlLWZyb250LWVuZC5zaApAQCAtNDUsOSArNDUsMTAgQEAgamF2YSAtamFyIH4v Y2xvc3VyZS9jb21waWxlci5qYXIgLS1zdW1tYXJ5X2RldGFpbF9sZXZlbCAzIC0tY29tcGlsYXRp b25fbGV2ZWwgU0kKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1VzZXJNZXRyaWNzLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0hhbmRsZXJSZWdpc3RyeS5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzIFwK LSAgICAtLW1vZHVsZSBqc21vZHVsZV9zZGs6MjY6anNtb2R1bGVfY29tbW9uIFwKKyAgICAtLW1v ZHVsZSBqc21vZHVsZV9zZGs6Mjk6anNtb2R1bGVfY29tbW9uIFwKICAgICAgICAgLS1qcyBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckJhY2tlbmQuanMgXAogICAg ICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQXBwbGljYXRpb25D YWNoZU1vZGVsLmpzIFwKKyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL0NvbG9yLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbXBpbGVyU291cmNlTWFwcGluZy5qcyBcCiAgICAgICAgIC0tanMgU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTW9kZWwuanMgXAogICAgICAgICAt LWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29udGVudFByb3ZpZGVycy5q cyBcCkBAIC02MywxOSArNjQsMjAgQEAgamF2YSAtamFyIH4vY2xvc3VyZS9jb21waWxlci5qYXIg LS1zdW1tYXJ5X2RldGFpbF9sZXZlbCAzIC0tY29tcGlsYXRpb25fbGV2ZWwgU0kKICAgICAgICAg LS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSEFSRW50cnkuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya0xvZy5qcyBcCisgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9QbGFjYXJkLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdC5qcyBcCiAgICAgICAgIC0tanMgU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXIuanMgXAogICAgICAg ICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmF3U291cmNlQ29kZS5q cyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1v dGVPYmplY3QuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2UuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvUmVzb3VyY2VDYXRlZ29yeS5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVRyZWVNb2RlbC5qcyBcCi0gICAgICAg IC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcyBcCisg ICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVV0 aWxzLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L05ldHdvcmtNYW5hZ2VyLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfdWk6 MzY6anNtb2R1bGVfY29tbW9uIFwKKyAgICAtLW1vZHVsZSBqc21vZHVsZV91aTozNDpqc21vZHVs ZV9jb21tb24gXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQWR2YW5jZWRTZWFyY2hDb250cm9sbGVyLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NoZWNrYm94LmpzIFwKLSAgICAgICAgLS1qcyBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbG9yLmpzIFwKICAgICAgICAgLS1qcyBT b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzIFwKICAgICAg ICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZXNUYWJsZS5q cyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01T eW50YXhIaWdobGlnaHRlci5qcyBcCkBAIC04Nyw3ICs4OSw2IEBAIGphdmEgLWphciB+L2Nsb3N1 cmUvY29tcGlsZXIuamFyIC0tc3VtbWFyeV9kZXRhaWxfbGV2ZWwgMyAtLWNvbXBpbGF0aW9uX2xl dmVsIFNJCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9L ZXlib2FyZFNob3J0Y3V0LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1BhbmVsLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1BhbmVsRW5hYmxlclZpZXcuanMgXAotICAgICAgICAtLWpzIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGxhY2FyZC5qcyBcCiAgICAgICAgIC0tanMg U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzIFwKICAgICAgICAg LS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb3BlcnRpZXNTZWN0aW9u LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1By b3BlcnRpZXNTaWRlYmFyUGFuZS5qcyBcCkBAIC0xMDksNyArMTEwLDcgQEAgamF2YSAtamFyIH4v Y2xvc3VyZS9jb21waWxlci5qYXIgLS1zdW1tYXJ5X2RldGFpbF9sZXZlbCAzIC0tY29tcGlsYXRp b25fbGV2ZWwgU0kKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1VJVXRpbHMuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvVmlldy5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9XZWxjb21lVmlldy5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfY29tcG9u ZW50czoxNjpqc21vZHVsZV9zZGssanNtb2R1bGVfdWkgXAorICAgIC0tbW9kdWxlIGpzbW9kdWxl X2NvbXBvbmVudHM6MTU6anNtb2R1bGVfc2RrLGpzbW9kdWxlX3VpIFwKICAgICAgICAgLS1qcyBT b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzIFwKICAg ICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JyZWFrcG9pbnRz U2lkZWJhclBhbmUuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRE9NQnJlYWtwb2ludHNTaWRlYmFyUGFuZS5qcyBcCkBAIC0xMjAsNyArMTIxLDYg QEAgamF2YSAtamFyIH4vY2xvc3VyZS9jb21waWxlci5qYXIgLS1zdW1tYXJ5X2RldGFpbF9sZXZl bCAzIC0tY29tcGlsYXRpb25fbGV2ZWwgU0kKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRDb250ZXh0TWFuYWdlci5qcyBcCiAgICAgICAg IC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3RQb3BvdmVySGVs cGVyLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L09iamVjdFByb3BlcnRpZXNTZWN0aW9uLmpzIFwKLSAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanMgXAogICAgICAgICAtLWpzIFNv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMgXAogICAgICAg ICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVG9rZW5pemVy LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rp bWVsaW5lQWdlbnQuanMgXApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9Db25zb2xlTWVzc2FnZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKaW5kZXggMTUxYzYxZDM3YjUxZDg3N2M5Y2EwZmE1YmFk ZjdhZWI3MjU4YjEwNy4uNTFjZDg5NjlhZmRkMGUxOThjODU2ZTIxNmM4YzEyMzUyYTkzYThjYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVz c2FnZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVN ZXNzYWdlLmpzCkBAIC00NiwxOCArNDYsMTAgQEAKICAqLwogV2ViSW5zcGVjdG9yLkNvbnNvbGVN ZXNzYWdlSW1wbCA9IGZ1bmN0aW9uKHNvdXJjZSwgbGV2ZWwsIG1lc3NhZ2UsIGxpbmtpZmllciwg dHlwZSwgdXJsLCBsaW5lLCByZXBlYXRDb3VudCwgcGFyYW1ldGVycywgc3RhY2tUcmFjZSwgcmVx dWVzdCkKIHsKLSAgICBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuY2FsbCgpOworICAgIFdl Ykluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5jYWxsKHRoaXMsIHNvdXJjZSwgbGV2ZWwsIHVybCwg bGluZSwgcmVwZWF0Q291bnQpOwogCiAgICAgdGhpcy5fbGlua2lmaWVyID0gbGlua2lmaWVyOwot ICAgIHRoaXMuc291cmNlID0gc291cmNlOwogICAgIHRoaXMudHlwZSA9IHR5cGUgfHwgV2ViSW5z cGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VUeXBlLkxvZzsKLSAgICB0aGlzLmxldmVsID0g bGV2ZWw7Ci0gICAgdGhpcy5saW5lID0gbGluZSB8fCAwOwotICAgIHRoaXMudXJsID0gdXJsIHx8 IG51bGw7Ci0gICAgcmVwZWF0Q291bnQgPSByZXBlYXRDb3VudCB8fCAxOwotICAgIHRoaXMucmVw ZWF0Q291bnQgPSByZXBlYXRDb3VudDsKLSAgICB0aGlzLnJlcGVhdERlbHRhID0gcmVwZWF0Q291 bnQ7Ci0gICAgdGhpcy50b3RhbFJlcGVhdENvdW50ID0gcmVwZWF0Q291bnQ7CiAgICAgdGhpcy5f bWVzc2FnZVRleHQgPSBtZXNzYWdlOwogICAgIHRoaXMuX3BhcmFtZXRlcnMgPSBwYXJhbWV0ZXJz OwogICAgIHRoaXMuX3N0YWNrVHJhY2UgPSBzdGFja1RyYWNlOwpAQCAtNTk0LDYgKzU4NiwxNCBA QCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZSA9IHsKICAgICBnZXQg c3RhY2tUcmFjZSgpCiAgICAgewogICAgICAgICByZXR1cm4gdGhpcy5fc3RhY2tUcmFjZTsKKyAg ICB9LAorCisgICAgLyoqCisgICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNz YWdlfQorICAgICAqLworICAgIGNsb25lOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLmNyZWF0ZSh0aGlzLnNvdXJjZSwgdGhpcy5s ZXZlbCwgdGhpcy5fbWVzc2FnZVRleHQsIHRoaXMudHlwZSwgdGhpcy51cmwsIHRoaXMubGluZSwg dGhpcy5yZXBlYXRDb3VudCwgdGhpcy5fcGFyYW1ldGVycywgdGhpcy5fc3RhY2tUcmFjZSwgdGhp cy5fcmVxdWVzdCk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNb2RlbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvQ29uc29sZU1vZGVsLmpzCmluZGV4IDkwZWY3YTBmOGNjNDM1YjhlNWFmMzdi N2U1ZTVhZDFhMTExODBlYzIuLjUyOGNkZTIxOGUwOTc0MDM0OGVmNzFmZjhiMjUyM2UwYTRiYzg1 ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29s ZU1vZGVsLmpzCkBAIC0xMjEsOCArMTIxLDEwIEBAIFdlYkluc3BlY3Rvci5Db25zb2xlTW9kZWwu cHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5faW5jcmVtZW50RXJyb3JXYXJuaW5nQ291 bnQobXNnKTsKICAgICAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYklu c3BlY3Rvci5Db25zb2xlTW9kZWwuRXZlbnRzLlJlcGVhdENvdW50VXBkYXRlZCwgbXNnKTsKICAg ICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIHZhciBtc2dDb3B5ID0gV2ViSW5zcGVjdG9yLkNv bnNvbGVNZXNzYWdlLmNyZWF0ZShtc2cuc291cmNlLCBtc2cubGV2ZWwsIG1zZy5fbWVzc2FnZVRl eHQsIG1zZy50eXBlLCBtc2cudXJsLCBtc2cubGluZSwgY291bnQgLSBwcmV2UmVwZWF0Q291bnQs IG1zZy5fcGFyYW1ldGVycywgbXNnLl9zdGFja1RyYWNlLCBtc2cuX3JlcXVlc3QpOworICAgICAg ICAgICAgdmFyIG1zZ0NvcHkgPSBtc2cuY2xvbmUoKTsKICAgICAgICAgICAgIG1zZ0NvcHkudG90 YWxSZXBlYXRDb3VudCA9IGNvdW50OworICAgICAgICAgICAgbXNnQ29weS5yZXBlYXRDb3VudCA9 IChjb3VudCAtIHByZXZSZXBlYXRDb3VudCkgfHwgMTsKKyAgICAgICAgICAgIG1zZ0NvcHkucmVw ZWF0RGVsdGEgPSBtc2dDb3B5LnJlcGVhdENvdW50OwogICAgICAgICAgICAgdGhpcy5hZGRNZXNz YWdlKG1zZ0NvcHkpOwogICAgICAgICB9CiAgICAgfQpAQCAtMTMyLDI5ICsxMzQsNDAgQEAgV2Vi SW5zcGVjdG9yLkNvbnNvbGVNb2RlbC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9y Lk9iamVjdC5wcm90b3R5cGU7CiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAcGFyYW0ge3N0 cmluZ30gc291cmNlCisgKiBAcGFyYW0ge3N0cmluZ30gbGV2ZWwKKyAqIEBwYXJhbSB7c3RyaW5n PX0gdXJsCisgKiBAcGFyYW0ge251bWJlcj19IGxpbmUKKyAqIEBwYXJhbSB7bnVtYmVyPX0gcmVw ZWF0Q291bnQKICAqLwotV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlID0gZnVuY3Rpb24oKQor V2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlID0gZnVuY3Rpb24oc291cmNlLCBsZXZlbCwgdXJs LCBsaW5lLCByZXBlYXRDb3VudCkKIHsKLSAgICB0aGlzLnJlcGVhdERlbHRhID0gMDsKLSAgICB0 aGlzLnJlcGVhdENvdW50ID0gMDsKLSAgICB0aGlzLl90b3RhbFJlcGVhdENvdW50ID0gMDsKKyAg ICB0aGlzLnNvdXJjZSA9IHNvdXJjZTsKKyAgICB0aGlzLmxldmVsID0gbGV2ZWw7CisgICAgdGhp cy51cmwgPSB1cmwgfHwgbnVsbDsKKyAgICB0aGlzLmxpbmUgPSBsaW5lIHx8IDA7CisKKyAgICBy ZXBlYXRDb3VudCA9IHJlcGVhdENvdW50IHx8IDE7CisgICAgdGhpcy5yZXBlYXRDb3VudCA9IHJl cGVhdENvdW50OworICAgIHRoaXMucmVwZWF0RGVsdGEgPSByZXBlYXRDb3VudDsKKyAgICB0aGlz LnRvdGFsUmVwZWF0Q291bnQgPSByZXBlYXRDb3VudDsKIH0KIAogV2ViSW5zcGVjdG9yLkNvbnNv bGVNZXNzYWdlLnByb3RvdHlwZSA9IHsKLSAgICAvKioKLSAgICAgKiBAcmV0dXJuIHtudW1iZXJ9 Ci0gICAgICovCi0gICAgZ2V0IHRvdGFsUmVwZWF0Q291bnQoKQorICAgIGlzRXJyb3JPcldhcm5p bmc6IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl90b3RhbFJlcGVhdENv dW50OworICAgICAgICByZXR1cm4gKHRoaXMubGV2ZWwgPT09IFdlYkluc3BlY3Rvci5Db25zb2xl TWVzc2FnZS5NZXNzYWdlTGV2ZWwuV2FybmluZyB8fCB0aGlzLmxldmVsID09PSBXZWJJbnNwZWN0 b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZUxldmVsLkVycm9yKTsKICAgICB9LAogCi0gICAgc2V0 IHRvdGFsUmVwZWF0Q291bnQodG90YWxSZXBlYXRDb3VudCkKKyAgICB1cGRhdGVSZXBlYXRDb3Vu dDogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgdGhpcy5fdG90YWxSZXBlYXRDb3VudCA9IHRv dGFsUmVwZWF0Q291bnQ7CisgICAgICAgIC8vIEltcGxlbWVudGVkIGJ5IGNvbmNyZXRlIGluc3Rh bmNlcwogICAgIH0sCiAKLSAgICB1cGRhdGVSZXBlYXRDb3VudDogZnVuY3Rpb24oKQorICAgIC8q KgorICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZX0KKyAgICAgKi8K KyAgICBjbG9uZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkg Y29uY3JldGUgaW5zdGFuY2VzCiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpzCmlu ZGV4IDYzNjA0NTkxOTRmYzNhNDY5ZWY2NTFhMmEyNjIyMDI1ZTFmNDVkMjIuLmIzM2E3MDdhOTAy MDRlNjVmNGY3NTcwOTE2NjNmODQ3MDA1MmYxZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwuanMKQEAgLTgyLDcgKzgyLDcgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9u TW9kZWwucHJvdG90eXBlID0gewogCiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtXZWJJbnNwZWN0 b3IuUHJlc2VudGF0aW9uQ2FsbEZyYW1lfSBjYWxsRnJhbWUKLSAgICAgKiBAcmV0dXJuIHtXZWJJ bnNwZWN0b3IuUGxhY2FyZH0KKyAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5DYWxsRnJhbWVQbGFjYXJkfQogICAgICAqLwogICAgIGNyZWF0ZVBs YWNhcmQ6IGZ1bmN0aW9uKGNhbGxGcmFtZSkKICAgICB7CkBAIC0zNTAsNyArMzUwLDcgQEAgV2Vi SW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgIF9j b25zb2xlTWVzc2FnZUFkZGVkOiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZhciBt ZXNzYWdlID0gLyoqIEB0eXBlIHtXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2V9ICovIGV2ZW50 LmRhdGE7Ci0gICAgICAgIGlmICghbWVzc2FnZS51cmwgfHwgIW1lc3NhZ2UuaXNFcnJvck9yV2Fy bmluZygpIHx8ICFtZXNzYWdlLm1lc3NhZ2UpCisgICAgICAgIGlmICghbWVzc2FnZS51cmwgfHwg IW1lc3NhZ2UuaXNFcnJvck9yV2FybmluZygpKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAg ICAgIHZhciByYXdTb3VyY2VDb2RlID0gdGhpcy5fcmF3U291cmNlQ29kZUZvclNjcmlwdFdpdGhV UkwobWVzc2FnZS51cmwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9SZXNvdXJjZVV0aWxzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZVV0aWxzLmpzCmluZGV4IGIxNThkNWU3Njc4ZTlkNjZkYzc2M2U2YTE3NzVm MDUxZDJkYTEyZTUuLjVlNmEyYjYwNjc2MDg2MjAxOWY2YzU4YjM1MjFhZDAwZDc5YzQwY2YgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VVdGls cy5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRp bHMuanMKQEAgLTI1MCwyOSArMjUwLDYgQEAgV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMRm9yUmVs YXRlZE5vZGUgPSBmdW5jdGlvbihub2RlLCB1cmwpCiB9CiAKIC8qKgotICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuQ29udGV4dE1lbnV9IGNvbnRleHRNZW51Ci0gKiBAcGFyYW0ge05vZGV9IGNvbnRl eHROb2RlCi0gKiBAcGFyYW0ge0V2ZW50fSBldmVudAotICovCi1XZWJJbnNwZWN0b3IucG9wdWxh dGVIcmVmQ29udGV4dE1lbnUgPSBmdW5jdGlvbihjb250ZXh0TWVudSwgY29udGV4dE5vZGUsIGV2 ZW50KQotewotICAgIHZhciBhbmNob3JFbGVtZW50ID0gZXZlbnQudGFyZ2V0LmVuY2xvc2luZ05v ZGVPclNlbGZXaXRoQ2xhc3MoIndlYmtpdC1odG1sLXJlc291cmNlLWxpbmsiKSB8fCBldmVudC50 YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWh0bWwtZXh0ZXJuYWwt bGluayIpOwotICAgIGlmICghYW5jaG9yRWxlbWVudCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwot Ci0gICAgdmFyIHJlc291cmNlVVJMID0gV2ViSW5zcGVjdG9yLnJlc291cmNlVVJMRm9yUmVsYXRl ZE5vZGUoY29udGV4dE5vZGUsIGFuY2hvckVsZW1lbnQuaHJlZik7Ci0gICAgaWYgKCFyZXNvdXJj ZVVSTCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgLy8gQWRkIHJlc291cmNlLXJlbGF0 ZWQgYWN0aW9ucy4KLSAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5vcGVu TGlua0V4dGVybmFsbHlMYWJlbCgpLCBXZWJJbnNwZWN0b3Iub3BlblJlc291cmNlLmJpbmQoV2Vi SW5zcGVjdG9yLCByZXNvdXJjZVVSTCwgZmFsc2UpKTsKLSAgICBpZiAoV2ViSW5zcGVjdG9yLnJl c291cmNlRm9yVVJMKHJlc291cmNlVVJMKSkKLSAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRl bShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRs ZXMoKSA/ICJPcGVuIGxpbmsgaW4gUmVzb3VyY2VzIHBhbmVsIiA6ICJPcGVuIExpbmsgaW4gUmVz b3VyY2VzIFBhbmVsIiksIFdlYkluc3BlY3Rvci5vcGVuUmVzb3VyY2UuYmluZChudWxsLCByZXNv dXJjZVVSTCwgdHJ1ZSkpOwotICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9y LmNvcHlMaW5rQWRkcmVzc0xhYmVsKCksIEluc3BlY3RvckZyb250ZW5kSG9zdC5jb3B5VGV4dC5i aW5kKEluc3BlY3RvckZyb250ZW5kSG9zdCwgcmVzb3VyY2VVUkwpKTsKLSAgICByZXR1cm4gdHJ1 ZTsKLX0KLQotLyoqCiAgKiBAcGFyYW0ge3N0cmluZ30gYmFzZVVSTAogICogQHBhcmFtIHtzdHJp bmd9IGhyZWYKICAqIEByZXR1cm4gez9zdHJpbmd9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1VJVXRpbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1VJVXRpbHMuanMKaW5kZXggNTZmZWE0ZjQ5MWIwMzViMmE4MWEyNGE4NWJm NzhlN2E0ODc1YjE2ZC4uNDI3YzdkOWNmM2MyZTE5NTc5YmE5ZmMxNWEyOGZkZjIyY2Y2ZTY5ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlVdGlscy5qcwpAQCAt NjMzLDcgKzYzMywyOSBAQCBXZWJJbnNwZWN0b3IucmVzZXRUb29sYmFyQ29sb3JzID0gZnVuY3Rp b24oKQogewogICAgIGlmIChXZWJJbnNwZWN0b3IuX3RoZW1lU3R5bGVFbGVtZW50KQogICAgICAg ICBXZWJJbnNwZWN0b3IuX3RoZW1lU3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0gIiI7Cit9CiAK Ky8qKgorICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnV9IGNvbnRleHRNZW51Cisg KiBAcGFyYW0ge05vZGV9IGNvbnRleHROb2RlCisgKiBAcGFyYW0ge0V2ZW50fSBldmVudAorICov CitXZWJJbnNwZWN0b3IucG9wdWxhdGVIcmVmQ29udGV4dE1lbnUgPSBmdW5jdGlvbihjb250ZXh0 TWVudSwgY29udGV4dE5vZGUsIGV2ZW50KQoreworICAgIHZhciBhbmNob3JFbGVtZW50ID0gZXZl bnQudGFyZ2V0LmVuY2xvc2luZ05vZGVPclNlbGZXaXRoQ2xhc3MoIndlYmtpdC1odG1sLXJlc291 cmNlLWxpbmsiKSB8fCBldmVudC50YXJnZXQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygi d2Via2l0LWh0bWwtZXh0ZXJuYWwtbGluayIpOworICAgIGlmICghYW5jaG9yRWxlbWVudCkKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgdmFyIHJlc291cmNlVVJMID0gV2ViSW5zcGVjdG9y LnJlc291cmNlVVJMRm9yUmVsYXRlZE5vZGUoY29udGV4dE5vZGUsIGFuY2hvckVsZW1lbnQuaHJl Zik7CisgICAgaWYgKCFyZXNvdXJjZVVSTCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAg Ly8gQWRkIHJlc291cmNlLXJlbGF0ZWQgYWN0aW9ucy4KKyAgICBjb250ZXh0TWVudS5hcHBlbmRJ dGVtKFdlYkluc3BlY3Rvci5vcGVuTGlua0V4dGVybmFsbHlMYWJlbCgpLCBXZWJJbnNwZWN0b3Iu b3BlblJlc291cmNlLmJpbmQoV2ViSW5zcGVjdG9yLCByZXNvdXJjZVVSTCwgZmFsc2UpKTsKKyAg ICBpZiAoV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHJlc291cmNlVVJMKSkKKyAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9y LnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJPcGVuIGxpbmsgaW4gUmVzb3VyY2VzIHBhbmVs IiA6ICJPcGVuIExpbmsgaW4gUmVzb3VyY2VzIFBhbmVsIiksIFdlYkluc3BlY3Rvci5vcGVuUmVz b3VyY2UuYmluZChudWxsLCByZXNvdXJjZVVSTCwgdHJ1ZSkpOworICAgIGNvbnRleHRNZW51LmFw cGVuZEl0ZW0oV2ViSW5zcGVjdG9yLmNvcHlMaW5rQWRkcmVzc0xhYmVsKCksIEluc3BlY3RvckZy b250ZW5kSG9zdC5jb3B5VGV4dC5iaW5kKEluc3BlY3RvckZyb250ZW5kSG9zdCwgcmVzb3VyY2VV UkwpKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogOyhmdW5jdGlvbigpIHsK