70100 2011-10-14 05:12:41 -0700 Merge StyleList into StyleSheet. 2011-10-14 05:47:12 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling dglazkov webkit.review.bot oldest_to_newest 483915 0 kling 2011-10-14 05:12:41 -0700 StyleSheet is the only subclass of StyleList. We should merge its functionality into StyleSheet. 483918 1 110996 kling 2011-10-14 05:16:28 -0700 Created attachment 110996 Proposed patch 483920 2 110996 koivisto 2011-10-14 05:19:26 -0700 Comment on attachment 110996 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=110996&action=review r=me > Source/WebCore/bindings/js/JSCSSRuleListCustom.cpp:-43 > - if (StyleList* styleList = jsCSSRuleList->impl()->styleList()) The variable should be renamed too. 483922 3 110996 koivisto 2011-10-14 05:20:46 -0700 Comment on attachment 110996 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=110996&action=review > Source/WebCore/bindings/js/JSCSSRuleListCustom.cpp:43 > - if (StyleList* styleList = jsCSSRuleList->impl()->styleList()) > + if (StyleSheet* styleList = jsCSSRuleList->impl()->styleSheet()) This variable 483923 4 110996 gyuyoung.kim 2011-10-14 05:21:53 -0700 Comment on attachment 110996 Proposed patch Attachment 110996 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/10062510 483924 5 110996 webkit.review.bot 2011-10-14 05:22:28 -0700 Comment on attachment 110996 Proposed patch Attachment 110996 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10066504 483925 6 110996 webkit-ews 2011-10-14 05:24:29 -0700 Comment on attachment 110996 Proposed patch Attachment 110996 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/10054520 483941 7 kling 2011-10-14 05:47:12 -0700 Committed r97460: <http://trac.webkit.org/changeset/97460> 110996 2011-10-14 05:16:28 -0700 2011-10-14 05:24:29 -0700 Proposed patch bug-70100.diff text/plain 18447 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYkNv cmUvQ01ha2VMaXN0cy50eHQKaW5kZXggYjk3NTgwYi4uNWFiMzRlZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0 cy50eHQKQEAgLTQ4MSw3ICs0ODEsNiBAQCBTRVQoV2ViQ29yZV9TT1VSQ0VTCiAgICAgY3NzL1Nl bGVjdG9yQ2hlY2tlci5jcHAKICAgICBjc3MvU2hhZG93VmFsdWUuY3BwCiAgICAgY3NzL1N0eWxl QmFzZS5jcHAKLSAgICBjc3MvU3R5bGVMaXN0LmNwcAogICAgIGNzcy9TdHlsZU1lZGlhLmNwcAog ICAgIGNzcy9TdHlsZVNoZWV0LmNwcAogICAgIGNzcy9TdHlsZVNoZWV0TGlzdC5jcHAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCAzMTk3OTkwLi5hNjE4OGNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIw MTEtMTAtMTQgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAgIE1l cmdlIFN0eWxlTGlzdCBpbnRvIFN0eWxlU2hlZXQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDEwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1lcmdlIGFsbCBmdW5jdGlvbmFsaXR5IGZyb20gU3R5bGVM aXN0IGludG8gU3R5bGVTaGVldCwKKyAgICAgICAgc2luY2UgU3R5bGVTaGVldCB3YXMgdGhlIG9u bHkgc3ViY2xhc3Mgb2YgU3R5bGVMaXN0IGFueXdheS4KKworICAgICAgICAqIENNYWtlTGlzdHMu dHh0OgorICAgICAgICAqIEdOVW1ha2VmaWxlLmxpc3QuYW06CisgICAgICAgICogV2ViQ29yZS5n eXBpOgorICAgICAgICAqIFdlYkNvcmUucHJvOgorICAgICAgICAqIFdlYkNvcmUudmNwcm9qL1dl YkNvcmUudmNwcm9qOgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv ajoKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0NTU1J1bGVMaXN0Q3VzdG9tLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkpTQ1NTUnVsZUxpc3RPd25lcjo6aXNSZWFjaGFibGVGcm9tT3BhcXVlUm9v dHMpOgorICAgICAgICAqIGNzcy9DU1NSdWxlTGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD U1NSdWxlTGlzdDo6Q1NTUnVsZUxpc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUnVsZUxpc3Q6 Omxlbmd0aCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NSdWxlTGlzdDo6aXRlbSk6CisgICAgICAg IChXZWJDb3JlOjpDU1NSdWxlTGlzdDo6ZGVsZXRlUnVsZSk6CisgICAgICAgIChXZWJDb3JlOjpD U1NSdWxlTGlzdDo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1J1bGVMaXN0OjppbnNl cnRSdWxlKToKKyAgICAgICAgKiBjc3MvQ1NTUnVsZUxpc3QuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkNTU1J1bGVMaXN0OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUnVsZUxpc3Q6OnN0 eWxlU2hlZXQpOgorICAgICAgICAqIGNzcy9TdHlsZUxpc3QuY3BwOiBSZW1vdmVkLgorICAgICAg ICAqIGNzcy9TdHlsZUxpc3QuaDogUmVtb3ZlZC4KKyAgICAgICAgKiBjc3MvU3R5bGVTaGVldC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVNoZWV0OjpTdHlsZVNoZWV0KToKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlU2hlZXQ6OmFwcGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVNo ZWV0OjppbnNlcnQpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTaGVldDo6cmVtb3ZlKToKKyAg ICAgICAgKiBjc3MvU3R5bGVTaGVldC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVTaGVldDo6 bGVuZ3RoKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlU2hlZXQ6Oml0ZW0pOgorCiAyMDExLTEw LTE0ICBNaWhuZWEgT3ZpZGVuaWUgIDxtaWhuZWFAYWRvYmUuY29tPgogCiAgICAgICAgIFtDU1Mg UmVnaW9uc10gQ2hhbmdlIC13ZWJraXQtZmxvdyB0byAtd2Via2l0LWZsb3ctaW50bwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUubGlzdC5hbSBiL1NvdXJjZS9XZWJDb3Jl L0dOVW1ha2VmaWxlLmxpc3QuYW0KaW5kZXggYzM4MzRlNC4uNmJlMmIxZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvR05VbWFrZWZpbGUubGlzdC5hbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9H TlVtYWtlZmlsZS5saXN0LmFtCkBAIC0xMDU3LDggKzEwNTcsNiBAQCB3ZWJjb3JlX3NvdXJjZXMg Kz0gXAogCVNvdXJjZS9XZWJDb3JlL2Nzcy9TaGFkb3dWYWx1ZS5oIFwKIAlTb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVCYXNlLmNwcCBcCiAJU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQmFzZS5oIFwK LQlTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVMaXN0LmNwcCBcCi0JU291cmNlL1dlYkNvcmUvY3Nz L1N0eWxlTGlzdC5oIFwKIAlTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVNZWRpYS5jcHAgXAogCVNv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZU1lZGlhLmggXAogCVNvdXJjZS9XZWJDb3JlL2Nzcy9TdHls ZVNoZWV0LmNwcCBcCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkgYi9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cGkKaW5kZXggNGY5Y2NiYi4uOTc5MTlkZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUuZ3lwaQpAQCAtMjQ0Miw4ICsyNDQyLDYgQEAKICAgICAgICAgICAgICdjc3MvU2hhZG93 VmFsdWUuY3BwJywKICAgICAgICAgICAgICdjc3MvU2hhZG93VmFsdWUuaCcsCiAgICAgICAgICAg ICAnY3NzL1N0eWxlQmFzZS5jcHAnLAotICAgICAgICAgICAgJ2Nzcy9TdHlsZUxpc3QuY3BwJywK LSAgICAgICAgICAgICdjc3MvU3R5bGVMaXN0LmgnLAogICAgICAgICAgICAgJ2Nzcy9TdHlsZU1l ZGlhLmNwcCcsCiAgICAgICAgICAgICAnY3NzL1N0eWxlTWVkaWEuaCcsCiAgICAgICAgICAgICAn Y3NzL1N0eWxlU2hlZXQuY3BwJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu cHJvIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8KaW5kZXggMmUzMGFjOS4uOWQ3NGZkOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcm8KKysrIGIvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5wcm8KQEAgLTQ0OCw3ICs0NDgsNiBAQCBTT1VSQ0VTICs9IFwKICAgICBjc3Mv U2VsZWN0b3JDaGVja2VyLmNwcCBcCiAgICAgY3NzL1NoYWRvd1ZhbHVlLmNwcCBcCiAgICAgY3Nz L1N0eWxlQmFzZS5jcHAgXAotICAgIGNzcy9TdHlsZUxpc3QuY3BwIFwKICAgICBjc3MvU3R5bGVN ZWRpYS5jcHAgXAogICAgIGNzcy9TdHlsZVNoZWV0LmNwcCBcCiAgICAgY3NzL1N0eWxlU2hlZXRM aXN0LmNwcCBcCkBAIC0xNDcwLDcgKzE0NjksNiBAQCBIRUFERVJTICs9IFwKICAgICBjc3MvU2Vs ZWN0b3JDaGVja2VyLmggXAogICAgIGNzcy9TaGFkb3dWYWx1ZS5oIFwKICAgICBjc3MvU3R5bGVC YXNlLmggXAotICAgIGNzcy9TdHlsZUxpc3QuaCBcCiAgICAgY3NzL1N0eWxlTWVkaWEuaCBcCiAg ICAgY3NzL1N0eWxlU2hlZXQuaCBcCiAgICAgY3NzL1N0eWxlU2hlZXRMaXN0LmggXApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2ogYi9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJvagppbmRleCBiZGQ3MzQ4Li45 N2MyMzVlIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3Jl LnZjcHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjcHJvai9XZWJDb3JlLnZjcHJv agpAQCAtMzM1NjYsMTQgKzMzNTY2LDYgQEAKIAkJCQk+CiAJCQk8L0ZpbGU+CiAJCQk8RmlsZQot CQkJCVJlbGF0aXZlUGF0aD0iLi5cY3NzXFN0eWxlTGlzdC5jcHAiCi0JCQkJPgotCQkJPC9GaWxl PgotCQkJPEZpbGUKLQkJCQlSZWxhdGl2ZVBhdGg9Ii4uXGNzc1xTdHlsZUxpc3QuaCIKLQkJCQk+ Ci0JCQk8L0ZpbGU+Ci0JCQk8RmlsZQogCQkJCVJlbGF0aXZlUGF0aD0iLi5cY3NzXFN0eWxlTWVk aWEuY3BwIgogCQkJCT4KIAkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA1MDQ2ODRjLi5mNTgxMThlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysr IGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0z NDk1LDExICszNDk1LDkgQEAKIAkJQTgwRTZERkMwQTE5OTA2NzAwN0ZCOEM1IC8qIENTU011dGFi bGVTdHlsZURlY2xhcmF0aW9uLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBBODBFNkRGQTBBMTk5MDY3MDA3RkI4QzUgLyogQ1NTTXV0YWJsZVN0eWxlRGVj bGFyYXRpb24uaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9 OwogCQlBODBFNkUwRjBBMTk5MTFDMDA3RkI4QzUgLyogQ1NTU3R5bGVEZWNsYXJhdGlvbi5oIGlu IEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTgwRTZFMEQwQTE5 OTExQzAwN0ZCOEM1IC8qIENTU1N0eWxlRGVjbGFyYXRpb24uaCAqLzsgc2V0dGluZ3MgPSB7QVRU UklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9OwogCQlBODBFNkUxMDBBMTk5MTFDMDA3RkI4QzUg LyogQ1NTU3R5bGVEZWNsYXJhdGlvbi5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSBBODBFNkUwRTBBMTk5MTFDMDA3RkI4QzUgLyogQ1NTU3R5bGVEZWNs YXJhdGlvbi5jcHAgKi87IH07Ci0JCUE4MEU3MzREMEExOTlDNzcwMDdGQjhDNSAvKiBTdHlsZUxp c3QuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTgw RTczNDYwQTE5OUM3NzAwN0ZCOEM1IC8qIFN0eWxlTGlzdC5jcHAgKi87IH07CiAJCUE4MEU3MzRF MEExOTlDNzcwMDdGQjhDNSAvKiBDU1NOYW1lc3BhY2UuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4MEU3MzQ3MEExOTlDNzcwMDdGQjhDNSAvKiBDU1NO YW1lc3BhY2UuaCAqLzsgfTsKIAkJQTgwRTczNEYwQTE5OUM3NzAwN0ZCOEM1IC8qIENTU1NlbGVj dG9yLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4 MEU3MzQ4MEExOTlDNzcwMDdGQjhDNSAvKiBDU1NTZWxlY3Rvci5jcHAgKi87IH07CiAJCUE4MEU3 MzUwMEExOTlDNzcwMDdGQjhDNSAvKiBTdHlsZUJhc2UuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4MEU3MzQ5MEExOTlDNzcwMDdGQjhDNSAvKiBTdHls ZUJhc2UuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9OyB9Owot CQlBODBFNzM1MTBBMTk5Qzc3MDA3RkI4QzUgLyogU3R5bGVMaXN0LmggaW4gSGVhZGVycyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBODBFNzM0QTBBMTk5Qzc3MDA3RkI4QzUg LyogU3R5bGVMaXN0LmggKi87IH07CiAJCUE4MEU3MzUyMEExOTlDNzcwMDdGQjhDNSAvKiBDU1NT ZWxlY3Rvci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g QTgwRTczNEIwQTE5OUM3NzAwN0ZCOEM1IC8qIENTU1NlbGVjdG9yLmggKi87IHNldHRpbmdzID0g e0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJQTgwRTczNTMwQTE5OUM3NzAwN0ZC OEM1IC8qIFN0eWxlQmFzZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSBBODBFNzM0QzBBMTk5Qzc3MDA3RkI4QzUgLyogU3R5bGVCYXNlLmNwcCAqLzsg fTsKIAkJQTgwRTdBMTcwQTE5QzNENjAwN0ZCOEM1IC8qIEpTSFRNTE1ldGFFbGVtZW50LmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4MEU3QTE1MEEx OUMzRDYwMDdGQjhDNSAvKiBKU0hUTUxNZXRhRWxlbWVudC5jcHAgKi87IH07CkBAIC0xMDY3Miwx MSArMTA2NzAsOSBAQAogCQlBODBFNkRGQTBBMTk5MDY3MDA3RkI4QzUgLyogQ1NTTXV0YWJsZVN0 eWxlRGVjbGFyYXRpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IENTU011 dGFibGVTdHlsZURlY2xhcmF0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE4 MEU2RTBEMEExOTkxMUMwMDdGQjhDNSAvKiBDU1NTdHlsZURlY2xhcmF0aW9uLmggKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBDU1NTdHlsZURlY2xhcmF0aW9uLmg7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE4MEU2RTBFMEExOTkxMUMwMDdGQjhDNSAvKiBDU1NTdHls ZURlY2xhcmF0aW9uLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSAzMDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBD U1NTdHlsZURlY2xhcmF0aW9uLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJQTgw RTczNDYwQTE5OUM3NzAwN0ZCOEM1IC8qIFN0eWxlTGlzdC5jcHAgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jcHAuY3BwOyBwYXRoID0gU3R5bGVMaXN0LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKIAkJQTgwRTczNDcwQTE5OUM3NzAwN0ZCOEM1IC8qIENTU05hbWVzcGFjZS5oICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDMwOyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQ1NTTmFtZXNwYWNlLmg7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCUE4MEU3MzQ4MEExOTlDNzcwMDdGQjhDNSAvKiBDU1NTZWxlY3Rv ci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxh c3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gQ1NTU2VsZWN0b3Iu Y3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBODBFNzM0OTBBMTk5Qzc3MDA3RkI4 QzUgLyogU3R5bGVCYXNlLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBTdHls ZUJhc2UuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJQTgwRTczNEEwQTE5OUM3NzAw N0ZCOEM1IC8qIFN0eWxlTGlzdC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVF bmNvZGluZyA9IDMwOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0g U3R5bGVMaXN0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCUE4MEU3MzRCMEExOTlD NzcwMDdGQjhDNSAvKiBDU1NTZWxlY3Rvci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDMwOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gQ1NTU2VsZWN0b3IuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTgwRTcz NEMwQTE5OUM3NzAwN0ZCOEM1IC8qIFN0eWxlQmFzZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gMzA7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jcHAuY3BwOyBwYXRoID0gU3R5bGVCYXNlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJQTgwRTc5OTYwQTE5QkQyMTAwN0ZCOEM1IC8qIFJlY3QuaWRsICovID0ge2lzYSA9IFBC WEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDMwOyBsYXN0S25vd25GaWxlVHlwZSA9IHRl eHQ7IHBhdGggPSBSZWN0LmlkbDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTIwNjcx LDggKzIwNjY3LDYgQEAKIAkJCQlBODBFNkNCRTBBMTk4OUNBMDA3RkI4QzUgLyogU2hhZG93VmFs dWUuaCAqLywKIAkJCQlBODBFNzM0QzBBMTk5Qzc3MDA3RkI4QzUgLyogU3R5bGVCYXNlLmNwcCAq LywKIAkJCQlBODBFNzM0OTBBMTk5Qzc3MDA3RkI4QzUgLyogU3R5bGVCYXNlLmggKi8sCi0JCQkJ QTgwRTczNDYwQTE5OUM3NzAwN0ZCOEM1IC8qIFN0eWxlTGlzdC5jcHAgKi8sCi0JCQkJQTgwRTcz NEEwQTE5OUM3NzAwN0ZCOEM1IC8qIFN0eWxlTGlzdC5oICovLAogCQkJCTBGRjUwMjZFMTAyQkE5 NjYwMDY2RjM5QSAvKiBTdHlsZU1lZGlhLmNwcCAqLywKIAkJCQkwRkY1MDI2RjEwMkJBOTZBMDA2 NkYzOUEgLyogU3R5bGVNZWRpYS5oICovLAogCQkJCTBGRjUwMjcwMTAyQkE5NkEwMDY2RjM5QSAv KiBTdHlsZU1lZGlhLmlkbCAqLywKQEAgLTI0MDk5LDcgKzI0MDkzLDYgQEAKIAkJCQlCQ0VGNDQ0 QTBFNjc0NUUwMDAxQzEyODcgLyogU3R5bGVHZW5lcmF0ZWRJbWFnZS5oIGluIEhlYWRlcnMgKi8s CiAJCQkJQkNFRjQzQ0YwRTY3M0RBMTAwMUMxMjg3IC8qIFN0eWxlSW1hZ2UuaCBpbiBIZWFkZXJz ICovLAogCQkJCUJDMjI3MzA0MEU4MkYxRTYwMEU3Rjk3NSAvKiBTdHlsZUluaGVyaXRlZERhdGEu aCBpbiBIZWFkZXJzICovLAotCQkJCUE4MEU3MzUxMEExOTlDNzcwMDdGQjhDNSAvKiBTdHlsZUxp c3QuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDNUVCNzJBMEU4MURFODEwMEIyNTk2NSAvKiBTdHls ZU1hcnF1ZWVEYXRhLmggaW4gSGVhZGVycyAqLywKIAkJCQkwRkY1MDI3MjEwMkJBOTZBMDA2NkYz OUEgLyogU3R5bGVNZWRpYS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkM1RUI3NEUwRTgxRTA2NzAw QjI1OTY1IC8qIFN0eWxlTXVsdGlDb2xEYXRhLmggaW4gSGVhZGVycyAqLywKQEAgLTI3MDczLDcg KzI3MDY2LDYgQEAKIAkJCQk1MzE3NjEyMjEzQzUxNjY5MDAyNkU0NTQgLyogU3R5bGVGbGV4aWJs ZUJveERhdGEuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkNFRjQ0N0QwRTY3NDgwNjAwMUMxMjg3 IC8qIFN0eWxlR2VuZXJhdGVkSW1hZ2UuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkMyMjczMDMw RTgyRjFFNjAwRTdGOTc1IC8qIFN0eWxlSW5oZXJpdGVkRGF0YS5jcHAgaW4gU291cmNlcyAqLywK LQkJCQlBODBFNzM0RDBBMTk5Qzc3MDA3RkI4QzUgLyogU3R5bGVMaXN0LmNwcCBpbiBTb3VyY2Vz ICovLAogCQkJCUJDNUVCNzI5MEU4MURFODEwMEIyNTk2NSAvKiBTdHlsZU1hcnF1ZWVEYXRhLmNw cCBpbiBTb3VyY2VzICovLAogCQkJCTBGRjUwMjcxMTAyQkE5NkEwMDY2RjM5QSAvKiBTdHlsZU1l ZGlhLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUJDNUVCNzREMEU4MUUwNjcwMEIyNTk2NSAvKiBT dHlsZU11bHRpQ29sRGF0YS5jcHAgaW4gU291cmNlcyAqLywKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ1NTUnVsZUxpc3RDdXN0b20uY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvSlNDU1NSdWxlTGlzdEN1c3RvbS5jcHAKaW5kZXggOGU3ZGMxOC4uNDc2 N2FkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDU1NSdWxlTGlz dEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDU1NSdWxlTGlz dEN1c3RvbS5jcHAKQEAgLTI5LDcgKzI5LDcgQEAKICNpbmNsdWRlICJDU1NSdWxlLmgiCiAjaW5j bHVkZSAiQ1NTUnVsZUxpc3QuaCIKICNpbmNsdWRlICJKU05vZGUuaCIKLSNpbmNsdWRlICJTdHls ZUxpc3QuaCIKKyNpbmNsdWRlICJTdHlsZVNoZWV0LmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBKU0M7 CiAKQEAgLTQwLDcgKzQwLDcgQEAgYm9vbCBKU0NTU1J1bGVMaXN0T3duZXI6OmlzUmVhY2hhYmxl RnJvbU9wYXF1ZVJvb3RzKEpTQzo6SGFuZGxlPEpTQzo6VW5rbm93bj4gaGEKICAgICBKU0NTU1J1 bGVMaXN0KiBqc0NTU1J1bGVMaXN0ID0gc3RhdGljX2Nhc3Q8SlNDU1NSdWxlTGlzdCo+KGhhbmRs ZS5nZXQoKS5hc0NlbGwoKSk7CiAgICAgaWYgKCFqc0NTU1J1bGVMaXN0LT5oYXNDdXN0b21Qcm9w ZXJ0aWVzKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoU3R5bGVMaXN0KiBzdHls ZUxpc3QgPSBqc0NTU1J1bGVMaXN0LT5pbXBsKCktPnN0eWxlTGlzdCgpKQorICAgIGlmIChTdHls ZVNoZWV0KiBzdHlsZUxpc3QgPSBqc0NTU1J1bGVMaXN0LT5pbXBsKCktPnN0eWxlU2hlZXQoKSkK ICAgICAgICAgcmV0dXJuIHZpc2l0b3IuY29udGFpbnNPcGFxdWVSb290KHJvb3Qoc3R5bGVMaXN0 KSk7CiAgICAgaWYgKENTU1J1bGUqIGNzc1J1bGUgPSBqc0NTU1J1bGVMaXN0LT5pbXBsKCktPml0 ZW0oMCkpCiAgICAgICAgIHJldHVybiB2aXNpdG9yLmNvbnRhaW5zT3BhcXVlUm9vdChyb290KGNz c1J1bGUpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NSdWxlTGlzdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUnVsZUxpc3QuY3BwCmluZGV4IGRhNjU2MzIuLjFlOWU0 MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NSdWxlTGlzdC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1J1bGVMaXN0LmNwcApAQCAtMjQsNyArMjQsNyBAQAogCiAj aW5jbHVkZSAiQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uaCIKICNpbmNsdWRlICJDU1NSdWxl LmgiCi0jaW5jbHVkZSAiU3R5bGVMaXN0LmgiCisjaW5jbHVkZSAiU3R5bGVTaGVldC5oIgogI2lu Y2x1ZGUgIldlYktpdENTU0tleWZyYW1lUnVsZS5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBA IC0zMywxNCArMzMsMTMgQEAgQ1NTUnVsZUxpc3Q6OkNTU1J1bGVMaXN0KCkKIHsKIH0KIAotQ1NT UnVsZUxpc3Q6OkNTU1J1bGVMaXN0KFN0eWxlTGlzdCogbGlzdCwgYm9vbCBvbWl0Q2hhcnNldFJ1 bGVzKQorQ1NTUnVsZUxpc3Q6OkNTU1J1bGVMaXN0KFN0eWxlU2hlZXQqIHN0eWxlU2hlZXQsIGJv b2wgb21pdENoYXJzZXRSdWxlcykKKyAgICA6IG1fc3R5bGVTaGVldChzdHlsZVNoZWV0KQogewot ICAgIG1fbGlzdCA9IGxpc3Q7Ci0gICAgaWYgKGxpc3QgJiYgb21pdENoYXJzZXRSdWxlcykgewot ICAgICAgICBtX2xpc3QgPSAwOwotICAgICAgICB1bnNpZ25lZCBsZW4gPSBsaXN0LT5sZW5ndGgo KTsKLSAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbjsgKytpKSB7Ci0gICAgICAg ICAgICBTdHlsZUJhc2UqIHN0eWxlID0gbGlzdC0+aXRlbShpKTsKKyAgICBpZiAoc3R5bGVTaGVl dCAmJiBvbWl0Q2hhcnNldFJ1bGVzKSB7CisgICAgICAgIG1fc3R5bGVTaGVldCA9IDA7CisgICAg ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzdHlsZVNoZWV0LT5sZW5ndGgoKTsgKytpKSB7 CisgICAgICAgICAgICBTdHlsZUJhc2UqIHN0eWxlID0gc3R5bGVTaGVldC0+aXRlbShpKTsKICAg ICAgICAgICAgIGlmIChzdHlsZS0+aXNSdWxlKCkgJiYgIXN0eWxlLT5pc0NoYXJzZXRSdWxlKCkp CiAgICAgICAgICAgICAgICAgYXBwZW5kKHN0YXRpY19jYXN0PENTU1J1bGUqPihzdHlsZSkpOwog ICAgICAgICB9CkBAIC01MywxMyArNTIsMTMgQEAgQ1NTUnVsZUxpc3Q6On5DU1NSdWxlTGlzdCgp CiAKIHVuc2lnbmVkIENTU1J1bGVMaXN0OjpsZW5ndGgoKSBjb25zdAogewotICAgIHJldHVybiBt X2xpc3QgPyBtX2xpc3QtPmxlbmd0aCgpIDogbV9sc3RDU1NSdWxlcy5zaXplKCk7CisgICAgcmV0 dXJuIG1fc3R5bGVTaGVldCA/IG1fc3R5bGVTaGVldC0+bGVuZ3RoKCkgOiBtX2xzdENTU1J1bGVz LnNpemUoKTsKIH0KIAogQ1NTUnVsZSogQ1NTUnVsZUxpc3Q6Oml0ZW0odW5zaWduZWQgaW5kZXgp CiB7Ci0gICAgaWYgKG1fbGlzdCkgewotICAgICAgICBTdHlsZUJhc2UqIHJ1bGUgPSBtX2xpc3Qt Pml0ZW0oaW5kZXgpOworICAgIGlmIChtX3N0eWxlU2hlZXQpIHsKKyAgICAgICAgU3R5bGVCYXNl KiBydWxlID0gbV9zdHlsZVNoZWV0LT5pdGVtKGluZGV4KTsKICAgICAgICAgQVNTRVJUKCFydWxl IHx8IHJ1bGUtPmlzUnVsZSgpKTsKICAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PENTU1J1bGUq PihydWxlKTsKICAgICB9CkBAIC03MSwxMiArNzAsMTAgQEAgQ1NTUnVsZSogQ1NTUnVsZUxpc3Q6 Oml0ZW0odW5zaWduZWQgaW5kZXgpCiAKIHZvaWQgQ1NTUnVsZUxpc3Q6OmRlbGV0ZVJ1bGUodW5z aWduZWQgaW5kZXgpCiB7Ci0gICAgQVNTRVJUKCFtX2xpc3QpOworICAgIEFTU0VSVCghbV9zdHls ZVNoZWV0KTsKIAotICAgIGlmIChpbmRleCA+PSBtX2xzdENTU1J1bGVzLnNpemUoKSkgewotICAg ICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIHRocm93IGFuIElOREVYX1NJWkVfRVJSIGV4Y2VwdGlv biBoZXJlPworICAgIGlmIChpbmRleCA+PSBtX2xzdENTU1J1bGVzLnNpemUoKSkKICAgICAgICAg cmV0dXJuOwotICAgIH0KIAogICAgIGlmIChtX2xzdENTU1J1bGVzW2luZGV4XS0+aXNLZXlmcmFt ZVJ1bGUoKSkgewogICAgICAgICBpZiAoQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24qIHN0eWxl ID0gc3RhdGljX2Nhc3Q8V2ViS2l0Q1NTS2V5ZnJhbWVSdWxlKj4obV9sc3RDU1NSdWxlc1tpbmRl eF0uZ2V0KCkpLT5zdHlsZSgpKQpAQCAtODksMjcgKzg2LDIwIEBAIHZvaWQgQ1NTUnVsZUxpc3Q6 OmRlbGV0ZVJ1bGUodW5zaWduZWQgaW5kZXgpCiAKIHZvaWQgQ1NTUnVsZUxpc3Q6OmFwcGVuZChD U1NSdWxlKiBydWxlKQogewotICAgIEFTU0VSVCghbV9saXN0KTsKLSAgICBpZiAoIXJ1bGUpIHsK LSAgICAgICAgLy8gRklYTUU6IFNob3VsZCB3ZSB0aHJvdyBhbiBleGNlcHRpb24/CisgICAgQVNT RVJUKCFtX3N0eWxlU2hlZXQpOworCisgICAgaWYgKCFydWxlKQogICAgICAgICByZXR1cm47Ci0g ICAgfQogCiAgICAgbV9sc3RDU1NSdWxlcy5hcHBlbmQocnVsZSk7CiB9CiAKIHVuc2lnbmVkIENT U1J1bGVMaXN0OjppbnNlcnRSdWxlKENTU1J1bGUqIHJ1bGUsIHVuc2lnbmVkIGluZGV4KQogewot ICAgIEFTU0VSVCghbV9saXN0KTsKLSAgICBpZiAoIXJ1bGUpIHsKLSAgICAgICAgLy8gRklYTUU6 IFNob3VsZCB3ZSB0aHJvdyBhbiBleGNlcHRpb24/Ci0gICAgICAgIHJldHVybiAwOwotICAgIH0K KyAgICBBU1NFUlQoIW1fc3R5bGVTaGVldCk7CiAKLSAgICBpZiAoaW5kZXggPiBtX2xzdENTU1J1 bGVzLnNpemUoKSkgewotICAgICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIHRocm93IGFuIElOREVY X1NJWkVfRVJSIGV4Y2VwdGlvbiBoZXJlPworICAgIGlmICghcnVsZSB8fCBpbmRleCA+IG1fbHN0 Q1NTUnVsZXMuc2l6ZSgpKQogICAgICAgICByZXR1cm4gMDsKLSAgICB9CiAKICAgICBtX2xzdENT U1J1bGVzLmluc2VydChpbmRleCwgcnVsZSk7CiAgICAgcmV0dXJuIGluZGV4OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1J1bGVMaXN0LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTUnVsZUxpc3QuaAppbmRleCA4Nzk5NmE5Li4wODZjMTgzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUnVsZUxpc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUnVs ZUxpc3QuaApAQCAtMzAsMTMgKzMwLDEzIEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNz IENTU1J1bGU7Ci1jbGFzcyBTdHlsZUxpc3Q7CitjbGFzcyBTdHlsZVNoZWV0OwogCiBjbGFzcyBD U1NSdWxlTGlzdCA6IHB1YmxpYyBSZWZDb3VudGVkPENTU1J1bGVMaXN0PiB7CiBwdWJsaWM6Ci0g ICAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTUnVsZUxpc3Q+IGNyZWF0ZShTdHlsZUxpc3QqIGxpc3Qs IGJvb2wgb21pdENoYXJzZXRSdWxlcyA9IGZhbHNlKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPENT U1J1bGVMaXN0PiBjcmVhdGUoU3R5bGVTaGVldCogc3R5bGVTaGVldCwgYm9vbCBvbWl0Q2hhcnNl dFJ1bGVzID0gZmFsc2UpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IENTU1J1 bGVMaXN0KGxpc3QsIG9taXRDaGFyc2V0UnVsZXMpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBDU1NSdWxlTGlzdChzdHlsZVNoZWV0LCBvbWl0Q2hhcnNldFJ1bGVzKSk7CiAgICAgfQog ICAgIHN0YXRpYyBQYXNzUmVmUHRyPENTU1J1bGVMaXN0PiBjcmVhdGUoKQogICAgIHsKQEAgLTQ3 LDIyICs0NywxOSBAQCBwdWJsaWM6CiAgICAgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3Q7CiAgICAg Q1NTUnVsZSogaXRlbSh1bnNpZ25lZCBpbmRleCk7CiAKLSAgICAvLyBGSVhNRTogTm90IHBhcnQg b2YgdGhlIERPTS4gIE9ubHkgdXNlZCBieSBtZWRpYSBydWxlcy4gIFdlIHNob3VsZCBiZSBhYmxl IHRvIHJlbW92ZSB0aGVtIGlmIHdlIGNoYW5nZWQgbWVkaWEgcnVsZXMgdG8gd29yawotICAgIC8v IGFzIFN0eWxlTGlzdHMgaW5zdGVhZC4KKyAgICAvLyBGSVhNRTogTm90IHBhcnQgb2YgdGhlIENT U09NLiBPbmx5IHVzZWQgYnkgQG1lZGlhIGFuZCBALXdlYmtpdC1rZXlmcmFtZXMgcnVsZXMuCiAg ICAgdW5zaWduZWQgaW5zZXJ0UnVsZShDU1NSdWxlKiwgdW5zaWduZWQgaW5kZXgpOwogICAgIHZv aWQgZGVsZXRlUnVsZSh1bnNpZ25lZCBpbmRleCk7CisKICAgICB2b2lkIGFwcGVuZChDU1NSdWxl Kik7CiAKLSAgICBTdHlsZUxpc3QqIHN0eWxlTGlzdCgpCi0gICAgewotICAgICAgICByZXR1cm4g bV9saXN0LmdldCgpOwotICAgIH0KKyAgICBTdHlsZVNoZWV0KiBzdHlsZVNoZWV0KCkgeyByZXR1 cm4gbV9zdHlsZVNoZWV0LmdldCgpOyB9CiAKIHByaXZhdGU6CiAgICAgQ1NTUnVsZUxpc3QoKTsK LSAgICBDU1NSdWxlTGlzdChTdHlsZUxpc3QqLCBib29sIG9taXRDaGFyc2V0UnVsZXMpOworICAg IENTU1J1bGVMaXN0KFN0eWxlU2hlZXQqLCBib29sIG9taXRDaGFyc2V0UnVsZXMpOwogCi0gICAg UmVmUHRyPFN0eWxlTGlzdD4gbV9saXN0OworICAgIFJlZlB0cjxTdHlsZVNoZWV0PiBtX3N0eWxl U2hlZXQ7CiAgICAgVmVjdG9yPFJlZlB0cjxDU1NSdWxlPiA+IG1fbHN0Q1NTUnVsZXM7IC8vIEZJ WE1FOiBXYW50IHRvIGVsaW1pbmF0ZSwgYnV0IHVzZWQgYnkgSUUgcnVsZXMoKSBleHRlbnNpb24g YW5kIHN0aWxsIHVzZWQgYnkgbWVkaWEgcnVsZXMuCiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvU3R5bGVTaGVldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVl dC5jcHAKaW5kZXggNjhhMDc3Mi4uOThjMThkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL1N0eWxlU2hlZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVNoZWV0LmNw cApAQCAtMjYsNyArMjYsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBTdHlsZVNoZWV0OjpT dHlsZVNoZWV0KFN0eWxlU2hlZXQqIHBhcmVudFNoZWV0LCBjb25zdCBTdHJpbmcmIG9yaWdpbmFs VVJMLCBjb25zdCBLVVJMJiBmaW5hbFVSTCkKLSAgICA6IFN0eWxlTGlzdChwYXJlbnRTaGVldCkK KyAgICA6IFN0eWxlQmFzZShwYXJlbnRTaGVldCkKICAgICAsIG1fcGFyZW50Tm9kZSgwKQogICAg ICwgbV9vcmlnaW5hbFVSTChvcmlnaW5hbFVSTCkKICAgICAsIG1fZmluYWxVUkwoZmluYWxVUkwp CkBAIC0zNSw3ICszNSw3IEBAIFN0eWxlU2hlZXQ6OlN0eWxlU2hlZXQoU3R5bGVTaGVldCogcGFy ZW50U2hlZXQsIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxVUkwsIGNvbnN0CiB9CiAKIFN0eWxlU2hl ZXQ6OlN0eWxlU2hlZXQoTm9kZSogcGFyZW50Tm9kZSwgY29uc3QgU3RyaW5nJiBvcmlnaW5hbFVS TCwgY29uc3QgS1VSTCYgZmluYWxVUkwpCi0gICAgOiBTdHlsZUxpc3QoMCkKKyAgICA6IFN0eWxl QmFzZSgwKQogICAgICwgbV9wYXJlbnROb2RlKHBhcmVudE5vZGUpCiAgICAgLCBtX29yaWdpbmFs VVJMKG9yaWdpbmFsVVJMKQogICAgICwgbV9maW5hbFVSTChmaW5hbFVSTCkKQEAgLTQ0LDcgKzQ0 LDcgQEAgU3R5bGVTaGVldDo6U3R5bGVTaGVldChOb2RlKiBwYXJlbnROb2RlLCBjb25zdCBTdHJp bmcmIG9yaWdpbmFsVVJMLCBjb25zdCBLVVJMJgogfQogCiBTdHlsZVNoZWV0OjpTdHlsZVNoZWV0 KFN0eWxlQmFzZSogb3duZXIsIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxVUkwsIGNvbnN0IEtVUkwm IGZpbmFsVVJMKQotICAgIDogU3R5bGVMaXN0KG93bmVyKQorICAgIDogU3R5bGVCYXNlKG93bmVy KQogICAgICwgbV9wYXJlbnROb2RlKDApCiAgICAgLCBtX29yaWdpbmFsVVJMKG9yaWdpbmFsVVJM KQogICAgICwgbV9maW5hbFVSTChmaW5hbFVSTCkKQEAgLTY2LDYgKzY2LDMwIEBAIFN0eWxlU2hl ZXQ6On5TdHlsZVNoZWV0KCkKICAgICB9CiB9CiAKK3ZvaWQgU3R5bGVTaGVldDo6YXBwZW5kKFBh c3NSZWZQdHI8U3R5bGVCYXNlPiBjaGlsZCkKK3sKKyAgICBTdHlsZUJhc2UqIGMgPSBjaGlsZC5n ZXQoKTsKKyAgICBtX2NoaWxkcmVuLmFwcGVuZChjaGlsZCk7CisgICAgYy0+aW5zZXJ0ZWRJbnRv UGFyZW50KCk7Cit9CisKK3ZvaWQgU3R5bGVTaGVldDo6aW5zZXJ0KHVuc2lnbmVkIGluZGV4LCBQ YXNzUmVmUHRyPFN0eWxlQmFzZT4gY2hpbGQpCit7CisgICAgU3R5bGVCYXNlKiBjID0gY2hpbGQu Z2V0KCk7CisgICAgaWYgKGluZGV4ID49IGxlbmd0aCgpKQorICAgICAgICBtX2NoaWxkcmVuLmFw cGVuZChjaGlsZCk7CisgICAgZWxzZQorICAgICAgICBtX2NoaWxkcmVuLmluc2VydChpbmRleCwg Y2hpbGQpOworICAgIGMtPmluc2VydGVkSW50b1BhcmVudCgpOworfQorCit2b2lkIFN0eWxlU2hl ZXQ6OnJlbW92ZSh1bnNpZ25lZCBpbmRleCkKK3sKKyAgICBpZiAocG9zaXRpb24gPj0gbGVuZ3Ro KCkpCisgICAgICAgIHJldHVybjsKKyAgICBtX2NoaWxkcmVuLnJlbW92ZShpbmRleCk7Cit9CisK IFN0eWxlU2hlZXQqIFN0eWxlU2hlZXQ6OnBhcmVudFN0eWxlU2hlZXQoKSBjb25zdAogewogICAg IHJldHVybiAocGFyZW50KCkgJiYgcGFyZW50KCktPmlzU3R5bGVTaGVldCgpKSA/IHN0YXRpY19j YXN0PFN0eWxlU2hlZXQqPihwYXJlbnQoKSkgOiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL1N0eWxlU2hlZXQuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVNoZWV0LmgKaW5k ZXggMmZmOWEwMS4uODJlNmJjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl U2hlZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVTaGVldC5oCkBAIC0yMyw3ICsy Myw3IEBACiAKICNpbmNsdWRlICJLVVJMSGFzaC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5n LmgiCi0jaW5jbHVkZSAiU3R5bGVMaXN0LmgiCisjaW5jbHVkZSAiU3R5bGVCYXNlLmgiCiAjaW5j bHVkZSA8d3RmL0xpc3RIYXNoU2V0Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTMyLDEw ICszMiwxNyBAQCBjbGFzcyBDYWNoZWRDU1NTdHlsZVNoZWV0OwogY2xhc3MgTWVkaWFMaXN0Owog Y2xhc3MgTm9kZTsKIAotY2xhc3MgU3R5bGVTaGVldCA6IHB1YmxpYyBTdHlsZUxpc3QgeworY2xh c3MgU3R5bGVTaGVldCA6IHB1YmxpYyBTdHlsZUJhc2UgewogcHVibGljOgogICAgIHZpcnR1YWwg flN0eWxlU2hlZXQoKTsKIAorICAgIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0IHsgcmV0dXJuIG1f Y2hpbGRyZW4uc2l6ZSgpOyB9CisgICAgU3R5bGVCYXNlKiBpdGVtKHVuc2lnbmVkIGluZGV4KSB7 IHJldHVybiBpbmRleCA8IGxlbmd0aCgpID8gbV9jaGlsZHJlbi5hdChpbmRleCkuZ2V0KCkgOiAw OyB9CisKKyAgICB2b2lkIGFwcGVuZChQYXNzUmVmUHRyPFN0eWxlQmFzZT4pOworICAgIHZvaWQg aW5zZXJ0KHVuc2lnbmVkIGluZGV4LCBQYXNzUmVmUHRyPFN0eWxlQmFzZT4pOworICAgIHZvaWQg cmVtb3ZlKHVuc2lnbmVkIGluZGV4KTsKKwogICAgIGJvb2wgZGlzYWJsZWQoKSBjb25zdCB7IHJl dHVybiBtX2Rpc2FibGVkOyB9CiAgICAgdm9pZCBzZXREaXNhYmxlZChib29sIGRpc2FibGVkKSB7 IG1fZGlzYWJsZWQgPSBkaXNhYmxlZDsgc3R5bGVTaGVldENoYW5nZWQoKTsgfQogCkBAIC03Myw2 ICs4MCw3IEBAIHByb3RlY3RlZDoKIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGlzU3R5bGVT aGVldCgpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KIAorICAgIFZlY3RvcjxSZWZQdHI8U3R5bGVC YXNlPiA+IG1fY2hpbGRyZW47CiAgICAgTm9kZSogbV9wYXJlbnROb2RlOwogICAgIFN0cmluZyBt X29yaWdpbmFsVVJMOwogICAgIEtVUkwgbV9maW5hbFVSTDsK