78693 2012-02-15 04:14:34 -0800 Web Inspector: Fix minor design issues in the Spectrum color picker 2012-02-15 06:11:59 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov apavlov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 557146 0 apavlov 2012-02-15 04:14:34 -0800 Patch to follow. 557157 1 127161 apavlov 2012-02-15 04:36:40 -0800 Created attachment 127161 [PATCH] Suggested solution 557214 2 apavlov 2012-02-15 06:11:59 -0800 Committed r107810: <http://trac.webkit.org/changeset/107810> 127161 2012-02-15 04:36:40 -0800 2012-02-15 04:46:00 -0800 [PATCH] Suggested solution followup.patch text/plain 12268 apavlov Y29tbWl0IDhiMTc4YmU0ODhjOTBiMWMzNzdmYjdhMTQwMDdkYWI5NjFmN2M3YzkKQXV0aG9yOiBB bGV4YW5kZXIgUGF2bG92IDxhcGF2bG92QGNocm9taXVtLm9yZz4KRGF0ZTogICBXZWQgRmViIDE1 IDE2OjExOjA0IDIwMTIgKzA0MDAKCiAgICBGaXgKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzg2OGFhNi4uOWQ5 MDg3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAyLTE1ICBBbGV4YW5kZXIg UGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog Rml4IG1pbm9yIGRlc2lnbiBpc3N1ZXMgaW4gdGhlIFNwZWN0cnVtIGNvbG9yIHBpY2tlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzg2OTMKKworICAg ICAgICBEcml2ZS1ieTogY29tcGlsYWJpbGl0eSBmaXhlcy4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3Ry aW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2g6CisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQt ZW5kL1NwZWN0cnVtLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNwZWN0cnVtLnByb3RvdHlw ZS5nZXQgaXNWaXNpYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5wcm90b3R5 cGUudG9nZ2xlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5wcm90b3R5cGUuc2hv dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3BlY3RydW0ucHJvdG90eXBlLmhpZGUpOgorICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0eVRyZWVFbGVtZW50LnByb3RvdHlwZS51cGRhdGVU aXRsZS4pOgorCiAyMDEyLTAyLTEzICBCcmlhbiBHcmluc3RlYWQgIDxicmlhbmdyaW5zdGVhZEBn bWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIGNvbG9ycGlja2VyIGZ1bmN0 aW9uYWxpdHkgdG8gY29sb3Igc3dhdGNoZXMgaW4gU3R5bGVzIFNpZGViYXIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJj ZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAwY2RiNzMz Li42NTkyOWFhIDEwMDY0NApCaW5hcnkgZmlsZXMgYS9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYW5kIGIvU291cmNlL1dlYkNvcmUvRW5nbGlzaC5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzIGRpZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2NvbXBpbGUtZnJvbnQtZW5kLnNoCmluZGV4IDI5MWZkZWIuLmE3MWMwYTIgMTAwNzU1Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5zaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKQEAgLTc2LDcgKzc2LDcg QEAgamF2YSAtamFyIH4vY2xvc3VyZS9jb21waWxlci5qYXIgLS1zdW1tYXJ5X2RldGFpbF9sZXZl bCAzIC0tY29tcGlsYXRpb25fbGV2ZWwgU0kKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVXRpbHMuanMgXAogICAgICAgICAtLWpzIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMgXAogICAgICAg ICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpz IFwKLSAgICAtLW1vZHVsZSBqc21vZHVsZV91aTozNTpqc21vZHVsZV9jb21tb24gXAorICAgIC0t bW9kdWxlIGpzbW9kdWxlX3VpOjM2OmpzbW9kdWxlX2NvbW1vbiBcCiAgICAgICAgIC0tanMgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9BZHZhbmNlZFNlYXJjaENvbnRyb2xsZXIu anMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ2hl Y2tib3guanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvQ29udGV4dE1lbnUuanMgXApAQCAtMTAyLDYgKzEwMiw3IEBAIGphdmEgLWphciB+L2Nsb3N1 cmUvY29tcGlsZXIuamFyIC0tc3VtbWFyeV9kZXRhaWxfbGV2ZWwgMyAtLWNvbXBpbGF0aW9uX2xl dmVsIFNJCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T aWRlYmFyT3ZlcmxheS5qcyBcCiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Tb2Z0Q29udGV4dE1lbnUuanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlVG9rZW5pemVyLmpzIFwKKyAgICAgICAgLS1q cyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwZWN0cnVtLmpzIFwKICAgICAg ICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwbGl0Vmlldy5qcyBc CiAgICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdGF0dXNC YXJCdXR0b24uanMgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGFiYmVkUGFuZS5qcyBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKaW5kZXggMGI5YzVjNS4uMTM5M2NjZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNQYW5lbC5q cwpAQCAtMzk0LDYgKzM5NCw5IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlw ZSA9IHsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgZGltZW5zaW9uc0NhbGxiYWNrKCk7CiAK KyAgICAgICAgLyoqCisgICAgICAgICAqIEBwYXJhbSB7T2JqZWN0PX0gZGltZW5zaW9ucworICAg ICAgICAgKi8KICAgICAgICAgZnVuY3Rpb24gZGltZW5zaW9uc0NhbGxiYWNrKGRpbWVuc2lvbnMp CiAgICAgICAgIHsKICAgICAgICAgICAgIHZhciBpbWFnZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJpbWciKTsKQEAgLTQwNSwxMiArNDA4LDE4IEBAIFdlYkluc3BlY3Rvci5FbGVt ZW50c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJlc291cmNlLnBvcHVsYXRlSW1h Z2VTb3VyY2UoaW1hZ2VFbGVtZW50KTsKICAgICAgICAgfQogCisgICAgICAgIC8qKgorICAgICAg ICAgKiBAcGFyYW0ge09iamVjdD19IGRpbWVuc2lvbnMKKyAgICAgICAgICovCiAgICAgICAgIGZ1 bmN0aW9uIHNob3dQb3BvdmVyKGltYWdlRWxlbWVudCwgZGltZW5zaW9ucykKICAgICAgICAgewog ICAgICAgICAgICAgdmFyIGNvbnRlbnRzID0gYnVpbGRQb3BvdmVyQ29udGVudHMoaW1hZ2VFbGVt ZW50LCBkaW1lbnNpb25zKTsKICAgICAgICAgICAgIHBvcG92ZXIuc2hvdyhjb250ZW50cywgYW5j aG9yKTsKICAgICAgICAgfQogCisgICAgICAgIC8qKgorICAgICAgICAgKiBAcGFyYW0ge09iamVj dD19IG5vZGVEaW1lbnNpb25zCisgICAgICAgICAqLwogICAgICAgICBmdW5jdGlvbiBidWlsZFBv cG92ZXJDb250ZW50cyhpbWFnZUVsZW1lbnQsIG5vZGVEaW1lbnNpb25zKQogICAgICAgICB7CiAg ICAgICAgICAgICBjb25zdCBtYXhJbWFnZVdpZHRoID0gMTAwOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzCmluZGV4IGZiYjU0ZjkuLjQ4YTVkZDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcwor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMKQEAgLTQ4 LDYgKzQ4LDEwIEBAIFdlYkluc3BlY3Rvci5Qb3BvdmVyID0gZnVuY3Rpb24ocG9wb3ZlckhlbHBl cikKIH0KIAogV2ViSW5zcGVjdG9yLlBvcG92ZXIucHJvdG90eXBlID0geworICAgIC8qKgorICAg ICAqIEBwYXJhbSB7bnVtYmVyPX0gcHJlZmVycmVkV2lkdGgKKyAgICAgKiBAcGFyYW0ge251bWJl cj19IHByZWZlcnJlZEhlaWdodAorICAgICAqLwogICAgIHNob3c6IGZ1bmN0aW9uKGNvbnRlbnRF bGVtZW50LCBhbmNob3IsIHByZWZlcnJlZFdpZHRoLCBwcmVmZXJyZWRIZWlnaHQpCiAgICAgewog ICAgICAgICBpZiAodGhpcy5fZGlzcG9zZWQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NwZWN0cnVtLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TcGVjdHJ1bS5qcwppbmRleCBiYmU5MTYyLi43NDY1OWNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NwZWN0cnVtLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3BlY3RydW0uanMKQEAgLTI2LDcgKzI2 LDExIEBACiAgKiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdlYkluc3BlY3Rvci5TcGVjdHJ1bSA9IGZ1bmN0 aW9uKGNvbnRhaW5lcikKKy8qKgorICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5z cGVjdG9yLk9iamVjdH0KKyAqLworV2ViSW5zcGVjdG9yLlNwZWN0cnVtID0gZnVuY3Rpb24oKQog ewogICAgIHRoaXMuX3BvcG92ZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlBvcG92ZXIoKTsKICAgICB0 aGlzLl9wb3BvdmVyLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgc3RvcFBy b3BhZ2F0aW9uLCBmYWxzZSk7CkBAIC05Nyw2ICsxMDEsNyBAQCBXZWJJbnNwZWN0b3IuU3BlY3Ry dW0gPSBmdW5jdGlvbihjb250YWluZXIpCiAKIFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5FdmVudHMg PSB7CiAgICAgQ29sb3JDaGFuZ2VkOiAiQ29sb3JDaGFuZ2VkIiwKKyAgICBTaG93bjogIlNob3du IiwKICAgICBIaWRkZW46ICJIaWRkZW4iCiB9OwogCkBAIC0xNzAsNiArMTc1LDExIEBAIFdlYklu c3BlY3Rvci5TcGVjdHJ1bS5yZ2JhVG9IU1ZBID0gZnVuY3Rpb24ociwgZywgYiwgYSkKIH07CiAK IC8vRklYTUU6IG1pZ3JhdGUgdG8gV2ViSW5zcGVjdG9yLmVsZW1lbnREcmFnU3RhcnQKKy8qKgor ICogQHBhcmFtIHtGdW5jdGlvbj19IG9ubW92ZQorICogQHBhcmFtIHtGdW5jdGlvbj19IG9uc3Rh cnQKKyAqIEBwYXJhbSB7RnVuY3Rpb249fSBvbnN0b3AKKyAqLwogV2ViSW5zcGVjdG9yLlNwZWN0 cnVtLmRyYWdnYWJsZSA9IGZ1bmN0aW9uKGVsZW1lbnQsIG9ubW92ZSwgb25zdGFydCwgb25zdG9w KSB7CiAKICAgICB2YXIgZG9jID0gZG9jdW1lbnQ7CkBAIC0zMDEsNiArMzExLDExIEBAIFdlYklu c3BlY3Rvci5TcGVjdHJ1bS5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2Rpc3BsYXlFbGVt ZW50LnRleHRDb250ZW50ID0gdGV4dDsKICAgICB9LAogCisgICAgZ2V0IGlzVmlzaWJsZSgpCisg ICAgeworICAgICAgICByZXR1cm4gdGhpcy5fcG9wb3Zlci52aXNpYmxlOworICAgIH0sCisKICAg ICBfb25jaGFuZ2U6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVVJKCk7 CkBAIC0zNTMsMjQgKzM2OCwyOSBAQCBXZWJJbnNwZWN0b3IuU3BlY3RydW0ucHJvdG90eXBlID0g ewogCiAgICAgdG9nZ2xlOiBmdW5jdGlvbihlbGVtZW50LCBjb2xvciwgZm9ybWF0KQogICAgIHsK LSAgICAgICAgaWYgKHRoaXMuX2lzU2hvd24pCisgICAgICAgIGlmICh0aGlzLmlzVmlzaWJsZSkK ICAgICAgICAgICAgIHRoaXMuaGlkZSgpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICB0aGlz LnNob3coZWxlbWVudCwgY29sb3IsIGZvcm1hdCk7CiAKLSAgICAgICAgcmV0dXJuIHRoaXMuX2lz U2hvd247CisgICAgICAgIHJldHVybiB0aGlzLmlzVmlzaWJsZTsKICAgICB9LAogCiAgICAgc2hv dzogZnVuY3Rpb24oZWxlbWVudCwgY29sb3IsIGZvcm1hdCkKICAgICB7Ci0gICAgICAgIGlmICh0 aGlzLl9pc1Nob3duKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAodGhpcy5pc1Zp c2libGUpIHsKKyAgICAgICAgICAgIGlmICh0aGlzLmFuY2hvckVsZW1lbnQgPT09IGVsZW1lbnQp CisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgICAgICAvLyBSZW9wZW4g dGhlIHBpY2tlciBmb3IgYW5vdGhlciBhbmNob3IgZWxlbWVudC4KKyAgICAgICAgICAgIHRoaXMu aGlkZSgpOworICAgICAgICB9CiAKLSAgICAgICAgdGhpcy5faXNTaG93biA9IHRydWU7CiAgICAg ICAgIHRoaXMucmVwb3NpdGlvbihlbGVtZW50KTsKKyAgICAgICAgdGhpcy5hbmNob3JFbGVtZW50 ID0gZWxlbWVudDsKIAotICAgICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZWRv d24iLCB0aGlzLl9oaWRlUHJveHkpOwotICAgICAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcigi Ymx1ciIsIHRoaXMuX2hpZGVQcm94eSk7CisgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlZG93biIsIHRoaXMuX2hpZGVQcm94eSwgZmFsc2UpOworICAgICAgICB3aW5kb3cu YWRkRXZlbnRMaXN0ZW5lcigiYmx1ciIsIHRoaXMuX2hpZGVQcm94eSwgZmFsc2UpOwogCiAgICAg ICAgIHRoaXMuc2xpZGVIZWlnaHQgPSB0aGlzLl9zbGlkZXJFbGVtZW50Lm9mZnNldEhlaWdodDsK ICAgICAgICAgdGhpcy5kcmFnV2lkdGggPSB0aGlzLl9kcmFnZ2VyRWxlbWVudC5vZmZzZXRXaWR0 aDsKQEAgLTM4Miw2ICs0MDIsOSBAQCBXZWJJbnNwZWN0b3IuU3BlY3RydW0ucHJvdG90eXBlID0g ewogICAgICAgICB0aGlzLl9vcmlnaW5hbEZvcm1hdCA9IGZvcm1hdCB8fCBjb2xvci5mb3JtYXQ7 CiAKICAgICAgICAgdGhpcy5fdXBkYXRlVUkoKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50 VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNwZWN0cnVtLkV2ZW50cy5TaG93bik7CisKKyAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgfSwKIAogICAgIHJlcG9zaXRpb246IGZ1bmN0aW9uKGVsZW1l bnQpCkBAIC0zOTEsMTQgKzQxNCwxNSBAQCBXZWJJbnNwZWN0b3IuU3BlY3RydW0ucHJvdG90eXBl ID0gewogCiAgICAgaGlkZTogZnVuY3Rpb24oKQogICAgIHsKLSAgICAgICAgZGVsZXRlIHRoaXMu X2lzU2hvd247CiAgICAgICAgIHRoaXMuX3BvcG92ZXIuaGlkZSgpOwogCi0gICAgICAgIGRvY3Vt ZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX2hpZGVQcm94eSk7Ci0g ICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVyKCJibHVyIiwgdGhpcy5faGlkZVByb3h5 KTsKKyAgICAgICAgZG9jdW1lbnQucmVtb3ZlRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhp cy5faGlkZVByb3h5LCBmYWxzZSk7CisgICAgICAgIHdpbmRvdy5yZW1vdmVFdmVudExpc3RlbmVy KCJibHVyIiwgdGhpcy5faGlkZVByb3h5LCBmYWxzZSk7CiAKICAgICAgICAgdGhpcy5kaXNwYXRj aEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlNwZWN0cnVtLkV2ZW50cy5IaWRkZW4pOwog CisgICAgICAgIGRlbGV0ZSB0aGlzLmFuY2hvckVsZW1lbnQ7CisKICAgICAgICAgLy8gT25seSB3 YW50IHRvIGFsbG93IG9uZSBpbnN0YW5jZSB0byBiZSBvcGVuIGF0IGEgdGltZSwgc28gY2xlYXIg b3V0IGFueQogICAgICAgICAvLyBleGlzdGluZyBldmVudCBsaXN0ZW5lcnMuCiAgICAgICAgIHRo aXMucmVtb3ZlQWxsTGlzdGVuZXJzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCBmMmVmNjY4Li41YmM1 NWU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxl c1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTE2NzIsNiArMTY3Miw4IEBAIFdlYkluc3BlY3Rvci5T dHlsZVByb3BlcnR5VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHZh ciBmb3JtYXQgPSBnZXRGb3JtYXQoKTsKICAgICAgICAgICAgICAgICB2YXIgaGFzQ29sb3JwaWNr ZXIgPSBzZWxmLl9wYXJlbnRQYW5lOwogICAgICAgICAgICAgICAgIHZhciBzcGVjdHJ1bSA9IGhh c0NvbG9ycGlja2VyID8gc2VsZi5fcGFyZW50UGFuZS5fc3BlY3RydW0gOiBudWxsOworICAgICAg ICAgICAgICAgIGlmIChzcGVjdHJ1bSkKKyAgICAgICAgICAgICAgICAgICAgc3BlY3RydW0uYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU3BlY3RydW0uRXZlbnRzLlNob3duLCBzcGVjdHJ1 bVNob3duKTsKIAogICAgICAgICAgICAgICAgIHZhciBzd2F0Y2hFbGVtZW50ID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgic3BhbiIpOwogICAgICAgICAgICAgICAgIHZhciBzd2F0Y2hJbm5lckVs ZW1lbnQgPSBzd2F0Y2hFbGVtZW50LmNyZWF0ZUNoaWxkKCJzcGFuIiwgInN3YXRjaC1pbm5lciIp OwpAQCAtMTY5MCw3ICsxNjkyLDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxl bWVudC5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgICAgICAgICB2YXIgc2Nyb2xsZXJFbGVtZW50 ID0gaGFzQ29sb3JwaWNrZXIgPyBzZWxmLl9wYXJlbnRQYW5lLl9jb21wdXRlZFN0eWxlUGFuZS5l bGVtZW50LnBhcmVudEVsZW1lbnQgOiBudWxsOwogCi0gICAgICAgICAgICAgICAgZnVuY3Rpb24g c3BlY3RydW1DaGFuZ2UoZSkKKyAgICAgICAgICAgICAgICBmdW5jdGlvbiBzcGVjdHJ1bUNoYW5n ZWQoZSkKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgICAgIGNvbG9yID0gZS5k YXRhOwogCkBAIC0xNzAzLDEyICsxNzA1LDIyIEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnR5 VHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICBzZWxmLmFwcGx5 U3R5bGVUZXh0KG5hbWVFbGVtZW50LnRleHRDb250ZW50ICsgIjogIiArIHZhbHVlRWxlbWVudC50 ZXh0Q29udGVudCwgZmFsc2UsIGZhbHNlLCBmYWxzZSk7CiAgICAgICAgICAgICAgICAgfQogCi0g ICAgICAgICAgICAgICAgZnVuY3Rpb24gc3BlY3RydW1IaWRlKCkKKyAgICAgICAgICAgICAgICBm dW5jdGlvbiBzcGVjdHJ1bVNob3duKCkKKyAgICAgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgICAgIHNwZWN0cnVtLmRpc3BsYXlUZXh0ID0gY29sb3IudG9TdHJpbmcoZm9ybWF0KTsKKyAg ICAgICAgICAgICAgICAgICAgc2VsZi5fcGFyZW50UGFuZS5faXNFZGl0aW5nU3R5bGUgPSB0cnVl OworICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1bS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5TcGVjdHJ1bS5FdmVudHMuQ29sb3JDaGFuZ2VkLCBzcGVjdHJ1bUNoYW5nZWQpOworICAg ICAgICAgICAgICAgICAgICBzcGVjdHJ1bS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5T cGVjdHJ1bS5FdmVudHMuSGlkZGVuLCBzcGVjdHJ1bUhpZGRlbik7CisKKyAgICAgICAgICAgICAg ICAgICAgc2Nyb2xsZXJFbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoInNjcm9sbCIsIHJlcG9zaXRp b25TcGVjdHJ1bSwgZmFsc2UpOworICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAg IGZ1bmN0aW9uIHNwZWN0cnVtSGlkZGVuKCkKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAg ICAgICAgICAgIHNjcm9sbGVyRWxlbWVudC5yZW1vdmVFdmVudExpc3RlbmVyKCJzY3JvbGwiLCBy ZXBvc2l0aW9uU3BlY3RydW0sIGZhbHNlKTsKICAgICAgICAgICAgICAgICAgICAgc2VsZi5hcHBs eVN0eWxlVGV4dChuYW1lRWxlbWVudC50ZXh0Q29udGVudCArICI6ICIgKyB2YWx1ZUVsZW1lbnQu dGV4dENvbnRlbnQsIHRydWUsIHRydWUsIGZhbHNlKTsKLSAgICAgICAgICAgICAgICAgICAgc3Bl Y3RydW0ucmVtb3ZlRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU3BlY3RydW0uRXZlbnRzLkNv bG9yQ2hhbmdlZCwgc3BlY3RydW1DaGFuZ2UpOwotICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1 bS5yZW1vdmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5FdmVudHMuSGlkZGVu LCBzcGVjdHJ1bUhpZGUpOworICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1bS5yZW1vdmVFdmVu dExpc3RlbmVyKFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5FdmVudHMuQ29sb3JDaGFuZ2VkLCBzcGVj dHJ1bUNoYW5nZWQpOworICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1bS5yZW1vdmVFdmVudExp c3RlbmVyKFdlYkluc3BlY3Rvci5TcGVjdHJ1bS5FdmVudHMuSGlkZGVuLCBzcGVjdHJ1bUhpZGRl bik7CiAKICAgICAgICAgICAgICAgICAgICAgZGVsZXRlIHNlbGYuX3BhcmVudFBhbmUuX2lzRWRp dGluZ1N0eWxlOwogICAgICAgICAgICAgICAgIH0KQEAgLTE3MjYsMTYgKzE3MzgsMTEgQEAgV2Vi SW5zcGVjdG9yLlN0eWxlUHJvcGVydHlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAg ICAgICAgICAgICAgIGlmICghc3BlY3RydW0gfHwgZS5zaGlmdEtleSkKICAgICAgICAgICAgICAg ICAgICAgICAgIGNoYW5nZUNvbG9yRGlzcGxheShlKTsKICAgICAgICAgICAgICAgICAgICAgZWxz ZSBpZiAoaGFzQ29sb3JwaWNrZXIpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZhciBpc1No b3duID0gc3BlY3RydW0udG9nZ2xlKHN3YXRjaEVsZW1lbnQsIGNvbG9yLCBmb3JtYXQpOwotCi0g ICAgICAgICAgICAgICAgICAgICAgICBpZiAoaXNTaG93bikgewotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNwZWN0cnVtLmRpc3BsYXlUZXh0ID0gY29sb3IudG9TdHJpbmcoZm9ybWF0KTsK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9wYXJlbnRQYW5lLl9pc0VkaXRpbmdT dHlsZSA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgc3BlY3RydW0uYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU3BlY3RydW0uRXZlbnRzLkNvbG9yQ2hhbmdlZCwgc3Bl Y3RydW1DaGFuZ2UpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNwZWN0cnVtLmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNwZWN0cnVtLkV2ZW50cy5IaWRkZW4sIHNwZWN0cnVt SGlkZSk7Ci0KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY3JvbGxlckVsZW1lbnQuYWRk RXZlbnRMaXN0ZW5lcigic2Nyb2xsIiwgcmVwb3NpdGlvblNwZWN0cnVtLCBmYWxzZSk7Ci0gICAg ICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICAvLyBXZSB3YW50 IHRoZSBTcGVjdHJ1bSB0byB0b2dnbGUgd2hlbiB0aGUgc2FtZSBzd2F0Y2ggaXMgY2xpY2tlZCBi dXQgc2hvdyBpbiBhbm90aGVyIGxvY2F0aW9uIHdoZW4gYW5vdGhlciBzd2F0Y2ggaXMgY2xpY2tl ZC4KKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzcGVjdHJ1bS5hbmNob3JFbGVtZW50ID09 PSBzd2F0Y2hFbGVtZW50KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNwZWN0cnVtLnRv Z2dsZShzd2F0Y2hFbGVtZW50LCBjb2xvciwgZm9ybWF0KTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzcGVjdHJ1bS5zaG93KHN3YXRj aEVsZW1lbnQsIGNvbG9yLCBmb3JtYXQpOwogICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgICAgfQogCg==