69221 2011-10-02 04:56:48 -0700 Web Inspector: restore partial front-end compilability 2011-10-03 02:15:21 -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 476663 0 pfeldman 2011-10-02 04:56:48 -0700 Removed unused isWhitespace; introduced missing classes in Inspector.json. 476664 1 109419 pfeldman 2011-10-02 05:00:03 -0700 Created attachment 109419 Patch 476836 2 109419 yurys 2011-10-03 00:54:09 -0700 Comment on attachment 109419 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109419&action=review > Source/WebCore/inspector/front-end/DOMAgent.js:389 > + /** @type {Object|undefined} */ When can it become undefined? > Source/WebCore/inspector/front-end/Object.js:71 > + * @param {*=} eventData Should be just {*} 476852 3 pfeldman 2011-10-03 02:15:21 -0700 Committed r96485: <http://trac.webkit.org/changeset/96485> 109419 2011-10-02 05:00:03 -0700 2011-10-03 00:54:09 -0700 Patch bug-69221-20111002155953.patch text/plain 21073 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogOTY0NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5OTgwNmQyY2ExNGZkYzg5 YTJiYmU2YzFhZjMwZDJjMzRhODY2OTA4Li4wMzQ4MDc0YTE4YTk3ZjdkMjQ1ZmZiODIzODc3ZjU5 MWMzNmRjMmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMTAtMDIgIFBhdmVs IEZlbGRtYW4gIDxwZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogcmVzdG9yZSBwYXJ0aWFsIGZyb250LWVuZCBjb21waWxhYmlsaXR5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTIyMQorCisgICAgICAgIFJlbW92 ZWQgdW51c2VkIGlzV2hpdGVzcGFjZTsgaW50cm9kdWNlZCBtaXNzaW5nIGNsYXNzZXMgaW4gSW5z cGVjdG9yLmpzb247CisgICAgICAgIGdlbmVyYXRlZCBleHRlcm5zIGZvciB0aGUgcHJvdG9jb2wg dHlwZXMgYWxvbmcgd2l0aCB0aGUgY29tbWFuZHMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisgICAg ICAgICogaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnNoOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvRE9NQWdlbnQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRE9NQWdlbnQp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTUFnZW50LnByb3RvdHlwZS5fZGlzcGF0Y2hXaGVu RG9jdW1lbnRBdmFpbGFibGUub25Eb2N1bWVudEF2YWlsYWJsZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlLl9kaXNwYXRjaFdoZW5Eb2N1bWVudEF2YWlsYWJsZSk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLkVsZW1lbnRzUGFuZWwucHJvdG90eXBlLnVwZGF0ZUJyZWFkY3J1bWIp OgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qczoK KyAgICAgICAgKCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3QuanM6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlBvcG92ZXJIZWxwZXIucHJvdG90eXBlLl9tb3VzZU1vdmUpOgorICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvVmlldy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L2V4dGVybnMuanM6CisgICAgICAgIChBcnJheS5wcm90b3R5cGUucmVtb3ZlKToKKyAgICAgICAg KiBpbnNwZWN0b3IvZ2VuZXJhdGUtcHJvdG9jb2wtZXh0ZXJuczoKKwogMjAxMS0xMC0wMiAgRGly ayBTY2h1bHplICA8a3JpdEB3ZWJraXQub3JnPgogCiAgICAgICAgIFNWRyBNYXNrIHNob3VsZCB0 YWtlICdjb2xvci1pbnRlcnBvbGF0aW9uJyBpbnRvIGFjY291bnQgdG8gZGV0ZXJtaW5lIHRoZSBj b2xvciBzcGFjZSBvZiB0aGUgbWFzayBpbWFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5qc29uCmluZGV4IDAzOWE1NmFhYzljOWE3ODFlZDBhODdlMzQ3MTdlYzU2MTFmMjhmMzYu LjhhODNmNDJhZWFlM2QyNzgyNDY3NmRlNjU1NTYzYWRmZjMzOWQwN2QgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgorKysgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KQEAgLTExOCwxMiArMTE4LDI5IEBACiAgICAgICAg ICAgICAgICAgInR5cGUiOiAib2JqZWN0IiwKICAgICAgICAgICAgICAgICAiZGVzY3JpcHRpb24i OiAiU2VhcmNoIHJlc3VsdCBmb3IgcmVzb3VyY2UuIiwKICAgICAgICAgICAgICAgICAicHJvcGVy dGllcyI6IFsKLQkgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJp bmciLCAiZGVzY3JpcHRpb24iOiAiUmVzb3VyY2UgVVJMLiIgfSwKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJ1cmwiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3JpcHRpb24iOiAiUmVz b3VyY2UgVVJMLiIgfSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJmcmFtZUlkIiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIlJlc291cmNlIGZyYW1lIGlkLiIgfSwK ICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJtYXRjaGVzQ291bnQiLCAidHlwZSI6ICJu dW1iZXIiLCAiZGVzY3JpcHRpb24iOiAiTnVtYmVyIG9mIG1hdGNoZXMgaW4gdGhlIHJlc291cmNl IGNvbnRlbnQuIiB9CiAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAiaGlkZGVu IjogdHJ1ZQotICAgICAgICAgICAgfQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICAiaWQiOiAiQ29va2llIiwKKyAgICAgICAgICAgICAgICAidHlwZSI6ICJv YmplY3QiLAorICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJDb29raWUgb2JqZWN0IiwK KyAgICAgICAgICAgICAgICAicHJvcGVydGllcyI6IFsKKyAgICAgICAgICAgICAgICAgICAgeyAi bmFtZSI6ICJuYW1lIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkNvb2tpZSBu YW1lLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ2YWx1ZSIsICJ0eXBlIjog InN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJDb29raWUgdmFsdWUuIiB9LAorICAgICAgICAgICAg ICAgICAgICB7ICJuYW1lIjogImRvbWFpbiIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlv biI6ICJDb29raWUgZG9tYWluLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJw YXRoIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkNvb2tpZSBwYXRoLiIgfSwK KyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJleHBpcmVzIiwgInR5cGUiOiAiaW50ZWdl ciIsICJkZXNjcmlwdGlvbiI6ICJDb29raWUgZXhwaXJlcy4iIH0sCisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAic2l6ZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAi Q29va2llIHNpemUuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImh0dHBPbmx5 IiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJUcnVlIGlmIGNvb2tpZSBpcyBo dHRwLW9ubHkuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInNlY3VyZSIsICJ0 eXBlIjogImJvb2xlYW4iLCAiZGVzY3JpcHRpb24iOiAiVHJ1ZSBpZiBjb29raWUgaXMgc2VjdXJl LiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzZXNzaW9uIiwgInR5cGUiOiAi Ym9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJUcnVlIGluIGNhc2Ugb2Ygc2Vzc2lvbiBjb29raWUu IiB9CisgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICAiaGlkZGVuIjogdHJ1ZQor ICAgICAgICAgICAgfSwKICAgICAgICAgXSwKICAgICAgICAgImNvbW1hbmRzIjogWwogICAgICAg ICAgICAgewpAQCAtNzc0LDcgKzc5MSw3IEBACiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMi OiBbCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidHJhbnNhY3Rpb25JZCIsICJ0eXBl IjogImludGVnZXIiIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiY29sdW1uTmFt ZXMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgInR5cGUiOiAic3RyaW5nIiB9IH0sCi0g ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidmFsdWVzIiwgInR5cGUiOiAiYXJyYXkiLCAi aXRlbXMiOiB7ICJ0eXBlIjogInN0cmluZyBvciBudW1iZXIiIH19CisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAidmFsdWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICJ0eXBl IjogImFueSIgfX0KICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAgICB9LAogICAgICAgICAg ICAgewpAQCAtNzg5LDcgKzgwNiwxOSBAQAogICAgIHsKICAgICAgICAgImRvbWFpbiI6ICJET01T dG9yYWdlIiwKICAgICAgICAgImhpZGRlbiI6IHRydWUsCi0gICAgICAgICJ0eXBlcyI6IFtdLAor ICAgICAgICAidHlwZXMiOiBbCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgImlkIjog IkVudHJ5IiwKKyAgICAgICAgICAgICAgICAidHlwZSI6ICJvYmplY3QiLAorICAgICAgICAgICAg ICAgICJkZXNjcmlwdGlvbiI6ICJET00gU3RvcmFnZSBlbnRyeS4iLAorICAgICAgICAgICAgICAg ICJoaWRkZW4iOiB0cnVlLAorICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVzIjogWworICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogImhvc3QiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3Jp cHRpb24iOiAiRG9tYWluIG5hbWUuIiB9LAorICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjog ImlzTG9jYWxTdG9yYWdlIiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJUcnVl IGZvciBsb2NhbCBzdG9yYWdlLiIgfSwKKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJp ZCIsICJ0eXBlIjogIm51bWJlciIsICJkZXNjcmlwdGlvbiI6ICJFbnRyeSBpZCBmb3IgZnVydGhl ciByZWZlcmVuY2UuIiB9CisgICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgfSwKKyAgICAg ICAgXSwKICAgICAgICAgImNvbW1hbmRzIjogWwogICAgICAgICAgICAgewogICAgICAgICAgICAg ICAgICJuYW1lIjogImVuYWJsZSIsCkBAIC04MDUsNyArODM0LDcgQEAKICAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJzdG9yYWdlSWQiLCAidHlwZSI6ICJpbnRlZ2VyIiB9CiAgICAgICAg ICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKLSAgICAgICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJlbnRyaWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIk cmVmIjogIkRPTVN0b3JhZ2VFbnRyeSJ9IH0KKyAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6 ICJlbnRyaWVzIiwgInR5cGUiOiAiYXJyYXkiLCAiaXRlbXMiOiB7ICIkcmVmIjogIkVudHJ5In0g fQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2ggYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQuc2gKaW5kZXggNmI2Yzhi MmY0MjlmZTBjZTZiODc2ZjBiZTZiNjBlMTdkYzNkMDhhZC4uZWEyOGQ2MDJhMjYxOTY5ZGU3Yzcy MDI3YTU1MWRkNDMzNTg0YmQ1MCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2NvbXBpbGUtZnJvbnQtZW5kLnNoCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9jb21w aWxlLWZyb250LWVuZC5zaApAQCAtMzQsMzIgKzM0LDIxIEBAIHB5dGhvbiBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZ2VuZXJhdGUtcHJvdG9jb2wtZXh0ZXJucyAtbyBTb3VyY2UvV2ViQ29yZS9p bnNwCiBqYXZhIC1qYXIgfi9jbG9zdXJlL2NvbXBpbGVyLmphciAtLWNvbXBpbGF0aW9uX2xldmVs IFNJTVBMRV9PUFRJTUlaQVRJT05TIC0td2FybmluZ19sZXZlbCBWRVJCT1NFIC0tbGFuZ3VhZ2Vf aW4gRUNNQVNDUklQVDUgLS1hY2NlcHRfY29uc3Rfa2V5d29yZCBcCiAgICAgLS1leHRlcm5zIFNv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvZXh0ZXJucy5qcyBcCiAgICAgLS1leHRl cm5zIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvcHJvdG9jb2wtZXh0ZXJucy5q cyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfdXRpbDoyIFwKKyAgICAtLW1vZHVsZSBqc21vZHVs ZV9jb3JlOjIgXAogICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvdXRpbGl0aWVzLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL3RyZWVvdXRsaW5lLmpzIFwKLSAgICAtLW1vZHVsZSBqc21vZHVsZV9ob3N0OjEg XAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVj dG9yRnJvbnRlbmRIb3N0U3R1Yi5qcyBcCi0gICAgLS1tb2R1bGUganNtb2R1bGVfY29tbW9uOjQ6 anNtb2R1bGVfdXRpbCxqc21vZHVsZV9ob3N0IFwKLSAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0JpbmFyeVNlYXJjaC5qcyBcCi0gICAgICAgIC0tanMgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9PYmplY3QuanMgXAorICAgIC0tbW9kdWxl IGpzbW9kdWxlX2VudjozIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NldHRpbmdzLmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1VzZXJNZXRyaWNzLmpzIFwKLSAgICAtLW1vZHVsZSBqc21vZHVsZV9z ZGs6MTU6anNtb2R1bGVfY29tbW9uLGpzbW9kdWxlX2hvc3QgXAotICAgICAgICAtLWpzIFNvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJNb2RlbC5qcyBcCi0gICAgICAg IC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9CcmVha3BvaW50TWFuYWdl ci5qcyBcCi0gICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9D b25zb2xlTWVzc2FnZS5qcyBcCi0gICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9Db25zb2xlTW9kZWwuanMgXAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5qcyBcCi0gICAg ICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVQYXJzZXIu anMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5z cGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcyBcCisgICAgLS1tb2R1bGUganNtb2R1bGVfc2RrOjc6 anNtb2R1bGVfY29yZSxqc21vZHVsZV9lbnYgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvQmluYXJ5U2VhcmNoLmpzIFwKICAgICAgICAgLS1qcyBTb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RPTUFnZW50LmpzIFwKLSAgICAgICAgLS1q cyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzIFwK KyAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2Vy TW9kZWwuanMgXAorICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvT2JqZWN0LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NjcmlwdC5qcyBcCi0gICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9TY3JpcHRGb3JtYXR0ZXIuanMgXAotICAgICAgICAtLWpzIFNvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRmlsZS5qcyBcCiAgICAgICAgIC0tanMgU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZW1vdGVPYmplY3QuanMgXAotICAgICAg ICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgXAog ICAgICAgICAtLWpzIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VD YXRlZ29yeS5qcyBcCi0gICAgICAgIC0tanMgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9VSVNvdXJjZUNvZGUuanMgXAogICAgIC0tbW9kdWxlIGpzbW9kdWxlX21pc2M6MTA6anNt b2R1bGVfc2RrIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL0NoZWNrYm94LmpzIFwKICAgICAgICAgLS1qcyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0NvbnRleHRNZW51LmpzIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0RPTUFnZW50LmpzCmluZGV4IGFkODU3Mzk2NjQwODkwZWYwZWVmYmYzZTNkYzk5 ODgyOTVjNzQ1MzYuLjZiZmIyZjg2YTMxMzc5NzVhM2Q4NmIxMTlhZWFiZWY1M2E2ZGYwNzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRE9NQWdlbnQuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9ET01BZ2VudC5qcwpAQCAt MzEsNiArMzEsNyBAQAogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgorICogQHBhcmFtIHtET01BZ2Vu dC5Ob2RlfSBwYXlsb2FkLgogICovCiBXZWJJbnNwZWN0b3IuRE9NTm9kZSA9IGZ1bmN0aW9uKGRv YywgcGF5bG9hZCkgewogICAgIHRoaXMub3duZXJEb2N1bWVudCA9IGRvYzsKQEAgLTI1OCwxNSAr MjU5LDYgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlID0gewogICAgICAgICByZXR1 cm4gZGVzY2VuZGFudCAhPT0gbnVsbCAmJiBkZXNjZW5kYW50LmlzQW5jZXN0b3IodGhpcyk7CiAg ICAgfSwKIAotICAgIGlzV2hpdGVzcGFjZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgaWYg KHRoaXMubm9kZVR5cGUgIT09IE5vZGUuVEVYVF9OT0RFKQotICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwotICAgICAgICBpZiAoIXRoaXMubm9kZVZhbHVlLmxlbmd0aCkKLSAgICAgICAgICAgIHJl dHVybiB0cnVlOwotICAgICAgICByZXR1cm4gdGhpcy5ub2RlVmFsdWUubWF0Y2goL15bXHNceEEw XSskLyk7Ci0gICAgfSwKLQogICAgIF9zZXRBdHRyaWJ1dGVzUGF5bG9hZDogZnVuY3Rpb24oYXR0 cnMpCiAgICAgewogICAgICAgICB0aGlzLl9hdHRyaWJ1dGVzID0gW107CkBAIC0yNzUsNiArMjY3 LDkgQEAgV2ViSW5zcGVjdG9yLkRPTU5vZGUucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhp cy5fYWRkQXR0cmlidXRlKGF0dHJzW2ldLCBhdHRyc1tpICsgMV0pOwogICAgIH0sCiAKKyAgICAv KioKKyAgICAgKiBAcGFyYW0ge0RPTUFnZW50Lk5vZGV9IHBheWxvYWQuCisgICAgICovCiAgICAg X2luc2VydENoaWxkOiBmdW5jdGlvbihwcmV2LCBwYXlsb2FkKQogICAgIHsKICAgICAgICAgdmFy IG5vZGUgPSBuZXcgV2ViSW5zcGVjdG9yLkRPTU5vZGUodGhpcy5vd25lckRvY3VtZW50LCBwYXls b2FkKTsKQEAgLTM3NSw2ICszNzAsNyBAQCBXZWJJbnNwZWN0b3IuRE9NTm9kZS5wcm90b3R5cGUg PSB7CiAvKioKICAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuRE9NTm9kZX0KICAqIEBjb25zdHJ1 Y3RvcgorICogQHBhcmFtIHtET01BZ2VudC5Ob2RlfSBwYXlsb2FkLgogICovCiBXZWJJbnNwZWN0 b3IuRE9NRG9jdW1lbnQgPSBmdW5jdGlvbihkb21BZ2VudCwgcGF5bG9hZCkKIHsKQEAgLTM5MCw3 ICszODYsOCBAQCBXZWJJbnNwZWN0b3IuRE9NRG9jdW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9 IFdlYkluc3BlY3Rvci5ET01Ob2RlLnByb3RvdHlwZTsKICAqIEBjb25zdHJ1Y3RvcgogICovCiBX ZWJJbnNwZWN0b3IuRE9NQWdlbnQgPSBmdW5jdGlvbigpIHsKLSAgICB0aGlzLl9pZFRvRE9NTm9k ZSA9IG51bGw7CisgICAgLyoqIEB0eXBlIHtPYmplY3R8dW5kZWZpbmVkfSAqLworICAgIHRoaXMu X2lkVG9ET01Ob2RlID0ge307CiAgICAgdGhpcy5fZG9jdW1lbnQgPSBudWxsOwogICAgIHRoaXMu X2F0dHJpYnV0ZUxvYWROb2RlSWRzID0ge307CiAgICAgSW5zcGVjdG9yQmFja2VuZC5yZWdpc3Rl ckRPTURpc3BhdGNoZXIobmV3IFdlYkluc3BlY3Rvci5ET01EaXNwYXRjaGVyKHRoaXMpKTsKQEAg LTQwOSw2ICs0MDYsOSBAQCBXZWJJbnNwZWN0b3IuRE9NQWdlbnQuRXZlbnRzID0gewogfQogCiBX ZWJJbnNwZWN0b3IuRE9NQWdlbnQucHJvdG90eXBlID0geworICAgIC8qKgorICAgICAqIEBwYXJh bSB7ZnVuY3Rpb24oV2ViSW5zcGVjdG9yLkRPTURvY3VtZW50KT19IGNhbGxiYWNrCisgICAgICov CiAgICAgcmVxdWVzdERvY3VtZW50OiBmdW5jdGlvbihjYWxsYmFjaykKICAgICB7CiAgICAgICAg IGlmICh0aGlzLl9kb2N1bWVudCkgewpAQCAtNDYyLDIzICs0NjIsMTggQEAgV2ViSW5zcGVjdG9y LkRPTUFnZW50LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICBfZGlzcGF0 Y2hXaGVuRG9jdW1lbnRBdmFpbGFibGU6IGZ1bmN0aW9uKGFjdGlvbikKKyAgICBfZGlzcGF0Y2hX aGVuRG9jdW1lbnRBdmFpbGFibGU6IGZ1bmN0aW9uKGZ1bmMsIGFyZywgY2FsbGJhY2spCiAgICAg ewotICAgICAgICB2YXIgcmVxdWVzdEFyZ3VtZW50cyA9IEFycmF5LnByb3RvdHlwZS5zbGljZS5j YWxsKGFyZ3VtZW50cywgMSk7Ci0gICAgICAgIHZhciBjYWxsYmFja1dyYXBwZXI7CisgICAgICAg IGlmIChjYWxsYmFjaykKKyAgICAgICAgICAgIGNhbGxiYWNrID0gdGhpcy5fd3JhcENsaWVudENh bGxiYWNrKGNhbGxiYWNrKTsKIAotICAgICAgICBpZiAodHlwZW9mIHJlcXVlc3RBcmd1bWVudHNb cmVxdWVzdEFyZ3VtZW50cy5sZW5ndGggLSAxXSA9PT0gImZ1bmN0aW9uIikgewotICAgICAgICAg ICAgdmFyIGNhbGxiYWNrID0gcmVxdWVzdEFyZ3VtZW50cy5wb3AoKTsKLSAgICAgICAgICAgIGNh bGxiYWNrV3JhcHBlciA9IHRoaXMuX3dyYXBDbGllbnRDYWxsYmFjayhjYWxsYmFjayk7Ci0gICAg ICAgICAgICByZXF1ZXN0QXJndW1lbnRzLnB1c2goY2FsbGJhY2tXcmFwcGVyKTsKLSAgICAgICAg fQogICAgICAgICBmdW5jdGlvbiBvbkRvY3VtZW50QXZhaWxhYmxlKCkKICAgICAgICAgewogICAg ICAgICAgICAgaWYgKHRoaXMuX2RvY3VtZW50KQotICAgICAgICAgICAgICAgIGFjdGlvbi5hcHBs eShudWxsLCByZXF1ZXN0QXJndW1lbnRzKTsKKyAgICAgICAgICAgICAgICBmdW5jLmNhbGwobnVs bCwgYXJnLCBjYWxsYmFjayk7CiAgICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICBp ZiAoY2FsbGJhY2tXcmFwcGVyKQotICAgICAgICAgICAgICAgICAgICBjYWxsYmFja1dyYXBwZXIo Ik5vIGRvY3VtZW50Iik7CisgICAgICAgICAgICAgICAgaWYgKGNhbGxiYWNrKQorICAgICAgICAg ICAgICAgICAgICBjYWxsYmFjaygiTm8gZG9jdW1lbnQiKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgICAgICB0aGlzLnJlcXVlc3REb2N1bWVudChvbkRvY3VtZW50QXZhaWxhYmxlLmJp bmQodGhpcykpOwpAQCAtNTUxLDcgKzU0Niw3IEBAIFdlYkluc3BlY3Rvci5ET01BZ2VudC5wcm90 b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAgICAqIEBwYXJhbSB7Kn0gcGF5bG9hZAor ICAgICAqIEBwYXJhbSB7RE9NQWdlbnQuTm9kZX0gcGF5bG9hZC4KICAgICAgKi8KICAgICBfc2V0 RG9jdW1lbnQ6IGZ1bmN0aW9uKHBheWxvYWQpCiAgICAgewpAQCAtNTY3LDcgKzU2Miw3IEBAIFdl Ykluc3BlY3Rvci5ET01BZ2VudC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgotICAg ICAqIEBwYXJhbSB7Kn0gcGF5bG9hZAorICAgICAqIEBwYXJhbSB7RE9NQWdlbnQuTm9kZX0gcGF5 bG9hZC4KICAgICAgKi8KICAgICBfc2V0RGV0YWNoZWRSb290OiBmdW5jdGlvbihwYXlsb2FkKQog ICAgIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxl bWVudHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRWxlbWVu dHNQYW5lbC5qcwppbmRleCAyMjEwM2FmYTljYmQyODlkY2JmY2NiNzBmYzcwNWUzMzhhMjJhMDJh Li5iZTkyMThkOWUzNjBmNmYxY2ZhNjIyOTlhY2FiMjA3ZWQyM2ZiODAzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1BhbmVsLmpzCkBAIC02 MzEsMTAgKzYzMSw3IEBAIFdlYkluc3BlY3Rvci5FbGVtZW50c1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgICAgICAgICBjYXNlIE5vZGUu VEVYVF9OT0RFOgotICAgICAgICAgICAgICAgICAgICBpZiAoY3VycmVudC5pc1doaXRlc3BhY2Uo KSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGNydW1iVGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIih3aGl0ZXNwYWNlKSIpOwotICAgICAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAg ICAgICAgICAgICAgICAgICBjcnVtYlRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIodGV4 dCkiKTsKKyAgICAgICAgICAgICAgICAgICAgY3J1bWJUaXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0 cmluZygiKHRleHQpIik7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrCiAKICAgICAgICAgICAg ICAgICBjYXNlIE5vZGUuQ09NTUVOVF9OT0RFOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FbGVtZW50c1RyZWVPdXRsaW5lLmpzCmluZGV4IGMzYzQx MjQ3YTdkZDcwYTQ1NGFmYWY2OTc5YWMyZWEzYjg0MzJlNDEuLjQzYjhlYjkzZmU0MGJjNTdhMDJm ZTRlYjAwYTNlYWJmODRhZGQxODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvRWxlbWVudHNUcmVlT3V0bGluZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0VsZW1lbnRzVHJlZU91dGxpbmUuanMKQEAgLTE0NzQsMjcgKzE0 NzQsMjMgQEAgV2ViSW5zcGVjdG9yLkVsZW1lbnRzVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewog ICAgICAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgICAgICBjYXNlIE5vZGUuVEVYVF9OT0RF OgotICAgICAgICAgICAgICAgIGlmIChub2RlLmlzV2hpdGVzcGFjZSgpKQotICAgICAgICAgICAg ICAgICAgICBpbmZvLnRpdGxlRE9NLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2Rl KCIod2hpdGVzcGFjZSkiKSk7Ci0gICAgICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAg ICAgICAgIGlmIChub2RlLnBhcmVudE5vZGUgJiYgbm9kZS5wYXJlbnROb2RlLm5vZGVOYW1lKCku dG9Mb3dlckNhc2UoKSA9PT0gInNjcmlwdCIpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHZh ciBuZXdOb2RlID0gaW5mby50aXRsZURPTS5jcmVhdGVDaGlsZCgic3BhbiIsICJ3ZWJraXQtaHRt bC10ZXh0LW5vZGUgd2Via2l0LWh0bWwtanMtbm9kZSIpOwotICAgICAgICAgICAgICAgICAgICAg ICAgbmV3Tm9kZS50ZXh0Q29udGVudCA9IG5vZGUubm9kZVZhbHVlKCk7Ci0KLSAgICAgICAgICAg ICAgICAgICAgICAgIHZhciBqYXZhc2NyaXB0U3ludGF4SGlnaGxpZ2h0ZXIgPSBuZXcgV2ViSW5z cGVjdG9yLkRPTVN5bnRheEhpZ2hsaWdodGVyKCJ0ZXh0L2phdmFzY3JpcHQiLCB0cnVlKTsKLSAg ICAgICAgICAgICAgICAgICAgICAgIGphdmFzY3JpcHRTeW50YXhIaWdobGlnaHRlci5zeW50YXhI aWdobGlnaHROb2RlKG5ld05vZGUpOwotICAgICAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKG5v ZGUucGFyZW50Tm9kZSAmJiBub2RlLnBhcmVudE5vZGUubm9kZU5hbWUoKS50b0xvd2VyQ2FzZSgp ID09PSAic3R5bGUiKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICB2YXIgbmV3Tm9kZSA9IGlu Zm8udGl0bGVET00uY3JlYXRlQ2hpbGQoInNwYW4iLCAid2Via2l0LWh0bWwtdGV4dC1ub2RlIHdl YmtpdC1odG1sLWNzcy1ub2RlIik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBuZXdOb2RlLnRl eHRDb250ZW50ID0gbm9kZS5ub2RlVmFsdWUoKTsKLQotICAgICAgICAgICAgICAgICAgICAgICAg dmFyIGNzc1N5bnRheEhpZ2hsaWdodGVyID0gbmV3IFdlYkluc3BlY3Rvci5ET01TeW50YXhIaWdo bGlnaHRlcigidGV4dC9jc3MiLCB0cnVlKTsKLSAgICAgICAgICAgICAgICAgICAgICAgIGNzc1N5 bnRheEhpZ2hsaWdodGVyLnN5bnRheEhpZ2hsaWdodE5vZGUobmV3Tm9kZSk7Ci0gICAgICAgICAg ICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpbmZvLnRpdGxlRE9N LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJcIiIpKTsKLSAgICAgICAgICAg ICAgICAgICAgICAgIHZhciB0ZXh0Tm9kZUVsZW1lbnQgPSBpbmZvLnRpdGxlRE9NLmNyZWF0ZUNo aWxkKCJzcGFuIiwgIndlYmtpdC1odG1sLXRleHQtbm9kZSIpOwotICAgICAgICAgICAgICAgICAg ICAgICAgdGV4dE5vZGVFbGVtZW50LnRleHRDb250ZW50ID0gbm9kZS5ub2RlVmFsdWUoKTsKLSAg ICAgICAgICAgICAgICAgICAgICAgIGluZm8udGl0bGVET00uYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUoIlwiIikpOwotICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgaWYgKG5vZGUucGFyZW50Tm9kZSAmJiBub2RlLnBhcmVudE5vZGUubm9kZU5hbWUoKS50 b0xvd2VyQ2FzZSgpID09PSAic2NyaXB0IikgeworICAgICAgICAgICAgICAgICAgICB2YXIgbmV3 Tm9kZSA9IGluZm8udGl0bGVET00uY3JlYXRlQ2hpbGQoInNwYW4iLCAid2Via2l0LWh0bWwtdGV4 dC1ub2RlIHdlYmtpdC1odG1sLWpzLW5vZGUiKTsKKyAgICAgICAgICAgICAgICAgICAgbmV3Tm9k ZS50ZXh0Q29udGVudCA9IG5vZGUubm9kZVZhbHVlKCk7CisKKyAgICAgICAgICAgICAgICAgICAg dmFyIGphdmFzY3JpcHRTeW50YXhIaWdobGlnaHRlciA9IG5ldyBXZWJJbnNwZWN0b3IuRE9NU3lu dGF4SGlnaGxpZ2h0ZXIoInRleHQvamF2YXNjcmlwdCIsIHRydWUpOworICAgICAgICAgICAgICAg ICAgICBqYXZhc2NyaXB0U3ludGF4SGlnaGxpZ2h0ZXIuc3ludGF4SGlnaGxpZ2h0Tm9kZShuZXdO b2RlKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgaWYgKG5vZGUucGFyZW50Tm9kZSAmJiBub2Rl LnBhcmVudE5vZGUubm9kZU5hbWUoKS50b0xvd2VyQ2FzZSgpID09PSAic3R5bGUiKSB7CisgICAg ICAgICAgICAgICAgICAgIHZhciBuZXdOb2RlID0gaW5mby50aXRsZURPTS5jcmVhdGVDaGlsZCgi c3BhbiIsICJ3ZWJraXQtaHRtbC10ZXh0LW5vZGUgd2Via2l0LWh0bWwtY3NzLW5vZGUiKTsKKyAg ICAgICAgICAgICAgICAgICAgbmV3Tm9kZS50ZXh0Q29udGVudCA9IG5vZGUubm9kZVZhbHVlKCk7 CisKKyAgICAgICAgICAgICAgICAgICAgdmFyIGNzc1N5bnRheEhpZ2hsaWdodGVyID0gbmV3IFdl Ykluc3BlY3Rvci5ET01TeW50YXhIaWdobGlnaHRlcigidGV4dC9jc3MiLCB0cnVlKTsKKyAgICAg ICAgICAgICAgICAgICAgY3NzU3ludGF4SGlnaGxpZ2h0ZXIuc3ludGF4SGlnaGxpZ2h0Tm9kZShu ZXdOb2RlKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICBp bmZvLnRpdGxlRE9NLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKCJcIiIpKTsK KyAgICAgICAgICAgICAgICAgICAgdmFyIHRleHROb2RlRWxlbWVudCA9IGluZm8udGl0bGVET00u Y3JlYXRlQ2hpbGQoInNwYW4iLCAid2Via2l0LWh0bWwtdGV4dC1ub2RlIik7CisgICAgICAgICAg ICAgICAgICAgIHRleHROb2RlRWxlbWVudC50ZXh0Q29udGVudCA9IG5vZGUubm9kZVZhbHVlKCk7 CisgICAgICAgICAgICAgICAgICAgIGluZm8udGl0bGVET00uYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlVGV4dE5vZGUoIlwiIikpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICBicmVhazsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9PYmplY3QuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5q cwppbmRleCA1NmU2YzNkYzljODQ1OGNjNDBlZmVjNjExMGU3MzUzZjFhNTBmNDFkLi4xNDc1ZDE4 MzEyY2M5ZjI5ZDM2ZjdlMjdiYzU5MmIzNzVmNTljMTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL09iamVjdC5qcwpAQCAtNjcsNiArNjcsOSBAQCBXZWJJbnNwZWN0 b3IuT2JqZWN0LnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwKIAor ICAgIC8qKgorICAgICAqIEBwYXJhbSB7Kj19IGV2ZW50RGF0YQorICAgICAqLwogICAgIGRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVyczogZnVuY3Rpb24oZXZlbnRUeXBlLCBldmVudERhdGEpCiAgICAg ewogICAgICAgICBpZiAoIXRoaXMuX2xpc3RlbmVycyB8fCAhdGhpcy5fbGlzdGVuZXJzW2V2ZW50 VHlwZV0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Bv cG92ZXIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1BvcG92ZXIuanMK aW5kZXggMTIxY2JlOGE4MDA5OTYzNDQ4ODhmNjg0ZTUxOTA0N2FlYTkxNjFiYi4uMzI3YzNmMDhl MTkyNGRkY2U1ZmUyYjEzOTJhYTg2MDMwYjFiZjcyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Qb3BvdmVyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUG9wb3Zlci5qcwpAQCAtMjI2LDcgKzIyNiw3IEBAIFdlYkluc3Bl Y3Rvci5Qb3BvdmVySGVscGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2hpZGVQ b3BvdmVyVGltZXIgPSBzZXRUaW1lb3V0KGRvSGlkZSwgdGhpcy5fdGltZW91dCAvIDIpOwogICAg ICAgICB9CiAKLSAgICAgICAgdGhpcy5faGFuZGxlTW91c2VBY3Rpb24oZXZlbnQpOworICAgICAg ICB0aGlzLl9oYW5kbGVNb3VzZUFjdGlvbihldmVudCwgZmFsc2UpOwogICAgIH0sCiAKICAgICBf aGFuZGxlTW91c2VBY3Rpb246IGZ1bmN0aW9uKGV2ZW50LCBpc01vdXNlRG93bikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVmlldy5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVmlldy5qcwppbmRleCA1ZTA3OTU2OGMxZTJmNjg5 YTcwOGRhOGM1YjBmMDMyZGViNmE1NDZkLi44OGZmN2M2MzQ5MzM5NWZlNGIzZmUxMDEyZDc0NTUx MmMwMDk5NzkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1ZpZXcuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9WaWV3Lmpz CkBAIC0yNiw2ICsyNiw3IEBACiAKIC8qKgogICogQGNvbnN0cnVjdG9yCisgKiBAZXh0ZW5kcyB7 V2ViSW5zcGVjdG9yLk9iamVjdH0KICAqIEBwYXJhbSB7RWxlbWVudD19IGVsZW1lbnQKICAqLwog V2ViSW5zcGVjdG9yLlZpZXcgPSBmdW5jdGlvbihlbGVtZW50KQpAQCAtNjgsNiArNjksOSBAQCBX ZWJJbnNwZWN0b3IuVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRT dHlsZUNsYXNzKCJ2aXNpYmxlIik7CiAgICAgfSwKIAorICAgIC8qKgorICAgICAqIEBwYXJhbSB7 RWxlbWVudD19IHBhcmVudEVsZW1lbnQKKyAgICAgKi8KICAgICBzaG93OiBmdW5jdGlvbihwYXJl bnRFbGVtZW50KQogICAgIHsKICAgICAgICAgdGhpcy5fdmlzaWJsZSA9IHRydWU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2V4dGVybnMuanMKaW5kZXggY2MzNTkxNGRl YTE5NDYxOTM5ODM5NGQwMjNiNmMwMDVjYjMwZTlhZC4uMzQ3ZjFlODE3M2M4YmYxMDkwODdhYTI5 ZDFhMDVjOTdlY2E0MDFhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9leHRlcm5zLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvZXh0ZXJucy5qcwpAQCAtNjksMyArNjksNSBAQCBKU09OLnBhcnNlID0gZnVuY3Rpb24oc3Ry KSB7fQogSlNPTi5zdHJpbmdpZnkgPSBmdW5jdGlvbihzdHIpIHt9CiAKIEVsZW1lbnQucHJvdG90 eXBlLnNjcm9sbEludG9WaWV3SWZOZWVkZWQgPSBmdW5jdGlvbigpIHt9CisKK0FycmF5LnByb3Rv dHlwZS5yZW1vdmUgPSBmdW5jdGlvbihvYmopIHt9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZ2VuZXJhdGUtcHJvdG9jb2wtZXh0ZXJucyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9nZW5lcmF0ZS1wcm90b2NvbC1leHRlcm5zCmluZGV4IGQ3NWEzYWY0MWMwY2RmOGVk ZDBhNzYyOTZiZWIyMDExMjgwNDNmYmQuLjg0NjYyOTgzNTIzMDA0ODkyYTg2OTE2Y2EyMDdlNDdm NWE1YmRhYzMgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9nZW5lcmF0ZS1w cm90b2NvbC1leHRlcm5zCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9nZW5lcmF0ZS1w cm90b2NvbC1leHRlcm5zCkBAIC00Nyw2ICs0Nyw3IEBAIGpzb25fYXBpID0gZXZhbChqc29uX3N0 cmluZylbImRvbWFpbnMiXQogb3V0cHV0X2ZpbGUgPSBvcGVuKG91dHB1dF9wYXRoLCAidyIpCiAK IHR5cGVfdHJhaXRzID0geworICAgICJhbnkiOiAiKiIsCiAgICAgInN0cmluZyI6ICJzdHJpbmci LAogICAgICJpbnRlZ2VyIjogIm51bWJlciIsCiAgICAgIm51bWJlciI6ICJudW1iZXIiLApAQCAt NjUsMTIgKzY2LDE1IEBAIGRlZiBmdWxsX3F1YWxpZmllZF90eXBlX2lkKGRvbWFpbl9uYW1lLCB0 eXBlX2lkKToKIAogZGVmIHBhcmFtX3R5cGUoZG9tYWluX25hbWUsIHBhcmFtKToKICAgICBpZiAi dHlwZSIgaW4gcGFyYW06Ci0gICAgICAgIHJldHVybiB0eXBlX3RyYWl0c1twYXJhbVsidHlwZSJd XQorICAgICAgICBpZiBwYXJhbVsidHlwZSJdID09ICJhcnJheSI6CisgICAgICAgICAgICBpdGVt cyA9IHBhcmFtWyJpdGVtcyJdCisgICAgICAgICAgICByZXR1cm4gIkFycmF5Ljwlcz4iICUgcGFy YW1fdHlwZShkb21haW5fbmFtZSwgaXRlbXMpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBy ZXR1cm4gdHlwZV90cmFpdHNbcGFyYW1bInR5cGUiXV0KICAgICBpZiAiJHJlZiIgaW4gcGFyYW06 CiAgICAgICAgIHR5cGVfaWQgPSBmdWxsX3F1YWxpZmllZF90eXBlX2lkKGRvbWFpbl9uYW1lLCBw YXJhbVsiJHJlZiJdKQogICAgICAgICBpZiB0eXBlX2lkIGluIHJlZl90eXBlczoKLSAgICAgICAg ICAgIHJlZl90eXBlID0gcmVmX3R5cGVzW3R5cGVfaWRdCi0gICAgICAgICAgICByZXR1cm4gdHlw ZV90cmFpdHNbcmVmX3R5cGVbInR5cGUiXV0KKyAgICAgICAgICAgIHJldHVybiByZWZfdHlwZXNb dHlwZV9pZF0KICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHByaW50ICJUeXBlIG5vdCBmb3Vu ZDogIiArIHR5cGVfaWQKICAgICAgICAgICAgIHJldHVybiAiISEgVHlwZSBub3QgZm91bmQ6ICIg KyB0eXBlX2lkCkBAIC04MCwxMSArODQsMjcgQEAgZm9yIGRvbWFpbiBpbiBqc29uX2FwaToKICAg ICBpZiAidHlwZXMiIGluIGRvbWFpbjoKICAgICAgICAgZm9yIHR5cGUgaW4gZG9tYWluWyJ0eXBl cyJdOgogICAgICAgICAgICAgdHlwZV9pZCA9IGZ1bGxfcXVhbGlmaWVkX3R5cGVfaWQoZG9tYWlu X25hbWUsIHR5cGVbImlkIl0pCi0gICAgICAgICAgICByZWZfdHlwZXNbdHlwZV9pZF0gPSB0eXBl OworICAgICAgICAgICAgcmVmX3R5cGVzW3R5cGVfaWRdID0gIiVzQWdlbnQuJXMiICUgKGRvbWFp bl9uYW1lLCB0eXBlWyJpZCJdKQogCiBmb3IgZG9tYWluIGluIGpzb25fYXBpOgogICAgIGRvbWFp bl9uYW1lID0gZG9tYWluWyJkb21haW4iXQogICAgIG91dHB1dF9maWxlLndyaXRlKCJcblxuXG52 YXIgJXNBZ2VudCA9IHt9O1xuIiAlIGRvbWFpbl9uYW1lKQorICAgIGlmICJ0eXBlcyIgaW4gZG9t YWluOgorICAgICAgICBmb3IgdHlwZSBpbiBkb21haW5bInR5cGVzIl06CisgICAgICAgICAgICBp ZiB0eXBlWyJ0eXBlIl0gPT0gIm9iamVjdCI6CisgICAgICAgICAgICAgICAgb3V0cHV0X2ZpbGUu d3JpdGUoIlxuLyoqIEBjb25zdHJ1Y3RvciAqL1xuIikKKyAgICAgICAgICAgICAgICBvdXRwdXRf ZmlsZS53cml0ZSgiJXNBZ2VudC4lcyA9IGZ1bmN0aW9uKClcbntcbiIgJSAoZG9tYWluX25hbWUs IHR5cGVbImlkIl0pKQorICAgICAgICAgICAgICAgIGlmICJwcm9wZXJ0aWVzIiBpbiB0eXBlOgor ICAgICAgICAgICAgICAgICAgICBmb3IgcHJvcGVydHkgaW4gdHlwZVsicHJvcGVydGllcyJdOgor ICAgICAgICAgICAgICAgICAgICAgICAgc3VmZml4ID0gIiIKKyAgICAgICAgICAgICAgICAgICAg ICAgIGlmICgib3B0aW9uYWwiIGluIHByb3BlcnR5KToKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzdWZmaXggPSAifHVuZGVmaW5lZCIKKyAgICAgICAgICAgICAgICAgICAgICAgIG91dHB1 dF9maWxlLndyaXRlKCIvKiogQHR5cGUgeyVzJXN9ICovIHRoaXMuJXM7XG4iICUgKHBhcmFtX3R5 cGUoZG9tYWluX25hbWUsIHByb3BlcnR5KSwgc3VmZml4LCBwcm9wZXJ0eVsibmFtZSJdKSkKKyAg ICAgICAgICAgICAgICBvdXRwdXRfZmlsZS53cml0ZSgifVxuIikKKyAgICAgICAgICAgIGVsc2U6 CisgICAgICAgICAgICAgICAgb3V0cHV0X2ZpbGUud3JpdGUoIlxuLyoqIEB0eXBlZGVmIHslc30g Ki9cbiVzQWdlbnQuJXM7XG4iICUgKHR5cGVfdHJhaXRzW3R5cGVbInR5cGUiXV0sIGRvbWFpbl9u YW1lLCB0eXBlWyJpZCJdKSkKKyAgICAgICAgICAgICAgICAKKwogICAgIGlmICJjb21tYW5kcyIg aW4gZG9tYWluOgogICAgICAgICBmb3IgY29tbWFuZCBpbiBkb21haW5bImNvbW1hbmRzIl06CiAg ICAgICAgICAgICBvdXRwdXRfZmlsZS53cml0ZSgiXG4vKipcbiIpCg==