118191 2013-06-28 07:31:12 -0700 Get rid of IsWorkerGlobalScope and ExtendsDOMGlobalObject extended attributes 2013-11-20 03:01:38 -0800 1 1 1 Unclassified WebKit Bindings 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez commit-queue darin esprehn+autocc haraken laszlo.gombos rniwa oldest_to_newest 904615 0 cdumez 2013-06-28 07:31:12 -0700 We should not need to specify the [IsWorkerGlobalScope] and [ExtendsDOMGlobalObject] extended attributes. The bindings generator should be smart enough to figure this out on its own. 904618 1 205713 cdumez 2013-06-28 07:35:41 -0700 Created attachment 205713 Patch 904619 2 205713 haraken 2013-06-28 07:39:36 -0700 Comment on attachment 205713 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205713&action=review Looks like good refactoring. > Source/WebCore/workers/WorkerGlobalScope.idl:31 > JSCustomGetOwnPropertySlotAndDescriptor, BTW, now JSC is the only engine in WebKIt, it wouldn't make sense to prefix JSC-specific IDL attributes with "JS". 904652 3 205713 commit-queue 2013-06-28 09:02:09 -0700 Comment on attachment 205713 Patch Clearing flags on attachment: 205713 Committed r152168: <http://trac.webkit.org/changeset/152168> 904653 4 commit-queue 2013-06-28 09:02:13 -0700 All reviewed patches have been landed. Closing bug. 952518 5 zan 2013-11-20 03:01:38 -0800 *** Bug 77966 has been marked as a duplicate of this bug. *** 205713 2013-06-28 07:35:41 -0700 2013-06-28 09:02:09 -0700 Patch bug-118191-20130628173340.patch text/plain 13043 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyMTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjc0OGJmMWM0MDY2NDM2 YzhmZjU2YjY4MjE3NTI4MWY4NmYzYjQxMi4uMmY2MzhiODVkZjIzMTU1ZTM1ZDdiOGE2ZDg3MWRj NGE4MmM1NTIxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEzLTA2LTI4ICBDaHJp c3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1zdW5nLmNvbT4KKworICAgICAgICBHZXQg cmlkIG9mIElzV29ya2VyR2xvYmFsU2NvcGUgYW5kIEV4dGVuZHNET01HbG9iYWxPYmplY3QgZXh0 ZW5kZWQgYXR0cmlidXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE4MTkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmVtb3ZlIFdlYktpdC1zcGVjaWZpYyBbSXNXb3JrZXJHbG9iYWxTY29wZV0gYW5k IFtFeHRlbmRzRE9NR2xvYmFsT2JqZWN0XSBJREwKKyAgICAgICAgZXh0ZW5kZWQgYXR0cmlidXRl cyBhbmQgdXBkYXRlIHRoZSBKU0MgYmluZGluZ3MgZ2VuZXJhdG9yIHRvIGZpZ3VyZSB0aGlzIG91 dAorICAgICAgICBvbiBpdHMgb3duLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gYmVoYXZp b3IgY2hhbmdlLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG06CisgICAgICAgIChJc0RPTUdsb2JhbE9iamVjdCk6CisgICAgICAgIChHZW5lcmF0ZUhlYWRl cik6CisgICAgICAgIChHZW5lcmF0ZUltcGxlbWVudGF0aW9uKToKKyAgICAgICAgKEdlbmVyYXRl Q29uc3RydWN0b3JIZWxwZXJNZXRob2RzKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lE TEF0dHJpYnV0ZXMudHh0OgorICAgICAgICAqIHBhZ2UvRE9NV2luZG93LmlkbDoKKyAgICAgICAg KiB3b3JrZXJzL0RlZGljYXRlZFdvcmtlckdsb2JhbFNjb3BlLmlkbDoKKyAgICAgICAgKiB3b3Jr ZXJzL1NoYXJlZFdvcmtlckdsb2JhbFNjb3BlLmlkbDoKKyAgICAgICAgKiB3b3JrZXJzL1dvcmtl ckdsb2JhbFNjb3BlLmlkbDoKKwogMjAxMy0wNi0yOCAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcu a2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIEFkZCBuZXcgc2NoZW1lcyB0byBjb250ZW50IHV0 aWxzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2Vu ZXJhdG9ySlMucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JKUy5wbQppbmRleCA0OGYwMDIxNjQ1ZTRjOGZhMzJhMDZkMmVlM2E2YzdlNWNmMDcwNDY4Li5l MGNmMmMwYmQ5OGMwNzc5NzYwZWY2OTAwODI1N2Q4ZDA5ODNkMWI1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQpAQCAtMzQ3LDYg KzM0NywxMiBAQCBzdWIgR2V0Q3VzdG9tSXNSZWFjaGFibGUKICAgICByZXR1cm4gJGludGVyZmFj ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3RvbUlzUmVhY2hhYmxlIn07CiB9CiAKK3N1YiBJ c0RPTUdsb2JhbE9iamVjdAoreworICAgIG15ICRpbnRlcmZhY2UgPSBzaGlmdDsKKyAgICByZXR1 cm4gJGludGVyZmFjZS0+bmFtZSBlcSAiRE9NV2luZG93IiB8fCAkY29kZUdlbmVyYXRvci0+SW5o ZXJpdHNJbnRlcmZhY2UoJGludGVyZmFjZSwgIldvcmtlckdsb2JhbFNjb3BlIik7Cit9CisKIHN1 YiBHZW5lcmF0ZUdldE93blByb3BlcnR5U2xvdEJvZHkKIHsKICAgICBteSAoJGludGVyZmFjZSwg JGludGVyZmFjZU5hbWUsICRjbGFzc05hbWUsICRoYXNBdHRyaWJ1dGVzLCAkaW5saW5lZCkgPSBA XzsKQEAgLTcyMyw3ICs3MjksNyBAQCBzdWIgR2VuZXJhdGVIZWFkZXIKICAgICAgICAgJGhlYWRl ckluY2x1ZGVzeyIkaW50ZXJmYWNlTmFtZS5oIn0gPSAxOwogICAgIH0gZWxzZSB7CiAgICAgICAg ICMgSW1wbGVtZW50YXRpb24gY2xhc3MgZm9yd2FyZCBkZWNsYXJhdGlvbgotICAgICAgICBpZiAo JGludGVyZmFjZU5hbWUgZXEgIkRPTVdpbmRvdyIgfHwgJGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IklzV29ya2VyR2xvYmFsU2NvcGUifSkgeworICAgICAgICBpZiAoSXNET01HbG9i YWxPYmplY3QoJGludGVyZmFjZSkpIHsKICAgICAgICAgICAgIEFkZENsYXNzRm9yd2FyZElmTmVl ZGVkKCRpbnRlcmZhY2VOYW1lKSB1bmxlc3MgJHN2Z1Byb3BlcnR5T3JMaXN0UHJvcGVydHlUeXBl OwogICAgICAgICB9CiAgICAgfQpAQCAtNzQ1LDcgKzc1MSw3IEBAIHN1YiBHZW5lcmF0ZUhlYWRl cgogICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgICAgICB2bS5oZWFwLmFkZEZpbmFs aXplcihwdHIsIGRlc3Ryb3kpO1xuIik7CiAgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIg ICAgICAgIHJldHVybiBwdHI7XG4iKTsKICAgICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAg ICB9XG5cbiIpOwotICAgIH0gZWxzaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+ eyJJc1dvcmtlckdsb2JhbFNjb3BlIn0pIHsKKyAgICB9IGVsc2lmICgkY29kZUdlbmVyYXRvci0+ SW5oZXJpdHNJbnRlcmZhY2UoJGludGVyZmFjZSwgIldvcmtlckdsb2JhbFNjb3BlIikpIHsKICAg ICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAgICBzdGF0aWMgJGNsYXNzTmFtZSogY3JlYXRl KEpTQzo6Vk0mIHZtLCBKU0M6OlN0cnVjdHVyZSogc3RydWN0dXJlLCBQYXNzUmVmUHRyPCRpbXBs VHlwZT4gaW1wbClcbiIpOwogICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgIHtcbiIp OwogICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgICAgICAkY2xhc3NOYW1lKiBwdHIg PSBuZXcgKE5vdE51bGwsIEpTQzo6YWxsb2NhdGVDZWxsPCRjbGFzc05hbWU+KHZtLmhlYXApKSAk e2NsYXNzTmFtZX0odm0sIHN0cnVjdHVyZSwgaW1wbCk7XG4iKTsKQEAgLTc3MiwxMiArNzc4LDEy IEBAIHN1YiBHZW5lcmF0ZUhlYWRlcgogICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAg IH1cblxuIik7CiAgICAgfQogCi0gICAgaWYgKCRpbnRlcmZhY2VOYW1lIGVxICJET01XaW5kb3ci IHx8ICRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJc1dvcmtlckdsb2JhbFNjb3Bl In0pIHsKKyAgICBpZiAoSXNET01HbG9iYWxPYmplY3QoJGludGVyZmFjZSkpIHsKICAgICAgICAg cHVzaChAaGVhZGVyQ29udGVudCwgIiAgICBzdGF0aWMgY29uc3QgYm9vbCBuZWVkc0Rlc3RydWN0 aW9uID0gZmFsc2U7XG5cbiIpOwogICAgIH0KIAogICAgICMgUHJvdG90eXBlCi0gICAgcHVzaChA aGVhZGVyQ29udGVudCwgIiAgICBzdGF0aWMgSlNDOjpKU09iamVjdCogY3JlYXRlUHJvdG90eXBl KEpTQzo6RXhlY1N0YXRlKiwgSlNDOjpKU0dsb2JhbE9iamVjdCopO1xuIikgdW5sZXNzICgkaW50 ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiRXh0ZW5kc0RPTUdsb2JhbE9iamVjdCJ9KTsK KyAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgIHN0YXRpYyBKU0M6OkpTT2JqZWN0KiBjcmVh dGVQcm90b3R5cGUoSlNDOjpFeGVjU3RhdGUqLCBKU0M6OkpTR2xvYmFsT2JqZWN0Kik7XG4iKSB1 bmxlc3MgSXNET01HbG9iYWxPYmplY3QoJGludGVyZmFjZSk7CiAKICAgICAkaGVhZGVyVHJhaWxp bmdJbmNsdWRlc3siJHtjbGFzc05hbWV9Q3VzdG9tLmgifSA9IDEgaWYgJGludGVyZmFjZS0+ZXh0 ZW5kZWRBdHRyaWJ1dGVzLT57IkpTQ3VzdG9tSGVhZGVyIn07CiAKQEAgLTg1MSw3ICs4NTcsNyBA QCBzdWIgR2VuZXJhdGVIZWFkZXIKICAgICB9CiAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAg ICBzdGF0aWMgSlNDOjpTdHJ1Y3R1cmUqIGNyZWF0ZVN0cnVjdHVyZShKU0M6OlZNJiB2bSwgSlND OjpKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU0M6OkpTVmFsdWUgcHJvdG90eXBlKVxu Iik7CiAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAgICB7XG4iKTsKLSAgICBpZiAoJGludGVy ZmFjZU5hbWUgZXEgIkRPTVdpbmRvdyIgfHwgJGludGVyZmFjZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVz LT57IklzV29ya2VyR2xvYmFsU2NvcGUifSkgeworICAgIGlmIChJc0RPTUdsb2JhbE9iamVjdCgk aW50ZXJmYWNlKSkgewogICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgICAgICByZXR1 cm4gSlNDOjpTdHJ1Y3R1cmU6OmNyZWF0ZSh2bSwgZ2xvYmFsT2JqZWN0LCBwcm90b3R5cGUsIEpT Qzo6VHlwZUluZm8oSlNDOjpHbG9iYWxPYmplY3RUeXBlLCBTdHJ1Y3R1cmVGbGFncyksICZzX2lu Zm8pO1xuIik7CiAgICAgfSBlbHNlIHsKICAgICAgICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAg ICAgICAgcmV0dXJuIEpTQzo6U3RydWN0dXJlOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCwgcHJv dG90eXBlLCBKU0M6OlR5cGVJbmZvKEpTQzo6T2JqZWN0VHlwZSwgU3RydWN0dXJlRmxhZ3MpLCAm c19pbmZvKTtcbiIpOwpAQCAtOTk1LDcgKzEwMDEsNyBAQCBzdWIgR2VuZXJhdGVIZWFkZXIKICAg ICAjIENvbnN0cnVjdG9yCiAgICAgaWYgKCRpbnRlcmZhY2VOYW1lIGVxICJET01XaW5kb3ciKSB7 CiAgICAgICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICIgICAgJGNsYXNzTmFtZShKU0M6OlZNJiwg SlNDOjpTdHJ1Y3R1cmUqLCBQYXNzUmVmUHRyPCRpbXBsVHlwZT4sIEpTRE9NV2luZG93U2hlbGwq KTtcbiIpOwotICAgIH0gZWxzaWYgKCRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJ c1dvcmtlckdsb2JhbFNjb3BlIn0pIHsKKyAgICB9IGVsc2lmICgkY29kZUdlbmVyYXRvci0+SW5o ZXJpdHNJbnRlcmZhY2UoJGludGVyZmFjZSwgIldvcmtlckdsb2JhbFNjb3BlIikpIHsKICAgICAg ICAgcHVzaChAaGVhZGVyQ29udGVudCwgIiAgICAkY2xhc3NOYW1lKEpTQzo6Vk0mLCBKU0M6OlN0 cnVjdHVyZSosIFBhc3NSZWZQdHI8JGltcGxUeXBlPik7XG4iKTsKICAgICB9IGVsc2UgewogICAg ICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgICRjbGFzc05hbWUoSlNDOjpTdHJ1Y3R1cmUq LCBKU0RPTUdsb2JhbE9iamVjdCosIFBhc3NSZWZQdHI8JGltcGxUeXBlPik7XG4iKTsKQEAgLTEw OTcsNyArMTEwMyw3IEBAIHN1YiBHZW5lcmF0ZUhlYWRlcgogICAgIHB1c2goQGhlYWRlckNvbnRl bnQsICJjbGFzcyAke2NsYXNzTmFtZX1Qcm90b3R5cGUgOiBwdWJsaWMgSlNDOjpKU05vbkZpbmFs T2JqZWN0IHtcbiIpOwogICAgIHB1c2goQGhlYWRlckNvbnRlbnQsICJwdWJsaWM6XG4iKTsKICAg ICBwdXNoKEBoZWFkZXJDb250ZW50LCAiICAgIHR5cGVkZWYgSlNDOjpKU05vbkZpbmFsT2JqZWN0 IEJhc2U7XG4iKTsKLSAgICBpZiAoJGludGVyZmFjZU5hbWUgbmUgIkRPTVdpbmRvdyIgJiYgISRp bnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJc1dvcmtlckdsb2JhbFNjb3BlIn0pIHsK KyAgICB1bmxlc3MgKElzRE9NR2xvYmFsT2JqZWN0KCRpbnRlcmZhY2UpKSB7CiAgICAgICAgIHB1 c2goQGhlYWRlckNvbnRlbnQsICIgICAgc3RhdGljIEpTQzo6SlNPYmplY3QqIHNlbGYoSlNDOjpF eGVjU3RhdGUqLCBKU0M6OkpTR2xvYmFsT2JqZWN0Kik7XG4iKTsKICAgICB9CiAKQEAgLTE3ODEs NyArMTc4Nyw3IEBAIHN1YiBHZW5lcmF0ZUltcGxlbWVudGF0aW9uCiAgICAgfSBlbHNlIHsKICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJjb25zdCBDbGFzc0luZm8gJHtjbGFzc05hbWV9UHJv dG90eXBlOjpzX2luZm8gPSB7IFwiJHt2aXNpYmxlSW50ZXJmYWNlTmFtZX1Qcm90b3R5cGVcIiwg JkJhc2U6OnNfaW5mbywgJiR7Y2xhc3NOYW1lfVByb3RvdHlwZVRhYmxlLCAwLCBDUkVBVEVfTUVU SE9EX1RBQkxFKCR7Y2xhc3NOYW1lfVByb3RvdHlwZSkgfTtcblxuIik7CiAgICAgfQotICAgIGlm ICgkaW50ZXJmYWNlTmFtZSBuZSAiRE9NV2luZG93IiAmJiAhJGludGVyZmFjZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IklzV29ya2VyR2xvYmFsU2NvcGUifSkgeworICAgIHVubGVzcyAoSXNET01H bG9iYWxPYmplY3QoJGludGVyZmFjZSkpIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJK U09iamVjdCogJHtjbGFzc05hbWV9UHJvdG90eXBlOjpzZWxmKEV4ZWNTdGF0ZSogZXhlYywgSlNH bG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdClcbiIpOwogICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgIntcbiIpOwogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gZ2V0RE9N UHJvdG90eXBlPCR7Y2xhc3NOYW1lfT4oZXhlYywgZ2xvYmFsT2JqZWN0KTtcbiIpOwpAQCAtMTg2 Nyw3ICsxODczLDcgQEAgc3ViIEdlbmVyYXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgcHVzaChA aW1wbENvbnRlbnQsICIgICAgOiAkcGFyZW50Q2xhc3NOYW1lKHZtLCBzdHJ1Y3R1cmUsIGltcGws IHNoZWxsKVxuIik7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAie1xuIik7CiAgICAgICAg IHB1c2goQGltcGxDb250ZW50LCAifVxuXG4iKTsKLSAgICB9IGVsc2lmICgkaW50ZXJmYWNlLT5l eHRlbmRlZEF0dHJpYnV0ZXMtPnsiSXNXb3JrZXJHbG9iYWxTY29wZSJ9KSB7CisgICAgfSBlbHNp ZiAoJGNvZGVHZW5lcmF0b3ItPkluaGVyaXRzSW50ZXJmYWNlKCRpbnRlcmZhY2UsICJXb3JrZXJH bG9iYWxTY29wZSIpKSB7CiAgICAgICAgIEFkZEluY2x1ZGVzRm9yVHlwZUluSW1wbCgkaW50ZXJm YWNlTmFtZSk7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiJHtjbGFzc05hbWV9OjokY2xh c3NOYW1lKFZNJiB2bSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUsIFBhc3NSZWZQdHI8JGltcGxUeXBl PiBpbXBsKVxuIik7CiAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIDogJHBhcmVudENs YXNzTmFtZSh2bSwgc3RydWN0dXJlLCBpbXBsKVxuIik7CkBAIC0xODk3LDcgKzE5MDMsNyBAQCBz dWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIn1c blxuIik7CiAgICAgfQogCi0gICAgaWYgKCEkaW50ZXJmYWNlLT5leHRlbmRlZEF0dHJpYnV0ZXMt PnsiRXh0ZW5kc0RPTUdsb2JhbE9iamVjdCJ9KSB7CisgICAgdW5sZXNzIChJc0RPTUdsb2JhbE9i amVjdCgkaW50ZXJmYWNlKSkgewogICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIkpTT2JqZWN0 KiAke2NsYXNzTmFtZX06OmNyZWF0ZVByb3RvdHlwZShFeGVjU3RhdGUqIGV4ZWMsIEpTR2xvYmFs T2JqZWN0KiBnbG9iYWxPYmplY3QpXG4iKTsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJ7 XG4iKTsKICAgICAgICAgaWYgKCRoYXNQYXJlbnQgJiYgJHBhcmVudENsYXNzTmFtZSBuZSAiSlND OjpET01Ob2RlRmlsdGVyIikgewpAQCAtMjA3MCw3ICsyMDc2LDcgQEAgc3ViIEdlbmVyYXRlSW1w bGVtZW50YXRpb24KICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAg JGludGVyZmFjZU5hbWUqIGltcGwgPSBzdGF0aWNfY2FzdDwkaW50ZXJmYWNlTmFtZSo+KGNhc3Rl ZFRoaXMtPmltcGwoKSk7XG4iKTsKICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICIgICAgaWYgKEV2ZW50TGlzdGVuZXIqIGxpc3RlbmVyID0gaW1wbC0+JGltcGxHZXR0ZXJG dW5jdGlvbk5hbWUoKSkge1xuIik7CiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgICAgICBpZiAoY29uc3QgSlNFdmVudExpc3RlbmVyKiBqc0xpc3RlbmVyID0gSlNF dmVudExpc3RlbmVyOjpjYXN0KGxpc3RlbmVyKSkge1xuIik7Ci0gICAgICAgICAgICAgICAgICAg IGlmICgkaW50ZXJmYWNlTmFtZSBlcSAiRG9jdW1lbnQiIHx8ICRpbnRlcmZhY2VOYW1lIGVxICJX b3JrZXJHbG9iYWxTY29wZSIgfHwgJGludGVyZmFjZU5hbWUgZXEgIlNoYXJlZFdvcmtlckdsb2Jh bFNjb3BlIiB8fCAkaW50ZXJmYWNlTmFtZSBlcSAiRGVkaWNhdGVkV29ya2VyR2xvYmFsU2NvcGUi KSB7CisgICAgICAgICAgICAgICAgICAgIGlmICgkaW50ZXJmYWNlTmFtZSBlcSAiRG9jdW1lbnQi IHx8ICRjb2RlR2VuZXJhdG9yLT5Jbmhlcml0c0ludGVyZmFjZSgkaW50ZXJmYWNlLCAiV29ya2Vy R2xvYmFsU2NvcGUiKSkgewogICAgICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICIgICAgICAgICAgICBpZiAoSlNPYmplY3QqIGpzRnVuY3Rpb24gPSBqc0xpc3RlbmVyLT5q c0Z1bmN0aW9uKGltcGwpKVxuIik7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgICAgIGlmIChK U09iamVjdCoganNGdW5jdGlvbiA9IGpzTGlzdGVuZXItPmpzRnVuY3Rpb24oaW1wbC0+c2NyaXB0 RXhlY3V0aW9uQ29udGV4dCgpKSlcbiIpOwpAQCAtMjUyMSw3ICsyNTI3LDcgQEAgc3ViIEdlbmVy YXRlSW1wbGVtZW50YXRpb24KICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgJGNsYXNzTmFtZSogY2FzdGVkVGhpcyA9IHRvSlNET01XaW5kb3coZXhlYy0+aG9zdFRo aXNWYWx1ZSgpLnRvVGhpc09iamVjdChleGVjKSk7XG4iKTsKICAgICAgICAgICAgICAgICAgICAg cHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKCFjYXN0ZWRUaGlzKVxuIik7CiAgICAgICAgICAg ICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICByZXR1cm4gdGhyb3dWTVR5cGVF cnJvcihleGVjKTtcbiIpOwotICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRpbnRlcmZhY2UtPmV4 dGVuZGVkQXR0cmlidXRlcy0+eyJJc1dvcmtlckdsb2JhbFNjb3BlIn0pIHsKKyAgICAgICAgICAg ICAgICB9IGVsc2lmICgkY29kZUdlbmVyYXRvci0+SW5oZXJpdHNJbnRlcmZhY2UoJGludGVyZmFj ZSwgIldvcmtlckdsb2JhbFNjb3BlIikpIHsKICAgICAgICAgICAgICAgICAgICAgcHVzaChAaW1w bENvbnRlbnQsICIgICAgJGNsYXNzTmFtZSogY2FzdGVkVGhpcyA9IHRvJHtjbGFzc05hbWV9KGV4 ZWMtPmhvc3RUaGlzVmFsdWUoKS50b1RoaXNPYmplY3QoZXhlYykpO1xuIik7CiAgICAgICAgICAg ICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIGlmICghY2FzdGVkVGhpcylcbiIpOwog ICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJuIHRo cm93Vk1UeXBlRXJyb3IoZXhlYyk7XG4iKTsKQEAgLTQzMDQsNyArNDMxMCw3IEBAIHN1YiBHZW5l cmF0ZUNvbnN0cnVjdG9ySGVscGVyTWV0aG9kcwogCiAgICAgcHVzaChAJG91dHB1dEFycmF5LCAi dm9pZCAke2NvbnN0cnVjdG9yQ2xhc3NOYW1lfTo6ZmluaXNoQ3JlYXRpb24oRXhlY1N0YXRlKiBl eGVjLCBKU0RPTUdsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KVxuIik7CiAgICAgcHVzaChAJG91 dHB1dEFycmF5LCAie1xuIik7Ci0gICAgaWYgKCRpbnRlcmZhY2VOYW1lIGVxICJET01XaW5kb3ci IHx8ICRpbnRlcmZhY2UtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJJc1dvcmtlckdsb2JhbFNjb3Bl In0pIHsKKyAgICBpZiAoSXNET01HbG9iYWxPYmplY3QoJGludGVyZmFjZSkpIHsKICAgICAgICAg cHVzaChAJG91dHB1dEFycmF5LCAiICAgIEJhc2U6OmZpbmlzaENyZWF0aW9uKGV4ZWMtPnZtKCkp O1xuIik7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBBU1NFUlQoaW5oZXJpdHMo JnNfaW5mbykpO1xuIik7CiAgICAgICAgIHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICBwdXREaXJl Y3QoZXhlYy0+dm0oKSwgZXhlYy0+cHJvcGVydHlOYW1lcygpLnByb3RvdHlwZSwgZ2xvYmFsT2Jq ZWN0LT5wcm90b3R5cGUoKSwgRG9udERlbGV0ZSB8IFJlYWRPbmx5KTtcbiIpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExBdHRyaWJ1dGVzLnR4dCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMQXR0cmlidXRlcy50eHQKaW5kZXggZmVl NTVkM2U4ZTdiZTU0YmFhYzZlYmUyZDU0ZGQ1MzIxNzcwZTgyNC4uNTNiMzEwMzg2MjNkOTlhZTA5 MTZkYTA0ZGRkMjk3MmExMDNhYmQzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9JRExBdHRyaWJ1dGVzLnR4dAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0lETEF0dHJpYnV0ZXMudHh0CkBAIC01Nyw3ICs1Nyw2IEBAIEVuYWJsZWRBdFJ1 bnRpbWU9KgogRW5hYmxlZEJ5U2V0dGluZz0qCiBFbmZvcmNlUmFuZ2UKIEV2ZW50VGFyZ2V0Ci1F eHRlbmRzRE9NR2xvYmFsT2JqZWN0CiBHZW5lcmF0ZUlzUmVhY2hhYmxlPXxJbXBsfEltcGxDb250 ZXh0fEltcGxEb2N1bWVudHxJbXBsRWxlbWVudFJvb3R8SW1wbEZyYW1lfEltcGxPd25lck5vZGVS b290CiBHZXR0ZXJSYWlzZXNFeGNlcHRpb24KIEdsb2JhbENvbnRleHQ9RE9NV2luZG93fFdvcmtl ckdsb2JhbFNjb3BlfFNoYXJlZFdvcmtlckdsb2JhbFNjb3BlfERlZGljYXRlZFdvcmtlckdsb2Jh bFNjb3BlCkBAIC02OCw3ICs2Nyw2IEBAIEltcGxlbWVudGVkQXM9KgogSW5pdGlhbGl6ZWRCeUV2 ZW50Q29uc3RydWN0b3IKIEludGVyZmFjZU5hbWU9KgogSXNJbmRleAotSXNXb3JrZXJHbG9iYWxT Y29wZQogSlNDdXN0b21EZWZpbmVPd25Qcm9wZXJ0eQogSlNDdXN0b21EZWZpbmVPd25Qcm9wZXJ0 eU9uUHJvdG90eXBlCiBKU0N1c3RvbUZpbmFsaXplCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0RPTVdpbmRvdy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwK aW5kZXggOGMzMzMxMWEzNWMwODQyODZlZjJmZmJjNzRmMTk1NzVjNDk5YmI2My4uNTFiOTI1NjZm NGUxMDhlYTBjMTI4Nzc2NWUzNDYxZjFhZWE5YTIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9ET01XaW5kb3cuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93 LmlkbApAQCAtMzQsNyArMzQsNiBAQAogICAgIEpTQ3VzdG9tVG9OYXRpdmVPYmplY3QsCiAgICAg Q3VzdG9tUHV0RnVuY3Rpb24sCiAgICAgRXZlbnRUYXJnZXQsCi0gICAgRXh0ZW5kc0RPTUdsb2Jh bE9iamVjdCwKICAgICBKU0dlbmVyYXRlVG9OYXRpdmVPYmplY3QsCiAgICAgUmVwbGFjZWFibGVD b25zdHJ1Y3RvciwKICAgICBKU0xlZ2FjeVBhcmVudD1KU0RPTVdpbmRvd0Jhc2UsCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL0RlZGljYXRlZFdvcmtlckdsb2JhbFNjb3BlLmlk bCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvRGVkaWNhdGVkV29ya2VyR2xvYmFsU2NvcGUuaWRs CmluZGV4IDcyY2VmODhmOTJmOTA1YWFmYmI0OTJjY2MyNjQyNDhjY2Q4MTc4ZTcuLjRiOWM2YWU3 YzY5NWJkMjY1OTQ0MTgxMjlmNWIzZjc5MTVhMTExZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvRGVkaWNhdGVkV29ya2VyR2xvYmFsU2NvcGUuaWRsCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3dvcmtlcnMvRGVkaWNhdGVkV29ya2VyR2xvYmFsU2NvcGUuaWRsCkBAIC0zMSw4ICsz MSw2IEBACiBbCiAgICAgR2xvYmFsQ29udGV4dD1EZWRpY2F0ZWRXb3JrZXJHbG9iYWxTY29wZSwK ICAgICBDb25kaXRpb25hbD1XT1JLRVJTLAotICAgIEV4dGVuZHNET01HbG9iYWxPYmplY3QsCi0g ICAgSXNXb3JrZXJHbG9iYWxTY29wZSwKICAgICBKU0dlbmVyYXRlVG9OYXRpdmVPYmplY3QsCiAg ICAgSlNOb1N0YXRpY1RhYmxlcywKIF0gaW50ZXJmYWNlIERlZGljYXRlZFdvcmtlckdsb2JhbFNj b3BlIDogV29ya2VyR2xvYmFsU2NvcGUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29y a2Vycy9TaGFyZWRXb3JrZXJHbG9iYWxTY29wZS5pZGwgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJz L1NoYXJlZFdvcmtlckdsb2JhbFNjb3BlLmlkbAppbmRleCA4Yjg5YmJjZWI4YjFiMjI4Yzk0NzYy NzE0M2MwNDkzNjljYmI1ODkxLi4yYTE3YzRmYTc1ZTJmNGY2NDBjODg5YjI5YTMyMzdkZDMxYmIx ZTQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1NoYXJlZFdvcmtlckdsb2Jh bFNjb3BlLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1NoYXJlZFdvcmtlckdsb2Jh bFNjb3BlLmlkbApAQCAtMzEsOCArMzEsNiBAQAogWwogICAgIEdsb2JhbENvbnRleHQ9U2hhcmVk V29ya2VyR2xvYmFsU2NvcGUsCiAgICAgQ29uZGl0aW9uYWw9U0hBUkVEX1dPUktFUlMsCi0gICAg RXh0ZW5kc0RPTUdsb2JhbE9iamVjdCwKLSAgICBJc1dvcmtlckdsb2JhbFNjb3BlLAogICAgIEpT R2VuZXJhdGVUb05hdGl2ZU9iamVjdCwKICAgICBKU05vU3RhdGljVGFibGVzLAogXSBpbnRlcmZh Y2UgU2hhcmVkV29ya2VyR2xvYmFsU2NvcGUgOiBXb3JrZXJHbG9iYWxTY29wZSB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmlkbCBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyR2xvYmFsU2NvcGUuaWRsCmluZGV4IDc5MTgyMDFlMmFk NDNkNjZlZjFkYzZhYjU3NWQ1OWJhMjlhMWM5MTQuLmU1OWI3YjA5YWEyMjM3ODcwYWUwYTg0MGFk OTY1ZWI5NGZlNzkyZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2Vy R2xvYmFsU2NvcGUuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VyR2xvYmFs U2NvcGUuaWRsCkBAIC0zMCw4ICszMCw2IEBACiAgICAgSlNDdXN0b21NYXJrRnVuY3Rpb24sCiAg ICAgSlNDdXN0b21HZXRPd25Qcm9wZXJ0eVNsb3RBbmREZXNjcmlwdG9yLAogICAgIEV2ZW50VGFy Z2V0LAotICAgIEV4dGVuZHNET01HbG9iYWxPYmplY3QsCi0gICAgSXNXb3JrZXJHbG9iYWxTY29w ZSwKICAgICBKU0xlZ2FjeVBhcmVudD1KU1dvcmtlckdsb2JhbFNjb3BlQmFzZSwKICAgICBKU05v U3RhdGljVGFibGVzLAogXSBpbnRlcmZhY2UgV29ya2VyR2xvYmFsU2NvcGUgewo=