18505 2008-04-14 14:49:21 -0700 REGRESSION: Search is disabled and not functional 2008-04-16 16:36:22 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P1 Blocker --- 1 timothy webkit-unassigned oldest_to_newest 77617 0 timothy 2008-04-14 14:49:21 -0700 This is a regression for bug 17773, the UI refresh. 77870 1 20606 aroben 2008-04-16 16:14:26 -0700 Created attachment 20606 Patch v1 with ChangeLog 77871 2 aroben 2008-04-16 16:36:22 -0700 Committed in r31972 20606 2008-04-16 16:14:26 -0700 2008-04-16 16:21:52 -0700 Patch v1 with ChangeLog 0001--Fix-Bug-18505-REGRESSION-Search-is-disable.patch text/plain 14672 aroben RnJvbSA5NDUyM2UxZTg1Y2QwMzRhYzViM2E2NjFjZWM4MjRlYTNmNTAzZTlhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBZGFtIFJvYmVuIDxhcm9iZW5AYXBwbGUuY29tPgpEYXRlOiBX ZWQsIDE2IEFwciAyMDA4IDE5OjE0OjE5IC0wNDAwClN1YmplY3Q6IFtQRlJdICAgICAgICAgRml4 IEJ1ZyAxODUwNTogUkVHUkVTU0lPTjogU2VhcmNoIGlzIGRpc2FibGVkIGFuZCBub3QgZnVuY3Rp b25hbAoKICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 NTA1PgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgKiBwYWdl L2luc3BlY3Rvci9SZXNvdXJjZXNQYW5lbC5qczoKICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291 cmNlc1BhbmVsLnNvdXJjZUZyYW1lRm9yUmVzb3VyY2UpOiBBZGRlZC4KICAgICAgICAqIHBhZ2Uv aW5zcGVjdG9yL2luc3BlY3Rvci5jc3M6IEFkZGVkIGJhY2sgcnVsZXMgZm9yIHRoZSBzZWFyY2gg ZmllbGQKICAgICAgICB0aGF0IHdlcmUgcmVtb3ZlZCBpbiByMzE3MzYuCiAgICAgICAgKiBwYWdl L2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbDoKICAgICAgICAgIC0gUmVtb3ZlZCB0aGUgZGlzYWJs ZWQgYXR0cmlidXRlIGZyb20gdGhlIHNlYXJjaCBmaWVsZAogICAgICAgICAgLSBBZGRlZCBiYWNr IHRoZSAjc2VhcmNoUmVzdWx0cyBhbmQgI3NlYXJjaFJlc3VsdHNSZXNpemVyIGRpdnMgd2hpY2gK ICAgICAgICAgICAgd2VyZSByZW1vdmVkIGluIHIzMTczNgogICAgICAgICogcGFnZS9pbnNwZWN0 b3IvaW5zcGVjdG9yLmpzOgogICAgICAgIChXZWJJbnNwZWN0b3Iuc2V0IHNob3dpbmdTZWFyY2hS ZXN1bHRzKTogVXBkYXRlZCBmb3IgY2xhc3MgcmVuYW1lCiAgICAgICAgcGFuZWxzIC0+IG1haW4t cGFuZWxzLgogICAgICAgIChXZWJJbnNwZWN0b3IubG9hZGVkKTogQWRkZWQgYmFjayB0aGUgbW91 c2Vkb3duIGV2ZW50IGxpc3RlbmVyIGZvciB0aGUKICAgICAgICBzZWFyY2ggcmVzdWx0cyByZXNp emVyIHRoYXQgd2FzIHJlbW92ZWQgaW4gcjMxNzM2LgogICAgICAgIChXZWJJbnNwZWN0b3Iuc2Vh cmNoUmVzdWx0c1Jlc2l6ZXJEcmFnKTogVXBkYXRlZCBmb3IgY2xhc3MgcmVuYW1lCiAgICAgICAg cGFuZWxzIC0+IG1haW4tcGFuZWxzLgogICAgICAgIChXZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJj aCk6CiAgICAgICAgICAtIENoYW5nZWQgdG8gdXNlIHNvdXJjZUZyYW1lRm9yUmVzb3VyY2UKICAg ICAgICAgIC0gQ2hhbmdlZCB0byB1c2Ugc2hvd1Jlc291cmNlCiAgICAgICAgICAtIENoYW5nZWQg dG8gc2F2ZS9yZXN0b3JlIHRoZSBmb2N1c2VkIGVsZW1lbnQgYXJvdW5kIHRoZSBzZXR0aW5nIG9m CiAgICAgICAgICAgIHRoZSBjdXJyZW50IHBhbmVsCiAgICAgICAgICAtIENoYW5nZWQgdG8gZ2V0 IHRoZSBzb3VyY2UgZG9jdW1lbnQgZnJvbSB0aGUgbWF0Y2ggcmFuZ2UgaW5zdGVhZCBvZgogICAg ICAgICAgICBieSBjcmF3bGluZyBiYWNrIHVwIHRvIHRoZSBzb3VyY2UgdmlldwogICAgICAgICAg LSBDaGFuZ2VkIHRvIGJpbmQgdGhlIG9uc2VsZWN0IGhhbmRsZXJzIHRvIHRoaXMgc28gdGhhdCB3 ZSBjYW4KICAgICAgICAgICAgYWNjZXNzIHRoZSBFbGVtZW50cy9SZXNvdXJjZXMgcGFuZWxzCi0t LQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMzMgKysrKysr KysrKysrKysrKysKIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwuanMgfCAg IDE3ICsrKysrKysrKwogV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuY3NzICAgICB8 ICAgNTggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL3BhZ2UvaW5zcGVj dG9yL2luc3BlY3Rvci5odG1sICAgIHwgICAgNCArKy0KIFdlYkNvcmUvcGFnZS9pbnNwZWN0b3Iv aW5zcGVjdG9yLmpzICAgICAgfCAgIDM5ICsrKysrKysrKysrKystLS0tLS0tCiA1IGZpbGVzIGNo YW5nZWQsIDEzNiBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9X ZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDZmN2JkZmMuLjY2MDhi YzkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDUgKzEsMzggQEAKIDIwMDgtMDQtMTYgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUu Y29tPgogCisgICAgICAgIEZpeCBCdWcgMTg1MDU6IFJFR1JFU1NJT046IFNlYXJjaCBpcyBkaXNh YmxlZCBhbmQgbm90IGZ1bmN0aW9uYWwKKworICAgICAgICA8aHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE4NTA1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvUmVzb3VyY2VzUGFuZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VzUGFuZWwuc291cmNlRnJhbWVGb3JSZXNvdXJj ZSk6IEFkZGVkLgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3M6IEFkZGVk IGJhY2sgcnVsZXMgZm9yIHRoZSBzZWFyY2ggZmllbGQKKyAgICAgICAgdGhhdCB3ZXJlIHJlbW92 ZWQgaW4gcjMxNzM2LgorICAgICAgICAqIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sOgor ICAgICAgICAgIC0gUmVtb3ZlZCB0aGUgZGlzYWJsZWQgYXR0cmlidXRlIGZyb20gdGhlIHNlYXJj aCBmaWVsZAorICAgICAgICAgIC0gQWRkZWQgYmFjayB0aGUgI3NlYXJjaFJlc3VsdHMgYW5kICNz ZWFyY2hSZXN1bHRzUmVzaXplciBkaXZzIHdoaWNoCisgICAgICAgICAgICB3ZXJlIHJlbW92ZWQg aW4gcjMxNzM2CisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLnNldCBzaG93aW5nU2VhcmNoUmVzdWx0cyk6IFVwZGF0ZWQgZm9yIGNs YXNzIHJlbmFtZQorICAgICAgICBwYW5lbHMgLT4gbWFpbi1wYW5lbHMuCisgICAgICAgIChXZWJJ bnNwZWN0b3IubG9hZGVkKTogQWRkZWQgYmFjayB0aGUgbW91c2Vkb3duIGV2ZW50IGxpc3RlbmVy IGZvciB0aGUKKyAgICAgICAgc2VhcmNoIHJlc3VsdHMgcmVzaXplciB0aGF0IHdhcyByZW1vdmVk IGluIHIzMTczNi4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5zZWFyY2hSZXN1bHRzUmVzaXplckRy YWcpOiBVcGRhdGVkIGZvciBjbGFzcyByZW5hbWUKKyAgICAgICAgcGFuZWxzIC0+IG1haW4tcGFu ZWxzLgorICAgICAgICAoV2ViSW5zcGVjdG9yLnBlcmZvcm1TZWFyY2gpOgorICAgICAgICAgIC0g Q2hhbmdlZCB0byB1c2Ugc291cmNlRnJhbWVGb3JSZXNvdXJjZQorICAgICAgICAgIC0gQ2hhbmdl ZCB0byB1c2Ugc2hvd1Jlc291cmNlCisgICAgICAgICAgLSBDaGFuZ2VkIHRvIHNhdmUvcmVzdG9y ZSB0aGUgZm9jdXNlZCBlbGVtZW50IGFyb3VuZCB0aGUgc2V0dGluZyBvZgorICAgICAgICAgICAg dGhlIGN1cnJlbnQgcGFuZWwKKyAgICAgICAgICAtIENoYW5nZWQgdG8gZ2V0IHRoZSBzb3VyY2Ug ZG9jdW1lbnQgZnJvbSB0aGUgbWF0Y2ggcmFuZ2UgaW5zdGVhZCBvZgorICAgICAgICAgICAgYnkg Y3Jhd2xpbmcgYmFjayB1cCB0byB0aGUgc291cmNlIHZpZXcKKyAgICAgICAgICAtIENoYW5nZWQg dG8gYmluZCB0aGUgb25zZWxlY3QgaGFuZGxlcnMgdG8gdGhpcyBzbyB0aGF0IHdlIGNhbgorICAg ICAgICAgICAgYWNjZXNzIHRoZSBFbGVtZW50cy9SZXNvdXJjZXMgcGFuZWxzCisKKzIwMDgtMDQt MTYgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCiAgICAgICAgIEZpeCBjb25zb2xl LWxvZy1mb3JtYXR0aW5nIHRvIHRydWx5IHRlc3QgZm9ybWF0dGluZyBhbiB1bmRlZmluZWQgdmFs dWUKIAogICAgICAgICBFeGNlcHRpb25zIHRocm93biBieSB0aGUgdGVzdCB3aWxsIGFsc28gbm93 IGJlIHNob3duIGFzIGVycm9ycy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9pbnNwZWN0b3Iv UmVzb3VyY2VzUGFuZWwuanMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL1Jlc291cmNlc1BhbmVs LmpzCmluZGV4IDU0YjRiOTMuLjc3ZjQ2ZDIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9pbnNw ZWN0b3IvUmVzb3VyY2VzUGFuZWwuanMKKysrIGIvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9SZXNv dXJjZXNQYW5lbC5qcwpAQCAtNDIzLDYgKzQyMywyMyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2Vz UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl91cGRhdGVTaWRlYmFyV2lkdGgoKTsK ICAgICB9LAogCisgICAgc291cmNlRnJhbWVGb3JSZXNvdXJjZTogZnVuY3Rpb24ocmVzb3VyY2Up CisgICAgeworICAgICAgICB2YXIgdmlldyA9IHRoaXMuX3Jlc291cmNlVmlldyhyZXNvdXJjZSk7 CisgICAgICAgIGlmICghdmlldykKKyAgICAgICAgICAgIHJldHVybiBudWxsOworCisgICAgICAg IGlmICghdmlldy5zZXR1cFNvdXJjZUZyYW1lSWZOZWVkZWQpCisgICAgICAgICAgICByZXR1cm4g bnVsbDsKKworICAgICAgICAvLyBTZXR0aW5nIHVwIHRoZSBzb3VyY2UgZnJhbWUgcmVxdWlyZXMg dGhhdCB3ZSBiZSBhdHRhY2hlZC4KKyAgICAgICAgaWYgKCF0aGlzLmVsZW1lbnQucGFyZW50Tm9k ZSkKKyAgICAgICAgICAgIHRoaXMuYXR0YWNoKCk7CisKKyAgICAgICAgdmlldy5zZXR1cFNvdXJj ZUZyYW1lSWZOZWVkZWQoKTsKKyAgICAgICAgcmV0dXJuIHZpZXcuZnJhbWVFbGVtZW50OworICAg IH0sCisKICAgICBoYW5kbGVLZXlFdmVudDogZnVuY3Rpb24oZXZlbnQpCiAgICAgewogICAgICAg ICB0aGlzLnNpZGViYXJUcmVlLmhhbmRsZUtleUV2ZW50KGV2ZW50KTsKZGlmZiAtLWdpdCBhL1dl YkNvcmUvcGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmNzcyBiL1dlYkNvcmUvcGFnZS9pbnNwZWN0 b3IvaW5zcGVjdG9yLmNzcwppbmRleCAzMjE3NzFlLi5iMzU4MWI4IDEwMDY0NAotLS0gYS9XZWJD b3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5jc3MKKysrIGIvV2ViQ29yZS9wYWdlL2luc3Bl Y3Rvci9pbnNwZWN0b3IuY3NzCkBAIC0xMzAsNiArMTMwLDY0IEBAIGJvZHkuZGV0YWNoZWQucGxh dGZvcm0tbWFjLWxlb3BhcmQgI3Rvb2xiYXIgewogICAgIGNvbnRlbnQ6IHVybChJbWFnZXMvZGF0 YWJhc2VzSWNvbi5wbmcpOwogfQogCisjc2VhcmNoUmVzdWx0cyB7CisgICAgcG9zaXRpb246IGFi c29sdXRlOworICAgIHRvcDogLTEwMHB4OworICAgIGxlZnQ6IDA7CisgICAgcmlnaHQ6IDA7Cisg ICAgaGVpZ2h0OiAxMDBweDsKKyAgICB6LWluZGV4OiAtMTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9y OiB3aGl0ZTsKKyAgICBib3JkZXItYm90dG9tOiAxcHggc29saWQgcmdiKDE4MCwgMTgwLCAxODAp OworICAgIG92ZXJmbG93LXk6IGF1dG87CisgICAgb3ZlcmZsb3cteDogaGlkZGVuOworICAgIC13 ZWJraXQtYm94LXNpemluZzogYm9yZGVyLWJveDsKK30KKworLnNlYXJjaC1yZXN1bHRzLXNlY3Rp b24geworICAgIGNvbG9yOiBncmF5OworICAgIHdpZHRoOiAyOHB4OworICAgIGZsb2F0OiBsZWZ0 OworICAgIG1hcmdpbi1sZWZ0OiAtNDVweDsKKyAgICB0ZXh0LWFsaWduOiByaWdodDsKKyAgICBm b250LXNpemU6IDEwcHg7CisgICAgbWFyZ2luLXRvcDogMXB4OworICAgIHdoaXRlLXNwYWNlOiBu b3dyYXA7Cit9CisKKy5zZWxlY3RlZCAuc2VhcmNoLXJlc3VsdHMtc2VjdGlvbiB7CisgICAgY29s b3I6IHJnYmEoMjU1LCAyNTUsIDI1NSwgMC44KTsKK30KKworYm9keS5pbmFjdGl2ZSAuZm9jdXNl ZCAuc2VsZWN0ZWQgLnNlYXJjaC1yZXN1bHRzLXNlY3Rpb24geworICAgIGNvbG9yOiByZ2JhKDAs IDAsIDAsIDAuNSk7Cit9CisKKy5ibHVycmVkIC5zZWxlY3RlZCAuc2VhcmNoLXJlc3VsdHMtc2Vj dGlvbiB7CisgICAgY29sb3I6IHJnYmEoMCwgMCwgMCwgMC41KTsKK30KKworI3NlYXJjaFJlc3Vs dHMgPiBvbCA+IG9sID4gbGkgeworICAgIHBhZGRpbmctbGVmdDogNDVweDsKKyAgICB3aGl0ZS1z cGFjZTogbm93cmFwOworfQorCisuc2VhcmNoLW1hdGNoZWQtc3RyaW5nIHsKKyAgICBiYWNrZ3Jv dW5kLWNvbG9yOiAjZmY4OworfQorCisuc2VsZWN0ZWQgLnNlYXJjaC1tYXRjaGVkLXN0cmluZyB7 CisgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7Cit9CisKKyNzZWFyY2hSZXN1bHRz UmVzaXplciB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGhlaWdodDogNXB4OworICAg IGxlZnQ6IDA7CisgICAgcmlnaHQ6IDA7CisgICAgY3Vyc29yOiByb3ctcmVzaXplOworfQorCiAj bWFpbiB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgIHotaW5kZXg6IDE7CmRpZmYgLS1n aXQgYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sIGIvV2ViQ29yZS9wYWdl L2luc3BlY3Rvci9pbnNwZWN0b3IuaHRtbAppbmRleCAyMjA1MGRjLi43NzJiNTEyIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5odG1sCisrKyBiL1dlYkNvcmUv cGFnZS9pbnNwZWN0b3IvaW5zcGVjdG9yLmh0bWwKQEAgLTU5LDkgKzU5LDExIEBAIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CiA8Ym9keSBjbGFzcz0iZGV0YWNoZWQiPgogICAgIDxkaXYgaWQ9InRvb2xiYXIiPgogICAgICAg ICA8ZGl2IGNsYXNzPSJ0b29sYmFyLWl0ZW0gZmxleGFibGUtc3BhY2UiPjwvZGl2PgotICAgICAg ICA8ZGl2IGNsYXNzPSJ0b29sYmFyLWl0ZW0iPjxpbnB1dCBpZD0ic2VhcmNoIiBkaXNhYmxlZCB0 eXBlPSJzZWFyY2giIHJlc3VsdHM9IjIwIiBpbmNyZW1lbnRhbD0iaW5jcmVtZW50YWwiIG9uc2Vh cmNoPSJXZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJjaCh0aGlzLnZhbHVlKSI+PGRpdiBpZD0ic2Vh cmNoLXRvb2xiYXItbGFiZWwiIGNsYXNzPSJ0b29sYmFyLWxhYmVsIj48L2Rpdj48L2Rpdj4KKyAg ICAgICAgPGRpdiBjbGFzcz0idG9vbGJhci1pdGVtIj48aW5wdXQgaWQ9InNlYXJjaCIgdHlwZT0i c2VhcmNoIiByZXN1bHRzPSIyMCIgaW5jcmVtZW50YWw9ImluY3JlbWVudGFsIiBvbnNlYXJjaD0i V2ViSW5zcGVjdG9yLnBlcmZvcm1TZWFyY2godGhpcy52YWx1ZSkiPjxkaXYgaWQ9InNlYXJjaC10 b29sYmFyLWxhYmVsIiBjbGFzcz0idG9vbGJhci1sYWJlbCI+PC9kaXY+PC9kaXY+CiAgICAgPC9k aXY+CiAgICAgPGRpdiBpZD0ibWFpbiI+CisgICAgICAgIDxkaXYgaWQ9InNlYXJjaFJlc3VsdHMi IGNsYXNzPSJmb2N1c2FibGUgaGlkZGVuIj48L2Rpdj4KKyAgICAgICAgPGRpdiBpZD0ic2VhcmNo UmVzdWx0c1Jlc2l6ZXIiIGNsYXNzPSJoaWRkZW4iPjwvZGl2PgogICAgICAgICA8ZGl2IGlkPSJt YWluLXBhbmVscyIgY2xhc3M9ImZvY3VzYWJsZSBmb2N1c2VkIj48L2Rpdj4KICAgICAgICAgPGRp diBpZD0ibWFpbi1zdGF0dXMtYmFyIiBjbGFzcz0ic3RhdHVzLWJhciI+PGRpdiBpZD0iYW5jaG9y ZWQtc3RhdHVzLWJhci1pdGVtcyI+PGJ1dHRvbiBpZD0iZG9jay1zdGF0dXMtYmFyLWl0ZW0iIGNs YXNzPSJzdGF0dXMtYmFyLWl0ZW0gdG9nZ2xlZCI+PC9idXR0b24+PGJ1dHRvbiBpZD0iY29uc29s ZS1zdGF0dXMtYmFyLWl0ZW0iIGNsYXNzPSJzdGF0dXMtYmFyLWl0ZW0iPjwvYnV0dG9uPjwvZGl2 PjwvZGl2PgogICAgIDwvZGl2PgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL2luc3BlY3Rvci9p bnNwZWN0b3IuanMgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcwppbmRleCBl M2UxOTRkLi44ZmQ2NGYwIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3Bl Y3Rvci5qcworKysgYi9XZWJDb3JlL3BhZ2UvaW5zcGVjdG9yL2luc3BlY3Rvci5qcwpAQCAtMTU5 LDcgKzE1OSw3IEBAIHZhciBXZWJJbnNwZWN0b3IgPSB7CiAgICAgICAgICAgICB2YXIgYW5pbWF0 aW9ucyA9IFsKICAgICAgICAgICAgICAgICB7ZWxlbWVudDogcmVzdWx0c0NvbnRhaW5lciwgZW5k OiB7dG9wOiAwfX0sCiAgICAgICAgICAgICAgICAge2VsZW1lbnQ6IHNlYXJjaFJlc3VsdHNSZXNp emVyLCBlbmQ6IHt0b3A6IFdlYkluc3BlY3Rvci5zZWFyY2hSZXN1bHRzSGVpZ2h0IC0gM319LAot ICAgICAgICAgICAgICAgIHtlbGVtZW50OiBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicGFuZWxz IiksIGVuZDoge3RvcDogV2ViSW5zcGVjdG9yLnNlYXJjaFJlc3VsdHNIZWlnaHR9fQorICAgICAg ICAgICAgICAgIHtlbGVtZW50OiBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWFpbi1wYW5lbHMi KSwgZW5kOiB7dG9wOiBXZWJJbnNwZWN0b3Iuc2VhcmNoUmVzdWx0c0hlaWdodH19CiAgICAgICAg ICAgICBdOwogCiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuYW5pbWF0ZVN0eWxlKGFuaW1hdGlv bnMsIDI1MCk7CkBAIC0xNjksNyArMTY5LDcgQEAgdmFyIFdlYkluc3BlY3RvciA9IHsKICAgICAg ICAgICAgIHZhciBhbmltYXRpb25zID0gWwogICAgICAgICAgICAgICAgIHtlbGVtZW50OiByZXN1 bHRzQ29udGFpbmVyLCBlbmQ6IHt0b3A6IC1XZWJJbnNwZWN0b3Iuc2VhcmNoUmVzdWx0c0hlaWdo dH19LAogICAgICAgICAgICAgICAgIHtlbGVtZW50OiBzZWFyY2hSZXN1bHRzUmVzaXplciwgZW5k OiB7dG9wOiAwfX0sCi0gICAgICAgICAgICAgICAge2VsZW1lbnQ6IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCJwYW5lbHMiKSwgZW5kOiB7dG9wOiAwfX0KKyAgICAgICAgICAgICAgICB7ZWxlbWVu dDogZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1haW4tcGFuZWxzIiksIGVuZDoge3RvcDogMH19 CiAgICAgICAgICAgICBdOwogCiAgICAgICAgICAgICB2YXIgYW5pbWF0aW9uRmluaXNoZWQgPSBm dW5jdGlvbigpCkBAIC0yMzksNiArMjM5LDggQEAgV2ViSW5zcGVjdG9yLmxvYWRlZCA9IGZ1bmN0 aW9uKCkKICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJiZWZvcmVjb3B5IiwgdGhpcy5k b2N1bWVudENhbkNvcHkuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgZG9jdW1lbnQuYWRkRXZlbnRM aXN0ZW5lcigiY29weSIsIHRoaXMuZG9jdW1lbnRDb3B5LmJpbmQodGhpcyksIHRydWUpOwogCisg ICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNlYXJjaFJlc3VsdHNSZXNpemVyIikuYWRkRXZl bnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhpcy5zZWFyY2hSZXN1bHRzUmVzaXplckRyYWdTdGFy dCwgdHJ1ZSk7CisKICAgICB2YXIgbWFpblBhbmVsc0VsZW1lbnQgPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgibWFpbi1wYW5lbHMiKTsKICAgICBtYWluUGFuZWxzRWxlbWVudC5oYW5kbGVLZXlF dmVudCA9IHRoaXMubWFpbktleURvd24uYmluZCh0aGlzKTsKICAgICBtYWluUGFuZWxzRWxlbWVu dC5oYW5kbGVDb3B5RXZlbnQgPSB0aGlzLm1haW5Db3B5LmJpbmQodGhpcyk7CkBAIC01NDcsNyAr NTQ5LDcgQEAgV2ViSW5zcGVjdG9yLnNlYXJjaFJlc3VsdHNSZXNpemVyRHJhZyA9IGZ1bmN0aW9u KGV2ZW50KQogICAgIFdlYkluc3BlY3Rvci5zZWFyY2hSZXN1bHRzSGVpZ2h0ID0gbmV3SGVpZ2h0 OwogCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNlYXJjaFJlc3VsdHMiKS5zdHlsZS5o ZWlnaHQgPSBXZWJJbnNwZWN0b3Iuc2VhcmNoUmVzdWx0c0hlaWdodCArICJweCI7Ci0gICAgZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoInBhbmVscyIpLnN0eWxlLnRvcCA9IG5ld0hlaWdodCArICJw eCI7CisgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm1haW4tcGFuZWxzIikuc3R5bGUudG9w ID0gbmV3SGVpZ2h0ICsgInB4IjsKICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2VhcmNo UmVzdWx0c1Jlc2l6ZXIiKS5zdHlsZS50b3AgPSAobmV3SGVpZ2h0IC0gMykgKyAicHgiOwogCiAg ICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKQEAgLTc2MSw5ICs3NjMsMTAgQEAgV2ViSW5zcGVj dG9yLnBlcmZvcm1TZWFyY2ggPSBmdW5jdGlvbihxdWVyeSkKICAgICAgICAgdmFyIHJlc291cmNl ID0gcmVzb3VyY2VzVG9TZWFyY2hbaV07CiAKICAgICAgICAgdmFyIHNvdXJjZVJlc3VsdHMgPSBb XTsKLSAgICAgICAgaWYgKCFpc1hQYXRoICYmICJzb3VyY2UiIGluIHJlc291cmNlLnBhbmVsLnZp ZXdzKSB7Ci0gICAgICAgICAgICByZXNvdXJjZS5wYW5lbC5zZXR1cFNvdXJjZUZyYW1lSWZOZWVk ZWQoKTsKLSAgICAgICAgICAgIHNvdXJjZVJlc3VsdHMgPSBJbnNwZWN0b3JDb250cm9sbGVyLnNl YXJjaChyZXNvdXJjZS5wYW5lbC52aWV3cy5zb3VyY2UuZnJhbWVFbGVtZW50LmNvbnRlbnREb2N1 bWVudCwgcXVlcnkpOworICAgICAgICBpZiAoIWlzWFBhdGgpIHsKKyAgICAgICAgICAgIHZhciBz b3VyY2VGcmFtZSA9IHRoaXMucGFuZWxzLnJlc291cmNlcy5zb3VyY2VGcmFtZUZvclJlc291cmNl KHJlc291cmNlKTsKKyAgICAgICAgICAgIGlmIChzb3VyY2VGcmFtZSkKKyAgICAgICAgICAgICAg ICBzb3VyY2VSZXN1bHRzID0gSW5zcGVjdG9yQ29udHJvbGxlci5zZWFyY2goc291cmNlRnJhbWUu Y29udGVudERvY3VtZW50LCBxdWVyeSk7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgZG9tUmVz dWx0cyA9IFtdOwpAQCAtODI0LDcgKzgyNywxMSBAQCBXZWJJbnNwZWN0b3IucGVyZm9ybVNlYXJj aCA9IGZ1bmN0aW9uKHF1ZXJ5KQogICAgICAgICBzZWxlY3Rpb24ucmVtb3ZlQWxsUmFuZ2VzKCk7 CiAgICAgICAgIHNlbGVjdGlvbi5hZGRSYW5nZShlbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0LnJh bmdlKTsKIAotICAgICAgICB0aGlzLmN1cnJlbnRQYW5lbCA9IGVsZW1lbnQucmVwcmVzZW50ZWRP YmplY3QucGFuZWw7CisgICAgICAgIHZhciBvbGRGb2N1c0VsZW1lbnQgPSB0aGlzLmN1cnJlbnRG b2N1c0VsZW1lbnQ7CisgICAgICAgIHRoaXMuY3VycmVudFBhbmVsID0gdGhpcy5wYW5lbHMucmVz b3VyY2VzOworICAgICAgICB0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQgPSBvbGRGb2N1c0VsZW1l bnQ7CisKKyAgICAgICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLnNob3dSZXNvdXJjZShlbGVtZW50 LnJlcHJlc2VudGVkT2JqZWN0LnJlc291cmNlKTsKIAogICAgICAgICBlbGVtZW50LnJlcHJlc2Vu dGVkT2JqZWN0LmxpbmUuc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZCh0cnVlKTsKICAgICAgICAgZWxl bWVudC5saXN0SXRlbUVsZW1lbnQuc2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChmYWxzZSk7CkBAIC04 MzIsNyArODM5LDEwIEBAIFdlYkluc3BlY3Rvci5wZXJmb3JtU2VhcmNoID0gZnVuY3Rpb24ocXVl cnkpCiAKICAgICB2YXIgZG9tUmVzdWx0U2VsZWN0ZWQgPSBmdW5jdGlvbihlbGVtZW50KQogICAg IHsKKyAgICAgICAgdmFyIG9sZEZvY3VzRWxlbWVudCA9IHRoaXMuY3VycmVudEZvY3VzRWxlbWVu dDsKICAgICAgICAgdGhpcy5jdXJyZW50UGFuZWwgPSB0aGlzLnBhbmVscy5lbGVtZW50czsKKyAg ICAgICAgdGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50ID0gb2xkRm9jdXNFbGVtZW50OworCiAgICAg ICAgIHRoaXMucGFuZWxzLmVsZW1lbnRzLmZvY3VzZWRET01Ob2RlID0gZWxlbWVudC5yZXByZXNl bnRlZE9iamVjdC5ub2RlOwogICAgICAgICBlbGVtZW50Lmxpc3RJdGVtRWxlbWVudC5zY3JvbGxJ bnRvVmlld0lmTmVlZGVkKGZhbHNlKTsKICAgICB9CkBAIC04NDgsMTEgKzg1OCwxMiBAQCBXZWJJ bnNwZWN0b3IucGVyZm9ybVNlYXJjaCA9IGZ1bmN0aW9uKHF1ZXJ5KQogICAgICAgICBpZiAoZmls ZS5zb3VyY2VSZXN1bHRzICYmIGZpbGUuc291cmNlUmVzdWx0cy5sZW5ndGgpIHsKICAgICAgICAg ICAgIGZvciAodmFyIGogPSAwOyBqIDwgZmlsZS5zb3VyY2VSZXN1bHRzLmxlbmd0aDsgKytqKSB7 CiAgICAgICAgICAgICAgICAgdmFyIHJhbmdlID0gZmlsZS5zb3VyY2VSZXN1bHRzW2pdOworICAg ICAgICAgICAgICAgIHZhciBzb3VyY2VEb2N1bWVudCA9IHJhbmdlLnN0YXJ0Q29udGFpbmVyLm93 bmVyRG9jdW1lbnQ7CiAKICAgICAgICAgICAgICAgICB2YXIgbGluZSA9IHJhbmdlLnN0YXJ0Q29u dGFpbmVyOwogICAgICAgICAgICAgICAgIHdoaWxlIChsaW5lLnBhcmVudE5vZGUgJiYgbGluZS5u b2RlTmFtZS50b0xvd2VyQ2FzZSgpICE9ICJ0ciIpCiAgICAgICAgICAgICAgICAgICAgIGxpbmUg PSBsaW5lLnBhcmVudE5vZGU7Ci0gICAgICAgICAgICAgICAgdmFyIGxpbmVSYW5nZSA9IGZpbGUu cmVzb3VyY2UucGFuZWwudmlld3Muc291cmNlLmZyYW1lRWxlbWVudC5jb250ZW50RG9jdW1lbnQu Y3JlYXRlUmFuZ2UoKTsKKyAgICAgICAgICAgICAgICB2YXIgbGluZVJhbmdlID0gc291cmNlRG9j dW1lbnQuY3JlYXRlUmFuZ2UoKTsKICAgICAgICAgICAgICAgICBsaW5lUmFuZ2Uuc2VsZWN0Tm9k ZUNvbnRlbnRzKGxpbmUpOwogCiAgICAgICAgICAgICAgICAgLy8gRG9uJ3QgaW5jbHVkZSBhbnkg ZXJyb3IgYnViYmxlcyBpbiB0aGUgc2VhcmNoIHJlc3VsdApAQCAtODYzLDExICs4NzQsMTEgQEAg V2ViSW5zcGVjdG9yLnBlcmZvcm1TZWFyY2ggPSBmdW5jdGlvbihxdWVyeSkKICAgICAgICAgICAg ICAgICAgICAgbGluZVJhbmdlLnNldEVuZEFmdGVyKGVuZCk7CiAgICAgICAgICAgICAgICAgfQog Ci0gICAgICAgICAgICAgICAgdmFyIGJlZm9yZVJhbmdlID0gZmlsZS5yZXNvdXJjZS5wYW5lbC52 aWV3cy5zb3VyY2UuZnJhbWVFbGVtZW50LmNvbnRlbnREb2N1bWVudC5jcmVhdGVSYW5nZSgpOwor ICAgICAgICAgICAgICAgIHZhciBiZWZvcmVSYW5nZSA9IHNvdXJjZURvY3VtZW50LmNyZWF0ZVJh bmdlKCk7CiAgICAgICAgICAgICAgICAgYmVmb3JlUmFuZ2Uuc2V0U3RhcnQobGluZVJhbmdlLnN0 YXJ0Q29udGFpbmVyLCBsaW5lUmFuZ2Uuc3RhcnRPZmZzZXQpOwogICAgICAgICAgICAgICAgIGJl Zm9yZVJhbmdlLnNldEVuZChyYW5nZS5zdGFydENvbnRhaW5lciwgcmFuZ2Uuc3RhcnRPZmZzZXQp OwogCi0gICAgICAgICAgICAgICAgdmFyIGFmdGVyUmFuZ2UgPSBmaWxlLnJlc291cmNlLnBhbmVs LnZpZXdzLnNvdXJjZS5mcmFtZUVsZW1lbnQuY29udGVudERvY3VtZW50LmNyZWF0ZVJhbmdlKCk7 CisgICAgICAgICAgICAgICAgdmFyIGFmdGVyUmFuZ2UgPSBzb3VyY2VEb2N1bWVudC5jcmVhdGVS YW5nZSgpOwogICAgICAgICAgICAgICAgIGFmdGVyUmFuZ2Uuc2V0U3RhcnQocmFuZ2UuZW5kQ29u dGFpbmVyLCByYW5nZS5lbmRPZmZzZXQpOwogICAgICAgICAgICAgICAgIGFmdGVyUmFuZ2Uuc2V0 RW5kKGxpbmVSYW5nZS5lbmRDb250YWluZXIsIGxpbmVSYW5nZS5lbmRPZmZzZXQpOwogCkBAIC04 ODgsOCArODk5LDggQEAgV2ViSW5zcGVjdG9yLnBlcmZvcm1TZWFyY2ggPSBmdW5jdGlvbihxdWVy eSkKICAgICAgICAgICAgICAgICBpZiAoaiA9PSAwKQogICAgICAgICAgICAgICAgICAgICB0aXRs ZSArPSAiPGRpdiBjbGFzcz1cInNlYXJjaC1yZXN1bHRzLXNlY3Rpb25cIj4iICsgV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJTb3VyY2UiKSArICI8L2Rpdj4iOwogICAgICAgICAgICAgICAgIHRpdGxl ICs9IGJlZm9yZVRleHQuZXNjYXBlSFRNTCgpICsgIjxzcGFuIGNsYXNzPVwic2VhcmNoLW1hdGNo ZWQtc3RyaW5nXCI+IiArIHRleHQuZXNjYXBlSFRNTCgpICsgIjwvc3Bhbj4iICsgYWZ0ZXJUZXh0 LmVzY2FwZUhUTUwoKTsKLSAgICAgICAgICAgICAgICB2YXIgaXRlbSA9IG5ldyBUcmVlRWxlbWVu dCh0aXRsZSwge3BhbmVsOiBmaWxlLnJlc291cmNlLnBhbmVsLCBsaW5lOiBsaW5lLCByYW5nZTog cmFuZ2V9LCBmYWxzZSk7Ci0gICAgICAgICAgICAgICAgaXRlbS5vbnNlbGVjdCA9IHNvdXJjZVJl c3VsdFNlbGVjdGVkOworICAgICAgICAgICAgICAgIHZhciBpdGVtID0gbmV3IFRyZWVFbGVtZW50 KHRpdGxlLCB7cmVzb3VyY2U6IGZpbGUucmVzb3VyY2UsIGxpbmU6IGxpbmUsIHJhbmdlOiByYW5n ZX0sIGZhbHNlKTsKKyAgICAgICAgICAgICAgICBpdGVtLm9uc2VsZWN0ID0gc291cmNlUmVzdWx0 U2VsZWN0ZWQuYmluZCh0aGlzKTsKICAgICAgICAgICAgICAgICBmaWxlSXRlbS5hcHBlbmRDaGls ZChpdGVtKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAtOTAxLDggKzkxMiw4IEBAIFdl Ykluc3BlY3Rvci5wZXJmb3JtU2VhcmNoID0gZnVuY3Rpb24ocXVlcnkpCiAgICAgICAgICAgICAg ICAgaWYgKGogPT0gMCkKICAgICAgICAgICAgICAgICAgICAgdGl0bGUgKz0gIjxkaXYgY2xhc3M9 XCJzZWFyY2gtcmVzdWx0cy1zZWN0aW9uXCI+IiArIFdlYkluc3BlY3Rvci5VSVN0cmluZygiRE9N IikgKyAiPC9kaXY+IjsKICAgICAgICAgICAgICAgICB0aXRsZSArPSBub2RlVGl0bGVJbmZvLmNh bGwobm9kZSkudGl0bGU7Ci0gICAgICAgICAgICAgICAgdmFyIGl0ZW0gPSBuZXcgVHJlZUVsZW1l bnQodGl0bGUsIHtwYW5lbDogZmlsZS5yZXNvdXJjZS5wYW5lbCwgbm9kZTogbm9kZX0sIGZhbHNl KTsKLSAgICAgICAgICAgICAgICBpdGVtLm9uc2VsZWN0ID0gZG9tUmVzdWx0U2VsZWN0ZWQ7Cisg ICAgICAgICAgICAgICAgdmFyIGl0ZW0gPSBuZXcgVHJlZUVsZW1lbnQodGl0bGUsIHtyZXNvdXJj ZTogZmlsZS5yZXNvdXJjZSwgbm9kZTogbm9kZX0sIGZhbHNlKTsKKyAgICAgICAgICAgICAgICBp dGVtLm9uc2VsZWN0ID0gZG9tUmVzdWx0U2VsZWN0ZWQuYmluZCh0aGlzKTsKICAgICAgICAgICAg ICAgICBmaWxlSXRlbS5hcHBlbmRDaGlsZChpdGVtKTsKICAgICAgICAgICAgIH0KICAgICAgICAg fQotLSAKMS41LjUuNDkuZzkxNGE5Cgo=