43380 2010-08-02 14:24:07 -0700 Add support for loading manual streams 2010-08-02 14:32:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 259118 0 andersca 2010-08-02 14:24:07 -0700 Add support for loading manual streams 259124 1 63261 andersca 2010-08-02 14:29:16 -0700 Created attachment 63261 Patch 259126 2 andersca 2010-08-02 14:32:47 -0700 Committed r64494: <http://trac.webkit.org/changeset/64494> 63261 2010-08-02 14:29:16 -0700 2010-08-02 14:30:34 -0700 Patch bug-43380-20100802142914.patch text/plain 19816 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ODE4MzZjY2I4ZmY5ZDlhNWY1MzAxNDA2N2M0MTM3OWU5NDFhYjkwZS4uZDU1MzhjMDY5ZDhlMWNk ZWQ3MWI5NzcyMjU1MjFiZWNlZjVlNDRjYiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw3NCBAQAorMjAxMC0wOC0wMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBsb2FkaW5nIG1hbnVh bCBzdHJlYW1zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00MzM4MAorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBl UGx1Z2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46Ok5ldHNjYXBlUGx1 Z2luKToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX2xvYWRNYW51YWxseSB0byBmYWxzZS4KKworICAg ICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6cmVtb3ZlUGx1Z2luU3RyZWFtKToKKyAgICAg ICAgU3BlY2lhbCBjYXNlIHRoZSBtYW51YWwgc3RyZWFtLgorCisgICAgICAgIChXZWJLaXQ6Ok5l dHNjYXBlUGx1Z2luOjppbml0aWFsaXplKToKKyAgICAgICAgRG9uJ3QgcmVxdWVzdCB0aGUgc3Ry ZWFtIGlmIHdlJ3JlIGFscmVhZHkgbG9hZGluZy4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2Fw ZVBsdWdpbjo6bWFudWFsU3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgQ3JlYXRl IHRoZSBtYW51YWwgc3RyZWFtIGFuZCBwYXNzIHRoZSByZXNwb25zZSB0byBpdC4KKworICAgICAg ICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6bWFudWFsU3RyZWFtRGlkUmVjZWl2ZURhdGEpOgor ICAgICAgICBQYXNzIHRoZSBkYXRhIHRvIHRoZSBtYW51YWwgc3RyZWFtLgorCisgICAgICAgIChX ZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjptYW51YWxTdHJlYW1EaWRGaW5pc2hMb2FkaW5nKToKKyAg ICAgICAgQ2FsbCB0aGUgbWFudWFsIHN0cmVhbS4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2Fw ZVBsdWdpbjo6bWFudWFsU3RyZWFtRGlkRmFpbCk6CisgICAgICAgIERpdHRvLgorCisgICAgICAg ICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oOgorICAgICAgICBBZGQgcHVyZSB2aXJ0dWFs IG1lbWJlciBmdW5jdGlvbnMgZm9yIG1hbnVhbCBzdHJlYW0gbG9hZGluZy4KKworICAgICAgICAq IFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcDoKKyAgICAgICAgKFdlYktpdDo6YnVp bGRIVFRQSGVhZGVycyk6CisgICAgICAgIFB1dCBjb2RlIGluIGEgZnVuY3Rpb24gc28gYm90aCBQ bHVnaW5WaWV3OjpTdHJlYW06OmRpZFJlY2VpdmVSZXNwb25zZSBhbmQgCisgICAgICAgIG1hbnVh bExvYWREaWRSZWNlaXZlUmVzcG9uc2UgY2FuIGNhbGwgaXQuCisKKyAgICAgICAgKFdlYktpdDo6 UGx1Z2luVmlldzo6U3RyZWFtOjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICBDYWxsIGJ1 aWxkSFRUUEhlYWRlcnMuCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6U3RyZWFtOjpk aWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgUHJvdGVjdCB0aGUgcGx1Zy1pbiB3aGVuIGNhbGxp bmcgZGVzdHJveVN0cmVhbS4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjptYW51YWxM b2FkRGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgQ2FsbCBQbHVnaW46Om1hbnVhbFN0cmVh bURpZFJlY2VpdmVSZXNwb25zZS4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjptYW51 YWxMb2FkRGlkUmVjZWl2ZURhdGEpOgorICAgICAgICBDYWxsIFBsdWdpbjo6bWFudWFsU3RyZWFt RGlkUmVjZWl2ZURhdGEuCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6bWFudWFsTG9h ZERpZEZpbmlzaExvYWRpbmcpOgorICAgICAgICBDYWxsIFBsdWdpbjo6bWFudWFsU3RyZWFtRGlk RmluaXNoTG9hZGluZy4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5WaWV3OjptYW51YWxMb2Fk RGlkRmFpbCk6CisgICAgICAgIENhbGwgUGx1Z2luOjptYW51YWxTdHJlYW1EaWRGYWlsLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9hZGVyQ2xpZW50OjpXZWJGcmFtZUxvYWRl ckNsaWVudCk6CisgICAgICAgIEluaXRpYWxpemUgbV9oYXNTZW50UmVzcG9uc2VUb1BsdWdpblZp ZXcgdG8gZmFsc2UuCisKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnNl dE1haW5Eb2N1bWVudEVycm9yKToKKyAgICAgICAgQ2FsbCBQbHVnaW5WaWV3OjptYW51YWxMb2Fk RGlkRmFpbC4KKworICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6Y29tbWl0 dGVkTG9hZCk6CisgICAgICAgIENhbGwgUGx1Z2luVmlldzo6bWFudWFsTG9hZERpZFJlY2VpdmVS ZXNwb25zZS4KKworICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6ZmluaXNo ZWRMb2FkaW5nKToKKyAgICAgICAgQ2FsbCBQbHVnaW5WaWV3OjptYW51YWxMb2FkRGlkRmluaXNo TG9hZGluZy4KKworICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVkaXJl Y3REYXRhVG9QbHVnaW4pOgorICAgICAgICBLZWVwIHRyYWNrIG9mIHRoZSBwbHVnLWluIHZpZXcu CisKIDIwMTAtMDgtMDIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKaW5kZXggZWVhNWZjMWNiYzAxYjQ4 MzI5MTI4ZGJjZDMwZWM4ODVkNGJlYWRjZC4uYTUyNTI1NjE5OTU2NzYyZTE5MzI1ZTM2OGJlMTZi ZjE0YTdjYzc5MiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2Nh cGUvTmV0c2NhcGVQbHVnaW4uY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05l dHNjYXBlL05ldHNjYXBlUGx1Z2luLmNwcApAQCAtNDcsNiArNDcsNyBAQCBOZXRzY2FwZVBsdWdp bjo6TmV0c2NhcGVQbHVnaW4oUGFzc1JlZlB0cjxOZXRzY2FwZVBsdWdpbk1vZHVsZT4gcGx1Z2lu TW9kdWxlKQogICAgICwgbV9ucFdpbmRvdygpCiAgICAgLCBtX2lzU3RhcnRlZChmYWxzZSkKICAg ICAsIG1faW5OUFBOZXcoZmFsc2UpCisgICAgLCBtX2xvYWRNYW51YWxseShmYWxzZSkKICNpZiBQ TEFURk9STShNQUMpCiAgICAgLCBtX2RyYXdpbmdNb2RlbChzdGF0aWNfY2FzdDxOUERyYXdpbmdN b2RlbD4oLTEpKQogICAgICwgbV9ldmVudE1vZGVsKHN0YXRpY19jYXN0PE5QRXZlbnRNb2RlbD4o LTEpKQpAQCAtMTc5LDYgKzE4MCwxMSBAQCB2b2lkIE5ldHNjYXBlUGx1Z2luOjpjYW5jZWxTdHJl YW1Mb2FkKE5ldHNjYXBlUGx1Z2luU3RyZWFtKiBwbHVnaW5TdHJlYW0pCiAKIHZvaWQgTmV0c2Nh cGVQbHVnaW46OnJlbW92ZVBsdWdpblN0cmVhbShOZXRzY2FwZVBsdWdpblN0cmVhbSogcGx1Z2lu U3RyZWFtKQogeworICAgIGlmIChwbHVnaW5TdHJlYW0gPT0gbV9tYW51YWxTdHJlYW0pIHsKKyAg ICAgICAgbV9tYW51YWxTdHJlYW0gPSAwOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAg QVNTRVJUKG1fc3RyZWFtcy5nZXQocGx1Z2luU3RyZWFtLT5zdHJlYW1JRCgpKSA9PSBwbHVnaW5T dHJlYW0pOwogICAgIG1fc3RyZWFtcy5yZW1vdmUocGx1Z2luU3RyZWFtLT5zdHJlYW1JRCgpKTsK IH0KQEAgLTI5Miw2ICsyOTgsNyBAQCBib29sIE5ldHNjYXBlUGx1Z2luOjppbml0aWFsaXplKFBs dWdpbkNvbnRyb2xsZXIqIHBsdWdpbkNvbnRyb2xsZXIsIGNvbnN0IFBhcmFtZQogICAgIAogICAg IHVpbnQxNl90IG1vZGUgPSBwYXJhbWV0ZXJzLmxvYWRNYW51YWxseSA/IE5QX0ZVTEwgOiBOUF9F TUJFRDsKICAgICAKKyAgICBtX2xvYWRNYW51YWxseSA9IHBhcmFtZXRlcnMubG9hZE1hbnVhbGx5 OwogICAgIG1faW5OUFBOZXcgPSB0cnVlOwogCiAgICAgQ1N0cmluZyBtaW1lVHlwZUNTdHJpbmcg PSBwYXJhbWV0ZXJzLm1pbWVUeXBlLnV0ZjgoKTsKQEAgLTMzMSw3ICszMzgsNyBAQCBib29sIE5l dHNjYXBlUGx1Z2luOjppbml0aWFsaXplKFBsdWdpbkNvbnRyb2xsZXIqIHBsdWdpbkNvbnRyb2xs ZXIsIGNvbnN0IFBhcmFtZQogICAgIH0KIAogICAgIC8vIExvYWQgdGhlIHNyYyBVUkwgaWYgbmVl ZGVkLgotICAgIGlmICghcGFyYW1ldGVycy51cmwuaXNFbXB0eSgpICYmIHNob3VsZExvYWRTcmNV UkwoKSkKKyAgICBpZiAoIXBhcmFtZXRlcnMubG9hZE1hbnVhbGx5ICYmICFwYXJhbWV0ZXJzLnVy bC5pc0VtcHR5KCkgJiYgc2hvdWxkTG9hZFNyY1VSTCgpKQogICAgICAgICBsb2FkVVJMKCJHRVQi LCBwYXJhbWV0ZXJzLnVybC5zdHJpbmcoKSwgU3RyaW5nKCksIEhUVFBIZWFkZXJNYXAoKSwgVmVj dG9yPGNoYXI+KCksIGZhbHNlLCAwKTsKICAgICAKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTQzMSw2 ICs0MzgsNDAgQEAgdm9pZCBOZXRzY2FwZVBsdWdpbjo6c3RyZWFtRGlkRmFpbCh1aW50NjRfdCBz dHJlYW1JRCwgYm9vbCB3YXNDYW5jZWxsZWQpCiAgICAgICAgIHBsdWdpblN0cmVhbS0+ZGlkRmFp bCh3YXNDYW5jZWxsZWQpOwogfQogCit2b2lkIE5ldHNjYXBlUGx1Z2luOjptYW51YWxTdHJlYW1E aWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgS1VSTCYgcmVzcG9uc2VVUkwsIHVpbnQzMl90IHN0cmVh bUxlbmd0aCwgdWludDMyX3QgbGFzdE1vZGlmaWVkVGltZSwgCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwg Y29uc3QgU3RyaW5nJiBoZWFkZXJzKQoreworICAgIEFTU0VSVChtX2xvYWRNYW51YWxseSk7Cisg ICAgQVNTRVJUKCFtX21hbnVhbFN0cmVhbSk7CisgICAgCisgICAgbV9tYW51YWxTdHJlYW0gPSBO ZXRzY2FwZVBsdWdpblN0cmVhbTo6Y3JlYXRlKHRoaXMsIDAsIGZhbHNlLCAwKTsKKyAgICBtX21h bnVhbFN0cmVhbS0+ZGlkUmVjZWl2ZVJlc3BvbnNlKHJlc3BvbnNlVVJMLCBzdHJlYW1MZW5ndGgs IGxhc3RNb2RpZmllZFRpbWUsIG1pbWVUeXBlLCBoZWFkZXJzKTsKK30KKwordm9pZCBOZXRzY2Fw ZVBsdWdpbjo6bWFudWFsU3RyZWFtRGlkUmVjZWl2ZURhdGEoY29uc3QgY2hhciogYnl0ZXMsIGlu dCBsZW5ndGgpCit7CisgICAgQVNTRVJUKG1fbG9hZE1hbnVhbGx5KTsKKyAgICBBU1NFUlQobV9t YW51YWxTdHJlYW0pOworCisgICAgbV9tYW51YWxTdHJlYW0tPmRpZFJlY2VpdmVEYXRhKGJ5dGVz LCBsZW5ndGgpOworfQorCit2b2lkIE5ldHNjYXBlUGx1Z2luOjptYW51YWxTdHJlYW1EaWRGaW5p c2hMb2FkaW5nKCkKK3sKKyAgICBBU1NFUlQobV9sb2FkTWFudWFsbHkpOworICAgIEFTU0VSVCht X21hbnVhbFN0cmVhbSk7CisKKyAgICBtX21hbnVhbFN0cmVhbS0+ZGlkRmluaXNoTG9hZGluZygp OworfQorCit2b2lkIE5ldHNjYXBlUGx1Z2luOjptYW51YWxTdHJlYW1EaWRGYWlsKGJvb2wgd2Fz Q2FuY2VsbGVkKQoreworICAgIEFTU0VSVChtX2xvYWRNYW51YWxseSk7CisgICAgQVNTRVJUKG1f bWFudWFsU3RyZWFtKTsKKworICAgIG1fbWFudWFsU3RyZWFtLT5kaWRGYWlsKHdhc0NhbmNlbGxl ZCk7Cit9CisKIGJvb2wgTmV0c2NhcGVQbHVnaW46OmhhbmRsZU1vdXNlRXZlbnQoY29uc3QgV2Vi TW91c2VFdmVudCYgbW91c2VFdmVudCkKIHsKICAgICByZXR1cm4gcGxhdGZvcm1IYW5kbGVNb3Vz ZUV2ZW50KG1vdXNlRXZlbnQpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKaW5kZXggNjUxNmMwZTA1ZmFjMjc4OTNkN2E1N2Q2 Mjc3MzYzNzZmNjhlMGQ5OC4uNDIyNjljODgxYjQwZjk0OWFkNzUxNGU0N2MxYmFiOGQ5NzM1OGM1 YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2Nh cGVQbHVnaW4uaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRz Y2FwZVBsdWdpbi5oCkBAIC0xMTQsNiArMTE0LDEyIEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCB2 b2lkIHN0cmVhbURpZFJlY2VpdmVEYXRhKHVpbnQ2NF90IHN0cmVhbUlELCBjb25zdCBjaGFyKiBi eXRlcywgaW50IGxlbmd0aCk7CiAgICAgdmlydHVhbCB2b2lkIHN0cmVhbURpZEZpbmlzaExvYWRp bmcodWludDY0X3Qgc3RyZWFtSUQpOwogICAgIHZpcnR1YWwgdm9pZCBzdHJlYW1EaWRGYWlsKHVp bnQ2NF90IHN0cmVhbUlELCBib29sIHdhc0NhbmNlbGxlZCk7CisgICAgdmlydHVhbCB2b2lkIG1h bnVhbFN0cmVhbURpZFJlY2VpdmVSZXNwb25zZShjb25zdCBXZWJDb3JlOjpLVVJMJiByZXNwb25z ZVVSTCwgdWludDMyX3Qgc3RyZWFtTGVuZ3RoLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90IGxhc3RNb2RpZmllZFRpbWUsIGNvbnN0IFdl YkNvcmU6OlN0cmluZyYgbWltZVR5cGUsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgaGVhZGVycyk7 CisgICAgdmlydHVhbCB2b2lkIG1hbnVhbFN0cmVhbURpZFJlY2VpdmVEYXRhKGNvbnN0IGNoYXIq IGJ5dGVzLCBpbnQgbGVuZ3RoKTsKKyAgICB2aXJ0dWFsIHZvaWQgbWFudWFsU3RyZWFtRGlkRmlu aXNoTG9hZGluZygpOworICAgIHZpcnR1YWwgdm9pZCBtYW51YWxTdHJlYW1EaWRGYWlsKGJvb2wg d2FzQ2FuY2VsbGVkKTsKKyAgICAKICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VFdmVudChj b25zdCBXZWJNb3VzZUV2ZW50Jik7CiAgICAgdmlydHVhbCBib29sIGhhbmRsZVdoZWVsRXZlbnQo Y29uc3QgV2ViV2hlZWxFdmVudCYpOwogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVNb3VzZUVudGVy RXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYpOwpAQCAtMTQzLDYgKzE0OSw4IEBAIHByaXZhdGU6 CiAKICAgICBib29sIG1faXNTdGFydGVkOwogICAgIGJvb2wgbV9pbk5QUE5ldzsKKyAgICBib29s IG1fbG9hZE1hbnVhbGx5OworICAgIFJlZlB0cjxOZXRzY2FwZVBsdWdpblN0cmVhbT4gbV9tYW51 YWxTdHJlYW07CiAKICNpZiBQTEFURk9STShNQUMpCiAgICAgTlBEcmF3aW5nTW9kZWwgbV9kcmF3 aW5nTW9kZWw7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW4u aCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCmluZGV4IDQxYzRjNzExYmY0 NDQ5ZmJhOWFkZWE2ZDcyZTMyODdiN2IwYzA0ZTkuLmEzNTNmZjFhZDk5OTRjNWQzNTMyN2EyNDhk OTNkZmFjZGZiYTY2M2IgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpbi5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbi5oCkBAIC05MSw2 ICs5MSwxOSBAQCBwdWJsaWM6CiAgICAgLy8gVGVsbHMgdGhlIHBsdWctaW4gdGhhdCBhIHN0cmVh bSBoYXMgZmFpbGVkIHRvIGxvYWQsIGVpdGhlciBiZWNhdXNlIG9mIG5ldHdvcmsgZXJyb3JzIG9y IGJlY2F1c2UgdGhlIGxvYWQgd2FzIGNhbmNlbGxlZC4KICAgICB2aXJ0dWFsIHZvaWQgc3RyZWFt RGlkRmFpbCh1aW50NjRfdCBzdHJlYW1JRCwgYm9vbCB3YXNDYW5jZWxsZWQpID0gMDsKIAorICAg IC8vIFRlbGxzIHRoZSBwbHVnLWluIHRoYXQgdGhlIG1hbnVhbCBzdHJlYW0gaGFzIHJlY2VpdmVk IGl0cyBIVFRQIHJlc3BvbnNlLgorICAgIHZpcnR1YWwgdm9pZCBtYW51YWxTdHJlYW1EaWRSZWNl aXZlUmVzcG9uc2UoY29uc3QgV2ViQ29yZTo6S1VSTCYgcmVzcG9uc2VVUkwsIHVpbnQzMl90IHN0 cmVhbUxlbmd0aCwgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB1aW50MzJfdCBsYXN0TW9kaWZpZWRUaW1lLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1p bWVUeXBlLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIGhlYWRlcnMpID0gMDsKKworICAgIC8vIFRl bGxzIHRoZSBwbHVnLWluIHRoYXQgdGhlIG1hbnVhbCBzdHJlYW0gZGlkIHJlY2VpdmUgZGF0YS4K KyAgICB2aXJ0dWFsIHZvaWQgbWFudWFsU3RyZWFtRGlkUmVjZWl2ZURhdGEoY29uc3QgY2hhciog Ynl0ZXMsIGludCBsZW5ndGgpID0gMDsKKworICAgIC8vIFRlbGxzIHRoZSBwbHVnLWluIHRoYXQg YSBzdHJlYW0gaGFzIGZpbmlzaGVkIGxvYWRpbmcuCisgICAgdmlydHVhbCB2b2lkIG1hbnVhbFN0 cmVhbURpZEZpbmlzaExvYWRpbmcoKSA9IDA7CisgICAgCisgICAgLy8gVGVsbHMgdGhlIHBsdWct aW4gdGhhdCBhIHN0cmVhbSBoYXMgZmFpbGVkIHRvIGxvYWQsIGVpdGhlciBiZWNhdXNlIG9mIG5l dHdvcmsgZXJyb3JzIG9yIGJlY2F1c2UgdGhlIGxvYWQgd2FzIGNhbmNlbGxlZC4KKyAgICB2aXJ0 dWFsIHZvaWQgbWFudWFsU3RyZWFtRGlkRmFpbChib29sIHdhc0NhbmNlbGxlZCkgPSAwOworICAg IAogICAgIC8vIFRlbGxzIHRoZSBwbHVnLWluIHRvIGhhbmRsZSB0aGUgcGFzc2VkIGluIG1vdXNl IGV2ZW50LiBUaGUgcGx1Zy1pbiBzaG91bGQgcmV0dXJuIHRydWUgaWYgaXQgcHJvY2Vzc2VkIHRo ZSBldmVudC4KICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlTW91c2VFdmVudChjb25zdCBXZWJNb3Vz ZUV2ZW50JikgPSAwOwogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5WaWV3LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3Bw CmluZGV4IGU1MWU4YmViZTY1YjFlMWE5MWMwYjQ5ZDJiMjEwZGRhYjE1MTg5YjAuLjEyMzM0OTIy ZDkyZTFlZDJlOTZiZjg1YzE3NTAwODI5OGYwMjg3YWYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC0xNDAsNiArMTQwLDM5IEBAIHZvaWQgUGx1Z2luVmll dzo6U3RyZWFtOjpjYW5jZWwoKQogICAgIG1fbG9hZGVyID0gMDsKIH0KIAorc3RhdGljIFN0cmlu ZyBidWlsZEhUVFBIZWFkZXJzKGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBsb25n IGxvbmcmIGV4cGVjdGVkQ29udGVudExlbmd0aCkKK3sKKyAgICBpZiAoIXJlc3BvbnNlLmlzSFRU UCgpKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICBWZWN0b3I8VUNoYXI+IHN0cmlu Z0J1aWxkZXI7CisgICAgU3RyaW5nIHNlcGFyYXRvcigiOiAiKTsKKyAgICAKKyAgICBTdHJpbmcg c3RhdHVzTGluZSA9IFN0cmluZzo6Zm9ybWF0KCJIVFRQICVkICIsIHJlc3BvbnNlLmh0dHBTdGF0 dXNDb2RlKCkpOworICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKHN0YXR1c0xpbmUuY2hhcmFjdGVy cygpLCBzdGF0dXNMaW5lLmxlbmd0aCgpKTsKKyAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZChyZXNw b25zZS5odHRwU3RhdHVzVGV4dCgpLmNoYXJhY3RlcnMoKSwgcmVzcG9uc2UuaHR0cFN0YXR1c1Rl eHQoKS5sZW5ndGgoKSk7CisgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoJ1xuJyk7CisgICAgCisg ICAgSFRUUEhlYWRlck1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gcmVzcG9uc2UuaHR0cEhlYWRl ckZpZWxkcygpLmVuZCgpOworICAgIGZvciAoSFRUUEhlYWRlck1hcDo6Y29uc3RfaXRlcmF0b3Ig aXQgPSByZXNwb25zZS5odHRwSGVhZGVyRmllbGRzKCkuYmVnaW4oKTsgaXQgIT0gZW5kOyArK2l0 KSB7CisgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKGl0LT5maXJzdC5jaGFyYWN0ZXJzKCks IGl0LT5maXJzdC5sZW5ndGgoKSk7CisgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKHNlcGFy YXRvci5jaGFyYWN0ZXJzKCksIHNlcGFyYXRvci5sZW5ndGgoKSk7CisgICAgICAgIHN0cmluZ0J1 aWxkZXIuYXBwZW5kKGl0LT5zZWNvbmQuY2hhcmFjdGVycygpLCBpdC0+c2Vjb25kLmxlbmd0aCgp KTsKKyAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoJ1xuJyk7CisgICAgfQorICAgIAorICAg IFN0cmluZyBoZWFkZXJzID0gU3RyaW5nOjphZG9wdChzdHJpbmdCdWlsZGVyKTsKKyAgICAKKyAg ICAvLyBJZiB0aGUgY29udGVudCBpcyBlbmNvZGVkIChtb3N0IGxpa2VseSBjb21wcmVzc2VkKSwg dGhlbiBkb24ndCBzZW5kIGl0cyBsZW5ndGggdG8gdGhlIHBsdWdpbiwKKyAgICAvLyB3aGljaCBp cyBvbmx5IGludGVyZXN0ZWQgaW4gdGhlIGRlY29kZWQgbGVuZ3RoLCBub3QgeWV0IGtub3duIGF0 IHRoZSBtb21lbnQuCisgICAgLy8gPHJkYXI6Ly9wcm9ibGVtLzQ0NzA1OTk+IHRyYWNrcyBhIHJl cXVlc3QgZm9yIC1bTlNVUkxSZXNwb25zZSBleHBlY3RlZENvbnRlbnRMZW5ndGhdIHRvIGluY29y cG9yYXRlIHRoaXMgbG9naWMuCisgICAgU3RyaW5nIGNvbnRlbnRFbmNvZGluZyA9IHJlc3BvbnNl Lmh0dHBIZWFkZXJGaWVsZCgiQ29udGVudC1FbmNvZGluZyIpOworICAgIGlmICghY29udGVudEVu Y29kaW5nLmlzTnVsbCgpICYmIGNvbnRlbnRFbmNvZGluZyAhPSAiaWRlbnRpdHkiKQorICAgICAg ICBleHBlY3RlZENvbnRlbnRMZW5ndGggPSAtMTsKKworICAgIHJldHVybiBoZWFkZXJzOworfQor CiB2b2lkIFBsdWdpblZpZXc6OlN0cmVhbTo6ZGlkUmVjZWl2ZVJlc3BvbnNlKE5ldHNjYXBlUGx1 Z0luU3RyZWFtTG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCiB7CiAg ICAgLy8gQ29tcHV0ZSB0aGUgc3RyZWFtIHJlbGF0ZWQgZGF0YSBmcm9tIHRoZSByZXNvdXJjZSBy ZXNwb25zZS4KQEAgLTE0NywzMyArMTgwLDcgQEAgdm9pZCBQbHVnaW5WaWV3OjpTdHJlYW06OmRp ZFJlY2VpdmVSZXNwb25zZShOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlciosIGNvbnN0IFIKICAg ICBjb25zdCBTdHJpbmcmIG1pbWVUeXBlID0gcmVzcG9uc2UubWltZVR5cGUoKTsKICAgICBsb25n IGxvbmcgZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0gcmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVu Z3RoKCk7CiAgICAgCi0gICAgU3RyaW5nIGhlYWRlcnM7Ci0gICAgaWYgKHJlc3BvbnNlLmlzSFRU UCgpKSB7Ci0gICAgICAgIFZlY3RvcjxVQ2hhcj4gc3RyaW5nQnVpbGRlcjsKLSAgICAgICAgU3Ry aW5nIHNlcGFyYXRvcigiOiAiKTsKLQotICAgICAgICBTdHJpbmcgc3RhdHVzTGluZSA9IFN0cmlu Zzo6Zm9ybWF0KCJIVFRQICVkICIsIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkpOwotICAgICAg ICBzdHJpbmdCdWlsZGVyLmFwcGVuZChzdGF0dXNMaW5lLmNoYXJhY3RlcnMoKSwgc3RhdHVzTGlu ZS5sZW5ndGgoKSk7Ci0gICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5kKHJlc3BvbnNlLmh0dHBT dGF0dXNUZXh0KCkuY2hhcmFjdGVycygpLCByZXNwb25zZS5odHRwU3RhdHVzVGV4dCgpLmxlbmd0 aCgpKTsKLSAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoJ1xuJyk7Ci0KLSAgICAgICAgSFRU UEhlYWRlck1hcDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gcmVzcG9uc2UuaHR0cEhlYWRlckZpZWxk cygpLmVuZCgpOwotICAgICAgICBmb3IgKEhUVFBIZWFkZXJNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gcmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkcygpLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkg ewotICAgICAgICAgICAgc3RyaW5nQnVpbGRlci5hcHBlbmQoaXQtPmZpcnN0LmNoYXJhY3RlcnMo KSwgaXQtPmZpcnN0Lmxlbmd0aCgpKTsKLSAgICAgICAgICAgIHN0cmluZ0J1aWxkZXIuYXBwZW5k KHNlcGFyYXRvci5jaGFyYWN0ZXJzKCksIHNlcGFyYXRvci5sZW5ndGgoKSk7Ci0gICAgICAgICAg ICBzdHJpbmdCdWlsZGVyLmFwcGVuZChpdC0+c2Vjb25kLmNoYXJhY3RlcnMoKSwgaXQtPnNlY29u ZC5sZW5ndGgoKSk7Ci0gICAgICAgICAgICBzdHJpbmdCdWlsZGVyLmFwcGVuZCgnXG4nKTsKLSAg ICAgICAgfQotCi0gICAgICAgIGhlYWRlcnMgPSBTdHJpbmc6OmFkb3B0KHN0cmluZ0J1aWxkZXIp OwotCi0gICAgICAgIC8vIElmIHRoZSBjb250ZW50IGlzIGVuY29kZWQgKG1vc3QgbGlrZWx5IGNv bXByZXNzZWQpLCB0aGVuIGRvbid0IHNlbmQgaXRzIGxlbmd0aCB0byB0aGUgcGx1Z2luLAotICAg ICAgICAvLyB3aGljaCBpcyBvbmx5IGludGVyZXN0ZWQgaW4gdGhlIGRlY29kZWQgbGVuZ3RoLCBu b3QgeWV0IGtub3duIGF0IHRoZSBtb21lbnQuCi0gICAgICAgIC8vIDxyZGFyOi8vcHJvYmxlbS80 NDcwNTk5PiB0cmFja3MgYSByZXF1ZXN0IGZvciAtW05TVVJMUmVzcG9uc2UgZXhwZWN0ZWRDb250 ZW50TGVuZ3RoXSB0byBpbmNvcnBvcmF0ZSB0aGlzIGxvZ2ljLgotICAgICAgICBTdHJpbmcgY29u dGVudEVuY29kaW5nID0gcmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKCJDb250ZW50LUVuY29kaW5n Iik7Ci0gICAgICAgIGlmICghY29udGVudEVuY29kaW5nLmlzTnVsbCgpICYmIGNvbnRlbnRFbmNv ZGluZyAhPSAiaWRlbnRpdHkiKQotICAgICAgICAgICAgZXhwZWN0ZWRDb250ZW50TGVuZ3RoID0g LTE7Ci0gICAgfQorICAgIFN0cmluZyBoZWFkZXJzID0gYnVpbGRIVFRQSGVhZGVycyhyZXNwb25z ZSwgZXhwZWN0ZWRDb250ZW50TGVuZ3RoKTsKIAogICAgIHVpbnQzMl90IHN0cmVhbUxlbmd0aCA9 IDA7CiAgICAgaWYgKGV4cGVjdGVkQ29udGVudExlbmd0aCA+IDApCkBAIC0yMDMsOSArMjEwLDEy IEBAIHZvaWQgUGx1Z2luVmlldzo6U3RyZWFtOjpkaWRGYWlsKE5ldHNjYXBlUGx1Z0luU3RyZWFt TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VFcnJvCiB2b2lkIFBsdWdpblZpZXc6OlN0cmVhbTo6ZGlk RmluaXNoTG9hZGluZyhOZXRzY2FwZVBsdWdJblN0cmVhbUxvYWRlciopCiB7CiAgICAgLy8gQ2Fs bGluZyBzdHJlYW1EaWRGaW5pc2hMb2FkaW5nIGNvdWxkIGNhdXNlIHVzIHRvIGJlIGRlbGV0ZWQs IHNvIHdlIGhvbGQgb24gdG8gYSByZWZlcmVuY2UgaGVyZS4KLSAgICBSZWZQdHI8U3RyZWFtPiBw cm90ZWN0KHRoaXMpOworICAgIFJlZlB0cjxTdHJlYW0+IHByb3RlY3RTdHJlYW0odGhpcyk7CiAK KyAgICAvLyBQcm90ZWN0IHRoZSBwbHVnLWluIHdoaWxlIHdlJ3JlIGNhbGxpbmcgaW50byBpdC4K KyAgICBOUFJ1bnRpbWVPYmplY3RNYXA6OlBsdWdpblByb3RlY3RvciBwbHVnaW5Qcm90ZWN0b3Io Jm1fcGx1Z2luVmlldy0+bV9ucFJ1bnRpbWVPYmplY3RNYXApOwogICAgIG1fcGx1Z2luVmlldy0+ bV9wbHVnaW4tPnN0cmVhbURpZEZpbmlzaExvYWRpbmcobV9zdHJlYW1JRCk7CisKICAgICBtX3Bs dWdpblZpZXctPnJlbW92ZVN0cmVhbSh0aGlzKTsKICAgICBtX3BsdWdpblZpZXcgPSAwOwogfQpA QCAtMjUzLDYgKzI2MywzNyBAQCBGcmFtZSogUGx1Z2luVmlldzo6ZnJhbWUoKQogICAgIHJldHVy biBtX3BsdWdpbkVsZW1lbnQtPmRvY3VtZW50KCktPmZyYW1lKCk7CiB9CiAKK3ZvaWQgUGx1Z2lu Vmlldzo6bWFudWFsTG9hZERpZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNl JiByZXNwb25zZSkKK3sKKyAgICAvLyBDb21wdXRlIHRoZSBzdHJlYW0gcmVsYXRlZCBkYXRhIGZy b20gdGhlIHJlc291cmNlIHJlc3BvbnNlLgorICAgIGNvbnN0IEtVUkwmIHJlc3BvbnNlVVJMID0g cmVzcG9uc2UudXJsKCk7CisgICAgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSA9IHJlc3BvbnNlLm1p bWVUeXBlKCk7CisgICAgbG9uZyBsb25nIGV4cGVjdGVkQ29udGVudExlbmd0aCA9IHJlc3BvbnNl LmV4cGVjdGVkQ29udGVudExlbmd0aCgpOworICAgIAorICAgIFN0cmluZyBoZWFkZXJzID0gYnVp bGRIVFRQSGVhZGVycyhyZXNwb25zZSwgZXhwZWN0ZWRDb250ZW50TGVuZ3RoKTsKKyAgICAKKyAg ICB1aW50MzJfdCBzdHJlYW1MZW5ndGggPSAwOworICAgIGlmIChleHBlY3RlZENvbnRlbnRMZW5n dGggPiAwKQorICAgICAgICBzdHJlYW1MZW5ndGggPSBleHBlY3RlZENvbnRlbnRMZW5ndGg7CisK KyAgICBtX3BsdWdpbi0+bWFudWFsU3RyZWFtRGlkUmVjZWl2ZVJlc3BvbnNlKHJlc3BvbnNlVVJM LCBzdHJlYW1MZW5ndGgsIHJlc3BvbnNlLmxhc3RNb2RpZmllZERhdGUoKSwgbWltZVR5cGUsIGhl YWRlcnMpOworfQorCit2b2lkIFBsdWdpblZpZXc6Om1hbnVhbExvYWREaWRSZWNlaXZlRGF0YShj b25zdCBjaGFyKiBieXRlcywgaW50IGxlbmd0aCkKK3sKKyAgICBtX3BsdWdpbi0+bWFudWFsU3Ry ZWFtRGlkUmVjZWl2ZURhdGEoYnl0ZXMsIGxlbmd0aCk7Cit9CisKK3ZvaWQgUGx1Z2luVmlldzo6 bWFudWFsTG9hZERpZEZpbmlzaExvYWRpbmcoKQoreworICAgIG1fcGx1Z2luLT5tYW51YWxTdHJl YW1EaWRGaW5pc2hMb2FkaW5nKCk7Cit9CisKK3ZvaWQgUGx1Z2luVmlldzo6bWFudWFsTG9hZERp ZEZhaWwoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCit7CisgICAgbV9wbHVnaW4tPm1hbnVh bFN0cmVhbURpZEZhaWwoZXJyb3IuaXNDYW5jZWxsYXRpb24oKSk7Cit9CisgICAgCiB2b2lkIFBs dWdpblZpZXc6OmluaXRpYWxpemVQbHVnaW4oKQogewogICAgIGlmIChtX2lzSW5pdGlhbGl6ZWQp CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmggYi9X ZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKaW5kZXggYzBlMDNmMGRhZTBj MGNkNTYwZGRiY2UzMGE4MTQ4YjJmMmY4ZjBhMi4uMDY3NjM4MGRjNjk1YTZiNThlNWNiYzQzNjVj ZjllNGI0YTdhNjIxNyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luVmlldy5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuaApA QCAtNTYsNiArNTYsMTEgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc0JlaW5nRGVzdHJveWVkKCkg Y29uc3QgeyByZXR1cm4gbV9pc0JlaW5nRGVzdHJveWVkOyB9CiAKKyAgICB2b2lkIG1hbnVhbExv YWREaWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYpOwor ICAgIHZvaWQgbWFudWFsTG9hZERpZFJlY2VpdmVEYXRhKGNvbnN0IGNoYXIqIGJ5dGVzLCBpbnQg bGVuZ3RoKTsKKyAgICB2b2lkIG1hbnVhbExvYWREaWRGaW5pc2hMb2FkaW5nKCk7CisgICAgdm9p ZCBtYW51YWxMb2FkRGlkRmFpbChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJik7CisgICAg CiBwcml2YXRlOgogICAgIFBsdWdpblZpZXcoV2ViQ29yZTo6SFRNTFBsdWdJbkVsZW1lbnQqLCBQ YXNzUmVmUHRyPFBsdWdpbj4sIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFyYW1ldGVycyk7 CiAgICAgdmlydHVhbCB+UGx1Z2luVmlldygpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggNjJi MzA3ODRlNGQ4NzkzOTkxNTkwMWQ2ZjZjNTA0YTg0ZGRhNWM3NS4uNzlmYjJlODM4OWIyYTg2NWQz OTQ0YzYyY2UxMTczYTkwYTEzMGJmMSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCkBAIC02Myw2ICs2 MywxNiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK K1dlYkZyYW1lTG9hZGVyQ2xpZW50OjpXZWJGcmFtZUxvYWRlckNsaWVudChXZWJGcmFtZSogZnJh bWUpCisgICAgOiBtX2ZyYW1lKGZyYW1lKQorICAgICwgbV9oYXNTZW50UmVzcG9uc2VUb1BsdWdp blZpZXcoZmFsc2UpCit7Cit9CisKK1dlYkZyYW1lTG9hZGVyQ2xpZW50Ojp+V2ViRnJhbWVMb2Fk ZXJDbGllbnQoKQoreworfQorICAgIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZnJhbWVM b2FkZXJEZXN0cm95ZWQoKQogewogICAgIG1fZnJhbWUtPmludmFsaWRhdGUoKTsKQEAgLTQ1MSw5 ICs0NjEsMTQgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6cmV2ZXJ0VG9Qcm92aXNpb25h bFN0YXRlKERvY3VtZW50TG9hZGVyKikKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCi12b2lk IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpzZXRNYWluRG9jdW1lbnRFcnJvcihEb2N1bWVudExvYWRl ciosIGNvbnN0IFJlc291cmNlRXJyb3ImKQordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6c2V0 TWFpbkRvY3VtZW50RXJyb3IoRG9jdW1lbnRMb2FkZXIqLCBjb25zdCBSZXNvdXJjZUVycm9yJiBl cnJvcikKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGlmICghbV9wbHVnaW5WaWV3KQor ICAgICAgICByZXR1cm47CisgICAgCisgICAgbV9wbHVnaW5WaWV3LT5tYW51YWxMb2FkRGlkRmFp bChlcnJvcik7CisgICAgbV9wbHVnaW5WaWV3ID0gMDsKKyAgICBtX2hhc1NlbnRSZXNwb25zZVRv UGx1Z2luVmlldyA9IGZhbHNlOwogfQogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojp3aWxs Q2hhbmdlRXN0aW1hdGVkUHJvZ3Jlc3MoKQpAQCAtNTEwLDcgKzUyNSwyMyBAQCB2b2lkIFdlYkZy YW1lTG9hZGVyQ2xpZW50Ojpjb21taXR0ZWRMb2FkKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNv bnN0IGNoYXIqIGRhdAogewogICAgIGNvbnN0IFN0cmluZyYgdGV4dEVuY29kaW5nID0gbG9hZGVy LT5yZXNwb25zZSgpLnRleHRFbmNvZGluZ05hbWUoKTsKICAgICAKLSAgICByZWNlaXZlZERhdGEo ZGF0YSwgbGVuZ3RoLCB0ZXh0RW5jb2RpbmcpOworICAgIGlmICghbV9wbHVnaW5WaWV3KQorICAg ICAgICByZWNlaXZlZERhdGEoZGF0YSwgbGVuZ3RoLCB0ZXh0RW5jb2RpbmcpOworCisgICAgLy8g Q2FsbGluZyByZWNlaXZlZERhdGEgZGlkIG5vdCBjcmVhdGUgdGhlIHBsdWctaW4gdmlldy4KKyAg ICBpZiAoIW1fcGx1Z2luVmlldykKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYgKCFtX2hhc1Nl bnRSZXNwb25zZVRvUGx1Z2luVmlldykgeworICAgICAgICBtX3BsdWdpblZpZXctPm1hbnVhbExv YWREaWRSZWNlaXZlUmVzcG9uc2UobV9mcmFtZS0+Y29yZUZyYW1lKCktPmxvYWRlcigpLT5kb2N1 bWVudExvYWRlcigpLT5yZXNwb25zZSgpKTsKKyAgICAgICAgLy8gbWFudWFsTG9hZERpZFJlY2Vp dmVSZXNwb25zZSBzZXRzIHVwIGEgbmV3IHN0cmVhbSB0byB0aGUgcGx1Zy1pbi4gb24gYSBmdWxs LXBhZ2UgcGx1Zy1pbiwgYSBmYWlsdXJlIGluCisgICAgICAgIC8vIHNldHRpbmcgdXAgdGhpcyBz dHJlYW0gY2FuIGNhdXNlIHRoZSBtYWluIGRvY3VtZW50IGxvYWQgdG8gYmUgY2FuY2VsbGVkLCBz ZXR0aW5nIG1fcGx1Z2luVmlldworICAgICAgICAvLyB0byBudWxsCisgICAgICAgIGlmICghbV9w bHVnaW5WaWV3KQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBtX2hhc1NlbnRSZXNwb25z ZVRvUGx1Z2luVmlldyA9IHRydWU7CisgICAgfQorICAgIG1fcGx1Z2luVmlldy0+bWFudWFsTG9h ZERpZFJlY2VpdmVEYXRhKGRhdGEsIGxlbmd0aCk7CiB9CiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OnJlY2VpdmVkRGF0YShjb25zdCBjaGFyKiBkYXRhLCBpbnQgbGVuZ3RoLCBjb25zdCBT dHJpbmcmIHRleHRFbmNvZGluZykKQEAgLTUzMSw3ICs1NjIsMTQgQEAgdm9pZCBXZWJGcmFtZUxv YWRlckNsaWVudDo6cmVjZWl2ZWREYXRhKGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgsIGNv bnN0IFN0cmkKIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZmluaXNoZWRMb2FkaW5nKERv Y3VtZW50TG9hZGVyKiBsb2FkZXIpCiB7Ci0gICAgY29tbWl0dGVkTG9hZChsb2FkZXIsIDAsIDAp OworICAgIGlmICghbV9wbHVnaW5WaWV3KSB7CisgICAgICAgIGNvbW1pdHRlZExvYWQobG9hZGVy LCAwLCAwKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIG1fcGx1Z2luVmlldy0+bWFu dWFsTG9hZERpZEZpbmlzaExvYWRpbmcoKTsKKyAgICBtX3BsdWdpblZpZXcgPSAwOworICAgIG1f aGFzU2VudFJlc3BvbnNlVG9QbHVnaW5WaWV3ID0gZmFsc2U7CiB9CiAKIHZvaWQgV2ViRnJhbWVM b2FkZXJDbGllbnQ6OnVwZGF0ZUdsb2JhbEhpc3RvcnkoKQpAQCAtODIwLDcgKzg1OCwxMCBAQCBQ YXNzUmVmUHRyPFdpZGdldD4gV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNyZWF0ZVBsdWdpbihjb25z dCBJbnRTaXplJiwgSFRNTFBsdWdJbgogCiB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpyZWRp cmVjdERhdGFUb1BsdWdpbihXaWRnZXQqIHBsdWdpbldpZGdldCkKIHsKLSAgICBub3RJbXBsZW1l bnRlZCgpOworICAgIEFTU0VSVCghbV9wbHVnaW5WaWV3KTsKKyAgICBBU1NFUlQocGx1Z2luV2lk Z2V0KTsKKyAgICAKKyAgICBtX3BsdWdpblZpZXcgPSBzdGF0aWNfY2FzdDxQbHVnaW5WaWV3Kj4o cGx1Z2luV2lkZ2V0KTsKIH0KIAogUGFzc1JlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpjcmVhdGVKYXZhQXBwbGV0V2lkZ2V0KGNvbnN0IEludFNpemUmLCBIVE1MQXBwbGV0RWxl bWVudCosIGNvbnN0IEtVUkwmIGJhc2VVUkwsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXJhbU5h bWVzLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1WYWx1ZXMpCmRpZmYgLS1naXQgYS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuaCBiL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCmlu ZGV4IDY5OTFmNmM4ZjRhZjRlYjVjMDBmMjgxNWM0ZGQzYTdmZmYyMjVlNDYuLjU4MzQ3YTUxYzMz NjE4M2IwNWE0OTBmYzlmMDkxNWUyMTdlOTUyZTUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCisrKyBiL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5oCkBAIC0zMCwx NCArMzAsMTMgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKK2NsYXNzIFBsdWdpblZpZXc7CiBj bGFzcyBXZWJGcmFtZTsKLQorICAgIAogY2xhc3MgV2ViRnJhbWVMb2FkZXJDbGllbnQgOiBwdWJs aWMgV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnQgewogcHVibGljOgotICAgIFdlYkZyYW1lTG9h ZGVyQ2xpZW50KFdlYkZyYW1lKiBmcmFtZSkKLSAgICAgICAgOiBtX2ZyYW1lKGZyYW1lKQotICAg IHsKLSAgICB9CisgICAgV2ViRnJhbWVMb2FkZXJDbGllbnQoV2ViRnJhbWUqKTsKKyAgICB+V2Vi RnJhbWVMb2FkZXJDbGllbnQoKTsKIAogICAgIFdlYkZyYW1lKiB3ZWJGcmFtZSgpIGNvbnN0IHsg cmV0dXJuIG1fZnJhbWU7IH0KIApAQCAtMjA1LDggKzIwNCwxMSBAQCBwcml2YXRlOgogICAgIHZp cnR1YWwgYm9vbCBzaG91bGRVc2VQbHVnaW5Eb2N1bWVudChjb25zdCBXZWJDb3JlOjpTdHJpbmcm IC8qbWltZVR5cGUqLykgY29uc3Q7CiAgICAgCiAgICAgdm9pZCByZWNlaXZlZERhdGEoY29uc3Qg Y2hhciogZGF0YSwgaW50IGxlbmd0aCwgY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB0ZXh0RW5jb2Rp bmcpOwotCisgICAgCiAgICAgV2ViRnJhbWUqIG1fZnJhbWU7CisgICAgCisgICAgUmVmUHRyPFBs dWdpblZpZXc+IG1fcGx1Z2luVmlldzsKKyAgICBib29sIG1faGFzU2VudFJlc3BvbnNlVG9QbHVn aW5WaWV3OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==