72377 2011-11-15 04:35:56 -0800 Web Inspector: move generic code from DevTools.js into the WebCore. 2011-11-15 06:52:47 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 72383 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy tonyg yurys oldest_to_newest 502806 0 pfeldman 2011-11-15 04:35:56 -0800 This includes support for themed toolbar, remote debugging routines, removes a couple of obsolete overrides from the DevTools.js 502807 1 115141 pfeldman 2011-11-15 04:38:30 -0800 Created attachment 115141 Patch 502835 2 pfeldman 2011-11-15 05:38:43 -0800 Committed r100269: <http://trac.webkit.org/changeset/100269> 502865 3 tonyg 2011-11-15 06:35:19 -0800 Reopening due to rollback in bug 72383. 502879 4 pfeldman 2011-11-15 06:52:47 -0800 Committed r100277: <http://trac.webkit.org/changeset/100277> 115141 2011-11-15 04:38:30 -0800 2011-11-15 05:19:58 -0800 Patch bug-72377-20111115163828.patch text/plain 12010 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwMjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2UwOGZmODA2MTE2YTk1 ZWU3NGFkZTliNmE3YTFiZmYxNjMxMzJhMi4uMmRiZTM5OThkNzIzZGYxYzNjYTIxNDIzZWU1OTRk ZDkxZDNkYWMyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDExLTExLTE1ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9y OiBtb3ZlIGdlbmVyaWMgY29kZSBmcm9tIERldlRvb2xzLmpzIGludG8gdGhlIFdlYkNvcmUuCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjM3NworCisg ICAgICAgIFRoaXMgaW5jbHVkZXMgc3VwcG9ydCBmb3IgdGhlbWVkIHRvb2xiYXIsIHJlbW90ZSBk ZWJ1Z2dpbmcgcm91dGluZXMsCisgICAgICAgIHJlbW92ZXMgYSBjb3VwbGUgb2Ygb2Jzb2xldGUg b3ZlcnJpZGVzIGZyb20gdGhlIERldlRvb2xzLmpzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBFbmdsaXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3Mu anM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JGcm9udGVuZEhvc3RT dHViLmpzOgorICAgICAgICAoLldlYkluc3BlY3Rvci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHVi LnByb3RvdHlwZS5pbnNwZWN0ZWRVUkxDaGFuZ2VkKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1Byb2ZpbGVzUGFuZWwuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvVUlVdGlscy5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5zZXRUb29sYmFyQ29sb3JzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5yZXNldFRv b2xiYXJDb2xvcnMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz OgorCiAyMDExLTExLTE1ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNv bT4KIAogICAgICAgICBbUXRdIENlbnRyYWxpemUgaGlkZV9zeW1ib2xzIGFuZCBlbnN1cmUgYWxs IGxpYnMgYXJlIGJ1aWx0IHdpdGggc3ltYm9sIHZpc2liaWxpdHkgJiBic3ltYm9saWNfZnVuY3Rp b25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGE5M2M3ZDY4YThmZGUwOTBkZWE1NjEy OWFjZjAxMzk0MGRhOGVmYTQuLjcyNmRhOWU2NTZiM2M1ZGUxOWFiZGE1NTAyMjZlZWMzNDUyN2Fi Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTEt MTUgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgorCisgICAgICAgIFdlYiBJ bnNwZWN0b3I6IG1vdmUgZ2VuZXJpYyBjb2RlIGZyb20gRGV2VG9vbHMuanMgaW50byB0aGUgV2Vi Q29yZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcy Mzc3CisKKyAgICAgICAgVGhpcyBpbmNsdWRlcyBzdXBwb3J0IGZvciB0aGVtZWQgdG9vbGJhciwg cmVtb3RlIGRlYnVnZ2luZyByb3V0aW5lcywKKyAgICAgICAgcmVtb3ZlcyBhIGNvdXBsZSBvZiBv YnNvbGV0ZSBvdmVycmlkZXMgZnJvbSB0aGUgRGV2VG9vbHMuanMKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9qcy9EZXZUb29scy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5zZXRJbnNwZWN0ZWRUYWJJZCk6CisKIDIwMTEtMTEtMTUgIEFs cGhhIExhbSAgPGhjbGFtQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIHNjcm9s bCBkZWx0YXMgYXJlIGNsZWFyZWQgZHVyaW5nIGNvbW1pdCB0byB0aGUgbWFpbiB0aHJlYWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5q cyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRl eCAzZjIxMjI4MjA4MDUxNDg1YmU5ZGJhYTMxZGFmYTZkM2VlNTBkZWFjLi44MTFmYzI4YzkwMmJk NDg3YzRiY2FiNWU0OGVlN2U2NTBlZDdjYTg5IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRh IDM5Ngp6Y21jYnhsSTdTYzdPc0UpOE9qKEU4SHlNYkNVMGFeK15EciZpYis5amEtcFE/PFFHIWZB bSZBUi1OXyMkKmR9KkwKemdTajlYQz0pOFBgSVlvPjc5SXJ8MjMzWSkxejgzS2hMWHQtPiU9RXRR U2UzO2wrUUVXb1M9QTlvbW9NUlZYfT48CnpDZGx4UTk7VEQkY25iM1hnX0lhI2ZxSEYkPyYkWWFm WFp6YV43PzU3Uj9wV2UzbGlKZHRpTCY/bH47dW1aciRWIQp6RF4oXj5UUGNWVCp9UCQ7dHI8dmhk QDkmNGc1fTJTbkdBVWg9fEd7MDwpVXpRO3lpMjQ1KGIjZSFnO2J0SmkmNl4KeiR2KytsTCMlJE4y cn0qQUFNPyFfND5PRD5GVVY0dnl6ZF5IdypyR0YoOX5qdjApfHdFV1FHIWtkezdgVj1tSWdeClNE P25CX1AmTnJEaEZoJlEwfll7NGtaUSpPCgpkZWx0YSAzMjcKemNtWEBNaXNpeWU3Uzh8dyRgfSRF aVduM29GKTQxO1VNfEpWcHIkYlNxcU5CNm1yfmtiX0N8ND8kKnQwY2FQZSt3Cnp4Y0tJJChxfnpD Ny1TU3c4SHlRWDYlLWdzQ0wxYDJQcmo8KWpWaD4rWFN6OTJAdW9XMTN8bWk0RndHZEtHZztufgp6 V0FhPjJWSUg4Sk4oYHxLM0prVWszWD47ekRqK01eRWJSNXUzTXwwaURoc0FCdyYtbitaUkoocmd4 ZnJNPDRUcHUKeihebT4yTF5mfCtYPT9ebm90UEBjMW9CZTMtZWxfc29idCQ0RihAJHZmSVZOI2tq YXE4a1BoO0M8M3lkd3tTUVJKCmhUOS1kaTJHYndRYnRlQ09BUGk+bktVNChNOGBYNi0kM0hBRzFe fkgxU2lTJU4KCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0luc3BlY3RvckZyb250ZW5kSG9zdFN0dWIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0luc3BlY3RvckZyb250ZW5kSG9zdFN0dWIuanMKaW5kZXggNGY5N2FiYjAxMjlj OWEwZDVkYTIwMzlhNjdkYzdjOWJjYTBhZDhhYi4uNTkwZTA1NWY2MWY2MDVlOTM4YzhlOWMwOWM4 ZjFjNTNhZjJjZjQ0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcwpAQCAtMTEwLDYg KzExMCw3IEBAIFdlYkluc3BlY3Rvci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLnByb3RvdHlw ZSA9IHsKIAogICAgIGluc3BlY3RlZFVSTENoYW5nZWQ6IGZ1bmN0aW9uKHVybCkKICAgICB7Cisg ICAgICAgIGRvY3VtZW50LnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFByZWZlcmVuY2Vz LmFwcGxpY2F0aW9uVGl0bGUsIHVybCk7CiAgICAgfSwKIAogICAgIGNvcHlUZXh0OiBmdW5jdGlv bigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2Zp bGVzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Byb2ZpbGVz UGFuZWwuanMKaW5kZXggYjhiOGMzM2UwODkyYjdhOTBiMDNiMDRmZjU4YjJiNGE4ZDE2OTNiZS4u OGU1ZThjNTY1NWJlODhjNzA3YTY4OTEzMDhhMDA3ZGE3ZTc2MGU0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qcm9maWxlc1BhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUHJvZmlsZXNQYW5lbC5qcwpAQCAtMTE5 LDYgKzExOSw4IEBAIFdlYkluc3BlY3Rvci5Qcm9maWxlc1BhbmVsID0gZnVuY3Rpb24oKQogCiAg ICAgdGhpcy5lbmFibGVUb2dnbGVCdXR0b24gPSBuZXcgV2ViSW5zcGVjdG9yLlN0YXR1c0JhckJ1 dHRvbigiIiwgImVuYWJsZS10b2dnbGUtc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5lbmFi bGVUb2dnbGVCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl90b2dnbGVQcm9m aWxpbmcuYmluZCh0aGlzKSwgZmFsc2UpOworICAgIGlmIChQcmVmZXJlbmNlcy5wcm9maWxlckFs d2F5c0VuYWJsZWQpCisgICAgICAgIHRoaXMuZW5hYmxlVG9nZ2xlQnV0dG9uLmVsZW1lbnQuYWRk U3R5bGVDbGFzcygiaGlkZGVuIik7CiAKICAgICB0aGlzLmNsZWFyUmVzdWx0c0J1dHRvbiA9IG5l dyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xl YXIgYWxsIHByb2ZpbGVzLiIpLCAiY2xlYXItc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5j bGVhclJlc3VsdHNCdXR0b24uYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9jbGVhclBy b2ZpbGVzLmJpbmQodGhpcyksIGZhbHNlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IDY5ZDEyZGZmN2U0NzE2NmU5MDljZjg3NThhZjk5 N2I1OTRiNDA1NzcuLjZhMGY0MmIyMzQ5MThjMmUyNjY0OTUzNzVmZGU0MDhjNTQ5ODk5OTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwpAQCAt NDQsNiArNDQsNyBAQCBXZWJJbnNwZWN0b3IuTUlNRVR5cGVzID0gewogICAgICJpbWFnZS9ibXAi OiAgICAgICAgICAgICAgICAgICB7MjogdHJ1ZX0sCiAgICAgImltYWdlL3N2Zyt4bWwiOiAgICAg ICAgICAgICAgIHsyOiB0cnVlfSwKICAgICAiaW1hZ2Uvdm5kLm1pY3Jvc29mdC5pY29uIjogICAg ezI6IHRydWV9LAorICAgICJpbWFnZS93ZWJwIjogICAgICAgICAgICAgICAgICB7MjogdHJ1ZX0s CiAgICAgImltYWdlL3gtaWNvbiI6ICAgICAgICAgICAgICAgIHsyOiB0cnVlfSwKICAgICAiaW1h Z2UveC14Yml0bWFwIjogICAgICAgICAgICAgezI6IHRydWV9LAogICAgICJmb250L3R0ZiI6ICAg ICAgICAgICAgICAgICAgICB7MzogdHJ1ZX0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCA5OTU1ZThhMDhiMzNmMTc5ZWZmN2VlYjhlMzNm NDUwMmRjNzUwZDgyLi5jMmYxMTg5Y2E2OGQ4ZDRkMTQ1ZmYzY2NjOGM1Nzk1OTM4NzdkNTYwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKQEAg LTU4LDcgKzU4LDggQEAgdmFyIFByZWZlcmVuY2VzID0gewogICAgIHNob3dOZXR3b3JrUGFuZWxJ bml0aWF0b3JDb2x1bW46IGZhbHNlLAogICAgIGhhdmVFeHRlbnNpb25zOiBmYWxzZSwKICAgICBz aGFyZWRXb3JrZXJzRGVidWdOb3RlOiB1bmRlZmluZWQsCi0gICAgbG9jYWxpemVVSTogdHJ1ZQor ICAgIGxvY2FsaXplVUk6IHRydWUsCisgICAgYXBwbGljYXRpb25UaXRsZTogIldlYiBJbnNwZWN0 b3IgLSAlcyIKIH0KIAogLyoqCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1VJVXRpbHMuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1VJVXRpbHMuanMKaW5kZXggYTAwOGZhYjI2MjViMmRjMTU4NGQyMDdjY2I1Nzk0YzljNzk4ZTg4 Yy4uY2FlNDkxZDczNjUxNjE2YjdmNTVkYzllNWM3MGU1Y2IxODQwYzhkMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVV0aWxzLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlVdGlscy5qcwpAQCAtNTk1LDYgKzU5NSwz MSBAQCBXZWJJbnNwZWN0b3Iuc2V0Q3VycmVudEZvY3VzRWxlbWVudCA9IGZ1bmN0aW9uKHgpCiAg ICAgICAgIFdlYkluc3BlY3Rvci5fcHJldmlvdXNGb2N1c0VsZW1lbnQuYmx1cigpOwogfQogCitX ZWJJbnNwZWN0b3Iuc2V0VG9vbGJhckNvbG9ycyA9IGZ1bmN0aW9uKGJhY2tncm91bmRDb2xvciwg Y29sb3IpCit7CisgICAgaWYgKCFXZWJJbnNwZWN0b3IuX3RoZW1lU3R5bGVFbGVtZW50KSB7Cisg ICAgICAgIFdlYkluc3BlY3Rvci5fdGhlbWVTdHlsZUVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJzdHlsZSIpOworICAgICAgICBkb2N1bWVudC5oZWFkLmFwcGVuZENoaWxkKFdlYklu c3BlY3Rvci5fdGhlbWVTdHlsZUVsZW1lbnQpOworICAgIH0KKyAgICBXZWJJbnNwZWN0b3IuX3Ro ZW1lU3R5bGVFbGVtZW50LnRleHRDb250ZW50ID0KKyAgICAgICAgIiN0b29sYmFyIHtcCisgICAg ICAgICAgICAgYmFja2dyb3VuZC1pbWFnZTogbm9uZSAhaW1wb3J0YW50O1wKKyAgICAgICAgICAg ICBiYWNrZ3JvdW5kLWNvbG9yOiAiICsgYmFja2dyb3VuZENvbG9yICsgIiAhaW1wb3J0YW50O1wK KyAgICAgICAgIH1cCisgICAgICAgICBcCisgICAgICAgICAudG9vbGJhci1sYWJlbCB7XAorICAg ICAgICAgICAgIGNvbG9yOiAiICsgY29sb3IgKyAiICFpbXBvcnRhbnQ7XAorICAgICAgICAgICAg IHRleHQtc2hhZG93OiBub25lO1wKKyAgICAgICAgIH0iOworfQorCitXZWJJbnNwZWN0b3IucmVz ZXRUb29sYmFyQ29sb3JzID0gZnVuY3Rpb24oKQoreworICAgIGlmIChXZWJJbnNwZWN0b3IuX3Ro ZW1lU3R5bGVFbGVtZW50KQorICAgICAgICBXZWJJbnNwZWN0b3IuX3RoZW1lU3R5bGVFbGVtZW50 LnRleHRDb250ZW50ID0gIiI7CisKK30KKwogOyhmdW5jdGlvbigpIHsKIAogZnVuY3Rpb24gd2lu ZG93TG9hZGVkKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuanMKaW5kZXggYTg5ZGVlYWNlNmY1YTZmZjg1NjlkNzkxNGZkYTk2NWJlNDcxM2I1OS4u MzJlNGRjZmVkZWQzMDZmMWVlYWIzZjMzNWI1M2E3MjRiMjY4Y2M5OCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKQEAgLTMxOSw2ICszMTks OSBAQCBXZWJJbnNwZWN0b3IuZG9Mb2FkZWREb25lID0gZnVuY3Rpb24oKQogICAgIGlmIChXZWJJ bnNwZWN0b3Iuc29ja2V0KQogICAgICAgICBkb2N1bWVudC5ib2R5LmFkZFN0eWxlQ2xhc3MoInJl bW90ZSIpOwogCisgICAgaWYgKFdlYkluc3BlY3Rvci5xdWVyeVBhcmFtc09iamVjdC50b29sYmFy Q29sb3IgJiYgV2ViSW5zcGVjdG9yLnF1ZXJ5UGFyYW1zT2JqZWN0LnRleHRDb2xvcikKKyAgICAg ICAgV2ViSW5zcGVjdG9yLnNldFRvb2xiYXJDb2xvcnMoV2ViSW5zcGVjdG9yLnF1ZXJ5UGFyYW1z T2JqZWN0LnRvb2xiYXJDb2xvciwgV2ViSW5zcGVjdG9yLnF1ZXJ5UGFyYW1zT2JqZWN0LnRleHRD b2xvcik7CisKICAgICBXZWJJbnNwZWN0b3Iuc2hvcnRjdXRzU2NyZWVuID0gbmV3IFdlYkluc3Bl Y3Rvci5TaG9ydGN1dHNTY3JlZW4oKTsKICAgICB0aGlzLl9yZWdpc3RlclNob3J0Y3V0cygpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9qcy9EZXZUb29scy5qcyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRvb2xzLmpzCmluZGV4IGU5MGJkZDI1 OWJlMThiNDk4NGNmZTQzYTQwZDI5ZmJmYTI5ZTEzZmIuLjA5ZTMxYjU0MDYzMjIxNzk2NWVkZDc5 OWY2YjlmZjQ2NzJjZmRmYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L2pzL0RldlRvb2xzLmpzCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL2pzL0RldlRv b2xzLmpzCkBAIC0yOSwxNCArMjksMTAgQEAKICAqLwogCiAvKioKLSAqIEZJWE1FOiBjaGFuZ2Ug ZmllbGQgbmFtaW5nIHN0eWxlIHRvIHVzZSB0cmFpbGluZyB1bmRlcnNjb3JlLgotICogQGZpbGVv dmVydmlldyBUb29scyBpcyBhIG1haW4gY2xhc3MgdGhhdCB3aXJlcyBhbGwgY29tcG9uZW50cyBv ZiB0aGUKLSAqIERldlRvb2xzIGZyb250ZW5kIHRvZ2V0aGVyLiBJdCBpcyBhbHNvIHJlc3BvbnNp YmxlIGZvciBvdmVycmlkaW5nIGV4aXN0aW5nCi0gKiBXZWJJbnNwZWN0b3IgZnVuY3Rpb25hbGl0 eSB3aGlsZSBpdCBpcyBnZXR0aW5nIHVwc3RyZWFtZWQgaW50byBXZWJDb3JlLgorICogRGV2VG9v bHMuanMgaXMgcmVzcG9uc2libGUgZm9yIGNvbmZpZ3VyaW5nIFdlYiBJbnNwZWN0b3IgZm9yIHRo ZSBDaHJvbWl1bQorICogcG9ydCBhcyB3ZWxsIGFzIGFkZGl0aW9uYWwgZmVhdHVyZXMgc3BlY2lm aWMgdG8gdGhlIENocm9taXVtIHBvcnQuCiAgKi8KIAotdmFyIGNvbnRleHQgPSB7fTsgIC8vIFVz ZWQgYnkgV2ViQ29yZSdzIGluc3BlY3RvciByb3V0aW5lcy4KLQogKGZ1bmN0aW9uICgpIHsKICAg ICBQcmVmZXJlbmNlcy5pZ25vcmVXaGl0ZXNwYWNlID0gZmFsc2U7CiAgICAgUHJlZmVyZW5jZXMu c2FtcGxpbmdDUFVQcm9maWxlciA9IHRydWU7CkBAIC01OSw0NiArNTUsOSBAQCB2YXIgY29udGV4 dCA9IHt9OyAgLy8gVXNlZCBieSBXZWJDb3JlJ3MgaW5zcGVjdG9yIHJvdXRpbmVzLgogICAgIFBy ZWZlcmVuY2VzLmhhdmVFeHRlbnNpb25zID0gdHJ1ZTsKICAgICBQcmVmZXJlbmNlcy5zaGFyZWRX b3JrZXJzRGVidWdOb3RlID0gIlNoYXJlZCB3b3JrZXJzIGNhbiBiZSBpbnNwZWN0ZWQgaW4gdGhl IFRhc2sgTWFuYWdlciI7CiAgICAgUHJlZmVyZW5jZXMubG9jYWxpemVVSSA9IGZhbHNlOworICAg IFByZWZlcmVuY2VzLmFwcGxpY2F0aW9uVGl0bGUgPSAiRGV2ZWxvcGVyIFRvb2xzIC0gJXMiOwog fSkoKTsKIAotLy8gUmVjb2duaXplIFdlYlAgYXMgYSB2YWxpZCBpbWFnZSBtaW1lIHR5cGUuCi1X ZWJJbnNwZWN0b3IuTUlNRVR5cGVzWyJpbWFnZS93ZWJwIl0gPSB7MjogdHJ1ZX07Ci0KLXZhciBk ZXZ0b29scyA9IGRldnRvb2xzIHx8IHt9OwotCi1kZXZ0b29scy5kb21Db250ZW50TG9hZGVkID0g ZnVuY3Rpb24oKQotewotICAgIGlmIChXZWJJbnNwZWN0b3IucXVlcnlQYXJhbXNPYmplY3QudG9v bGJhckNvbG9yICYmIFdlYkluc3BlY3Rvci5xdWVyeVBhcmFtc09iamVjdC50ZXh0Q29sb3IpCi0g ICAgICAgIFdlYkluc3BlY3Rvci5zZXRUb29sYmFyQ29sb3JzKFdlYkluc3BlY3Rvci5xdWVyeVBh cmFtc09iamVjdC50b29sYmFyQ29sb3IsIFdlYkluc3BlY3Rvci5xdWVyeVBhcmFtc09iamVjdC50 ZXh0Q29sb3IpOwotfQotZG9jdW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigiRE9NQ29udGVudExvYWRl ZCIsIGRldnRvb2xzLmRvbUNvbnRlbnRMb2FkZWQsIGZhbHNlKTsKLQotCi0vLyBGSVhNRTogVGhp cyBuZWVkcyB0byBiZSB1cHN0cmVhbWVkLgotKGZ1bmN0aW9uIEludGVyY2VwdFByb2ZpbGVzUGFu ZWxFdmVudHMoKQotewotICAgIHZhciBvbGRTaG93ID0gV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFu ZWwucHJvdG90eXBlLnNob3c7Ci0gICAgV2ViSW5zcGVjdG9yLlByb2ZpbGVzUGFuZWwucHJvdG90 eXBlLnNob3cgPSBmdW5jdGlvbigpCi0gICAgewotICAgICAgICB0aGlzLmVuYWJsZVRvZ2dsZUJ1 dHRvbi52aXNpYmxlID0gZmFsc2U7Ci0gICAgICAgIG9sZFNob3cuY2FsbCh0aGlzKTsKLSAgICAg ICAgLy8gU2hvdyBpcyBjYWxsZWQgb24gZXZlcnkgc2hvdyBldmVudCBvZiBhIHBhbmVsLCBzbwot ICAgICAgICAvLyB3ZSBvbmx5IG5lZWQgdG8gaW50ZXJjZXB0IGl0IG9uY2UuCi0gICAgICAgIFdl Ykluc3BlY3Rvci5Qcm9maWxlc1BhbmVsLnByb3RvdHlwZS5zaG93ID0gb2xkU2hvdzsKLSAgICB9 OwotfSkoKTsKLQotCi0vKgotICogQG92ZXJyaWRlCi0gKiBUT0RPKG1uYWdhbm92KTogUmVzdG9y ZSBsMTBuIHdoZW4gaXQgd2lsbCBiZSBhZ3JlZWQgdGhhdCBpdCBpcyBuZWVkZWQuCi0gKi8KLVdl Ykluc3BlY3Rvci5VSVN0cmluZyA9IGZ1bmN0aW9uKHN0cmluZykKLXsKLSAgICByZXR1cm4gU3Ry aW5nLnZzcHJpbnRmKHN0cmluZywgQXJyYXkucHJvdG90eXBlLnNsaWNlLmNhbGwoYXJndW1lbnRz LCAxKSk7Ci19OwotCi0KIC8qKiBQZW5kaW5nIFdlYktpdCB1cHN0cmVhbSBieSBhcGF2bG92KS4g Rml4ZXMgaWZyYW1lIHZzIGRyYWcgcHJvYmxlbS4gKi8KIChmdW5jdGlvbigpCiB7CkBAIC0xMzcs NDAgKzk2LDYgQEAgV2ViSW5zcGVjdG9yLlVJU3RyaW5nID0gZnVuY3Rpb24oc3RyaW5nKQogICAg IH07CiB9KSgpOwogCi0KLS8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCi0vLyBDaHJvbWl1 bSB0aGVtZSBzdXBwb3J0LiAvLwotLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KLQotV2Vi SW5zcGVjdG9yLnNldFRvb2xiYXJDb2xvcnMgPSBmdW5jdGlvbihiYWNrZ3JvdW5kQ29sb3IsIGNv bG9yKQotewotICAgIGlmICghV2ViSW5zcGVjdG9yLl90aGVtZVN0eWxlRWxlbWVudCkgewotICAg ICAgICBXZWJJbnNwZWN0b3IuX3RoZW1lU3R5bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgic3R5bGUiKTsKLSAgICAgICAgZG9jdW1lbnQuaGVhZC5hcHBlbmRDaGlsZChXZWJJbnNw ZWN0b3IuX3RoZW1lU3R5bGVFbGVtZW50KTsKLSAgICB9Ci0gICAgV2ViSW5zcGVjdG9yLl90aGVt ZVN0eWxlRWxlbWVudC50ZXh0Q29udGVudCA9Ci0gICAgICAgICIjdG9vbGJhciB7XAotICAgICAg ICAgICAgIGJhY2tncm91bmQtaW1hZ2U6IG5vbmUgIWltcG9ydGFudDtcCi0gICAgICAgICAgICAg YmFja2dyb3VuZC1jb2xvcjogIiArIGJhY2tncm91bmRDb2xvciArICIgIWltcG9ydGFudDtcCi0g ICAgICAgICB9XAotICAgICAgICAgXAotICAgICAgICAgLnRvb2xiYXItbGFiZWwge1wKLSAgICAg ICAgICAgICBjb2xvcjogIiArIGNvbG9yICsgIiAhaW1wb3J0YW50O1wKLSAgICAgICAgICAgICB0 ZXh0LXNoYWRvdzogbm9uZTtcCi0gICAgICAgICB9IjsKLX0KLQotV2ViSW5zcGVjdG9yLnJlc2V0 VG9vbGJhckNvbG9ycyA9IGZ1bmN0aW9uKCkKLXsKLSAgICBpZiAoV2ViSW5zcGVjdG9yLl90aGVt ZVN0eWxlRWxlbWVudCkKLSAgICAgICAgV2ViSW5zcGVjdG9yLl90aGVtZVN0eWxlRWxlbWVudC50 ZXh0Q29udGVudCA9ICIiOwotCi19Ci0KLS8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCi0vLyBQbGF0Zm9ybS1zcGVjaWZpYyBXZWJJbnNwZWN0 b3IgZXh0ZW5zaW9ucyBzdXBwb3J0LiAvLwotLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KLQogV2ViSW5zcGVjdG9yLnBsYXRmb3JtRXh0ZW5z aW9uQVBJID0gZnVuY3Rpb24odGFiSWQpCiB7CiAgICAgZnVuY3Rpb24gZ2V0VGFiSWQoKQpAQCAt MTk4LDEwICsxMjMsMyBAQCBXZWJJbnNwZWN0b3Iuc2V0SW5zcGVjdGVkVGFiSWQgPSBmdW5jdGlv bih0YWJJZCkKIHsKICAgICBXZWJJbnNwZWN0b3IuX2luc3BlY3RlZFRhYklkID0gdGFiSWQ7CiB9 Ci0KLWlmIChXZWJJbnNwZWN0b3IuSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1YikgewotICAgIFdl Ykluc3BlY3Rvci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLnByb3RvdHlwZS5pbnNwZWN0ZWRV UkxDaGFuZ2VkID0gZnVuY3Rpb24odXJsKQotICAgIHsKLSAgICAgICAgZG9jdW1lbnQudGl0bGUg PSAiRGV2ZWxvcGVyIFRvb2xzIC0gIiArIHVybDsKLSAgICB9Ci19Cg==