99308 2012-10-15 04:45:12 -0700 MediaStream API: Add better RTCPeerConnectionHandler creation logic 2012-10-18 05:39:47 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 56459 1 tommyw tommyw abarth eric.carlson eric feature-media-reviews hta webkit.review.bot oldest_to_newest 741950 0 tommyw 2012-10-15 04:45:12 -0700 Make sure that if the RTCPeerConnectionHandler can't be fully initialized let the RTCPeerConnection constructor throw an exception. 741953 1 168680 tommyw 2012-10-15 04:52:26 -0700 Created attachment 168680 Patch 743968 2 169111 tommyw 2012-10-17 00:48:47 -0700 Created attachment 169111 Patch 744280 3 169111 abarth 2012-10-17 08:53:43 -0700 Comment on attachment 169111 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169111&action=review > Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:71 > + return adoptPtr<RTCPeerConnectionHandler>(0); You can just return nullptr (or at least PassOwnPtr<RTCPeerConnectionHandler>() if that doesn't work). 745092 4 169370 tommyw 2012-10-18 02:07:13 -0700 Created attachment 169370 Patch for landing 745094 5 169371 tommyw 2012-10-18 02:10:44 -0700 Created attachment 169371 Patch for landing 745122 6 tommyw 2012-10-18 03:18:48 -0700 (In reply to comment #3) > (From update of attachment 169111 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=169111&action=review > > > Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:71 > > + return adoptPtr<RTCPeerConnectionHandler>(0); > > You can just return nullptr (or at least PassOwnPtr<RTCPeerConnectionHandler>() if that doesn't work). Ahh, that's the reason the old return 0; doesn't work anymore. Nice. 745127 7 169371 webkit.review.bot 2012-10-18 03:23:49 -0700 Comment on attachment 169371 Patch for landing Clearing flags on attachment: 169371 Committed r131721: <http://trac.webkit.org/changeset/131721> 168680 2012-10-15 04:52:26 -0700 2012-10-17 00:48:43 -0700 Patch bug-99308-20121015135116.patch text/plain 7775 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxMjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjEyN2MzNWI4NTgxYTlh MWFkZmFhOGRmOTU1YTE4ZDc1YWRkY2QzYS4uOWQyN2EwZjgxNmE5MzM4N2E4N2NiYmI3NTI4ZDU5 MTFkMzE2NTRjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDEyLTEwLTE1ICBUb21t eSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgorCisgICAgICAgIE1lZGlhU3RyZWFt IEFQSTogQWRkIGJldHRlciBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXIgY3JlYXRpb24gbG9naWMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5MzA4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBtYWtlcyBzdXJlIHRoYXQgaWYgdGhlIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlciBjYW4ndCBi ZSBmdWxseSBpbml0aWFsaXplZC9jcmVhdGVkCisgICAgICAgIHRoZSBSVENQZWVyQ29ubmVjdGlv biBjb25zdHJ1Y3RvciB0aHJvd3MgYW4gZXhjZXB0aW9uLgorCisgICAgICAgIE5vdCBmdWxsIHRl c3RhYmxlLCBleGlzdGluZyB0ZXN0cyBjb3ZlciB0aGUgbm9ybWFsIGNhc2UgdGhvdWdoLgorCisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5k bGVyQ2hyb21pdW06OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtKToKKyAgICAgICAg KFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpjcmVhdGVXZWJIYW5k bGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVt Ojppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxl ckNocm9taXVtOjpjcmVhdGVPZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVj dGlvbkhhbmRsZXJDaHJvbWl1bTo6Y3JlYXRlQW5zd2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlJU Q1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZXRMb2NhbERlc2NyaXB0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZXRSZW1v dGVEZXNjcmlwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXJDaHJvbWl1bTo6dXBkYXRlSWNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0 aW9uSGFuZGxlckNocm9taXVtOjphZGRJY2VDYW5kaWRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6 UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmxvY2FsRGVzY3JpcHRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnJlbW90ZURl c2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtOjphZGRTdHJlYW0pOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW06OnJlbW92ZVN0cmVhbSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVy Q29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6Z2V0U3RhdHMpOgorICAgICAgICAoV2ViQ29yZTo6 UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnN0b3ApOgorICAgICAgICAqIHBsYXRm b3JtL21lZGlhc3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVt Lmg6CisgICAgICAgIChSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bSk6CisKIDIwMTIt MTAtMTIgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IE5NSSByZW1vdmUgaGFuZCBtYWRlIG9iamVjdCBidWlsZGVycyB3aXRo IGF1dG9tYXRpYyBidWlsZGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0uY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNv bm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0uY3BwCmluZGV4IDRlNGUxMzE3NTkzMzE0MTY4NWNlMWRj MmIxMDNjMGFlMjhlODdlNDIuLmQ2NTQyYTkxNzk4YTk0Y2QxZjU2ZWI1NTE2Njg1Y2JiYzg1NDJk MDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2Nocm9t aXVtL1JUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXJDaHJvbWl1bS5jcHAKQEAgLTYyLDEyMyArNjIsOTIgQEAgV2ViS2l0OjpXZWJSVENQZWVyQ29u bmVjdGlvbkhhbmRsZXIqIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjp0b1dlYlJU Q1AKIAogUGFzc093blB0cjxSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXI+IFJUQ1BlZXJDb25uZWN0 aW9uSGFuZGxlcjo6Y3JlYXRlKFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNsaWVudCogY2xpZW50 KQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hy b21pdW0oY2xpZW50KSk7CisgICAgQVNTRVJUKGNsaWVudCk7CisgICAgT3duUHRyPFJUQ1BlZXJD b25uZWN0aW9uSGFuZGxlckNocm9taXVtPiBoYW5kbGVyID0gYWRvcHRQdHIobmV3IFJUQ1BlZXJD b25uZWN0aW9uSGFuZGxlckNocm9taXVtKGNsaWVudCkpOworCisgICAgaWYgKCFoYW5kbGVyLT5j cmVhdGVXZWJIYW5kbGVyKCkpCisgICAgICAgIHJldHVybiBhZG9wdFB0cjxSVENQZWVyQ29ubmVj dGlvbkhhbmRsZXI+KDApOworCisgICAgcmV0dXJuIGhhbmRsZXIucmVsZWFzZSgpOwogfQogCiBS VENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVy Q2hyb21pdW0oUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2xpZW50KiBjbGllbnQpCiAgICAgOiBt X2NsaWVudChjbGllbnQpCiB7Ci0gICAgQVNTRVJUKG1fY2xpZW50KTsKLSAgICBtX3dlYkhhbmRs ZXIgPSBhZG9wdFB0cihXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmNyZWF0ZVJUQ1BlZXJD b25uZWN0aW9uSGFuZGxlcih0aGlzKSk7CiB9CiAKIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtOjp+UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0oKQogewogfQogCi1ib29s IFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjppbml0aWFsaXplKFBhc3NSZWZQdHI8 UlRDQ29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiwgUGFzc1JlZlB0cjxNZWRpYUNvbnN0cmFp bnRzPiBjb25zdHJhaW50cykKK2Jvb2wgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06 OmNyZWF0ZVdlYkhhbmRsZXIoKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgbV93ZWJIYW5kbGVyID0gYWRvcHRQdHIoV2ViS2l0OjpQbGF0Zm9y bTo6Y3VycmVudCgpLT5jcmVhdGVSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXIodGhpcykpOworICAg IHJldHVybiBtX3dlYkhhbmRsZXI7Cit9CiAKK2Jvb2wgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVy Q2hyb21pdW06OmluaXRpYWxpemUoUGFzc1JlZlB0cjxSVENDb25maWd1cmF0aW9uPiBjb25maWd1 cmF0aW9uLCBQYXNzUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IGNvbnN0cmFpbnRzKQorewogICAg IHJldHVybiBtX3dlYkhhbmRsZXItPmluaXRpYWxpemUoY29uZmlndXJhdGlvbiwgY29uc3RyYWlu dHMpOwogfQogCiB2b2lkIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpjcmVhdGVP ZmZlcihQYXNzUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvblJlcXVlc3Q+IHJlcXVlc3QsIFBh c3NSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4gY29uc3RyYWludHMpCiB7Ci0gICAgLy8gRklYTUU6 IFNob3VsZCB0aGUgZXJyb3IgY2FsbGJhY2sgYmUgdHJpZ2dlcmVkIGhlcmU/Ci0gICAgaWYgKCFt X3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fd2ViSGFuZGxlci0+Y3JlYXRl T2ZmZXIocmVxdWVzdCwgY29uc3RyYWludHMpOwogfQogCiB2b2lkIFJUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtOjpjcmVhdGVBbnN3ZXIoUGFzc1JlZlB0cjxSVENTZXNzaW9uRGVzY3Jp cHRpb25SZXF1ZXN0PiByZXF1ZXN0LCBQYXNzUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IGNvbnN0 cmFpbnRzKQogewotICAgIC8vIEZJWE1FOiBTaG91bGQgdGhlIGVycm9yIGNhbGxiYWNrIGJlIHRy aWdnZXJlZCBoZXJlPwotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm47Ci0K ICAgICBtX3dlYkhhbmRsZXItPmNyZWF0ZUFuc3dlcihyZXF1ZXN0LCBjb25zdHJhaW50cyk7CiB9 CiAKIHZvaWQgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnNldExvY2FsRGVzY3Jp cHRpb24oUGFzc1JlZlB0cjxSVENWb2lkUmVxdWVzdD4gcmVxdWVzdCwgUGFzc1JlZlB0cjxSVENT ZXNzaW9uRGVzY3JpcHRpb25EZXNjcmlwdG9yPiBzZXNzaW9uRGVzY3JpcHRpb24pCiB7Ci0gICAg aWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fd2ViSGFuZGxlci0+ c2V0TG9jYWxEZXNjcmlwdGlvbihyZXF1ZXN0LCBzZXNzaW9uRGVzY3JpcHRpb24pOwogfQogCiB2 b2lkIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZXRSZW1vdGVEZXNjcmlwdGlv bihQYXNzUmVmUHRyPFJUQ1ZvaWRSZXF1ZXN0PiByZXF1ZXN0LCBQYXNzUmVmUHRyPFJUQ1Nlc3Np b25EZXNjcmlwdGlvbkRlc2NyaXB0b3I+IHNlc3Npb25EZXNjcmlwdGlvbikKIHsKLSAgICBpZiAo IW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5zZXRS ZW1vdGVEZXNjcmlwdGlvbihyZXF1ZXN0LCBzZXNzaW9uRGVzY3JpcHRpb24pOwogfQogCiBib29s IFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjp1cGRhdGVJY2UoUGFzc1JlZlB0cjxS VENDb25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uLCBQYXNzUmVmUHRyPE1lZGlhQ29uc3RyYWlu dHM+IGNvbnN0cmFpbnRzKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0KICAgICByZXR1cm4gbV93ZWJIYW5kbGVyLT51cGRhdGVJQ0UoY29uZmlndXJh dGlvbiwgY29uc3RyYWludHMpOwogfQogCiBib29sIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtOjphZGRJY2VDYW5kaWRhdGUoUGFzc1JlZlB0cjxSVENJY2VDYW5kaWRhdGVEZXNjcmlw dG9yPiBpY2VDYW5kaWRhdGUpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLQogICAgIHJldHVybiBtX3dlYkhhbmRsZXItPmFkZElDRUNhbmRpZGF0ZShp Y2VDYW5kaWRhdGUpOwogfQogCiBQYXNzUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbkRlc2Ny aXB0b3I+IFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpsb2NhbERlc2NyaXB0aW9u KCkKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuIDA7Ci0KICAgICBy ZXR1cm4gbV93ZWJIYW5kbGVyLT5sb2NhbERlc2NyaXB0aW9uKCk7CiB9CiAKIFBhc3NSZWZQdHI8 UlRDU2Vzc2lvbkRlc2NyaXB0aW9uRGVzY3JpcHRvcj4gUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVy Q2hyb21pdW06OnJlbW90ZURlc2NyaXB0aW9uKCkKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikK LSAgICAgICAgcmV0dXJuIDA7Ci0KICAgICByZXR1cm4gbV93ZWJIYW5kbGVyLT5yZW1vdGVEZXNj cmlwdGlvbigpOwogfQogCiBib29sIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjph ZGRTdHJlYW0oUGFzc1JlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+IG1lZGlhU3RyZWFtLCBQ YXNzUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IGNvbnN0cmFpbnRzKQogewotICAgIGlmICghbV93 ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICByZXR1cm4gbV93ZWJIYW5k bGVyLT5hZGRTdHJlYW0obWVkaWFTdHJlYW0sIGNvbnN0cmFpbnRzKTsKIH0KIAogdm9pZCBSVENQ ZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6cmVtb3ZlU3RyZWFtKFBhc3NSZWZQdHI8TWVk aWFTdHJlYW1EZXNjcmlwdG9yPiBtZWRpYVN0cmVhbSkKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxl cikKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5yZW1vdmVTdHJlYW0obWVk aWFTdHJlYW0pOwogfQogCiB2b2lkIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpn ZXRTdGF0cyhQYXNzUmVmUHRyPFJUQ1N0YXRzUmVxdWVzdD4gcmVxdWVzdCkKIHsKLSAgICBpZiAo IW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5nZXRT dGF0cyhyZXF1ZXN0KTsKIH0KIAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1 bTo6c3RvcCgpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQog ICAgIG1fd2ViSGFuZGxlci0+c3RvcCgpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJD aHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0v UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0uaAppbmRleCBiNjY5YjI1NmFlYTQwMTBk Y2NjYTU4YjBmMTg2ZWIxMWE2Njg0MjYyLi5iZGJlN2NjNTYwNmI3ZWI3MTYwNjgxZWQ4NGI4N2Fl NWNmMWMwZGViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtLmgKQEAgLTUyLDYgKzUyLDggQEAgcHVibGljOgogICAgIGV4cGxpY2l0 IFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtKFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxl ckNsaWVudCopOwogICAgIHZpcnR1YWwgflJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVt KCk7CiAKKyAgICBib29sIGNyZWF0ZVdlYkhhbmRsZXIoKTsKKwogICAgIHZpcnR1YWwgYm9vbCBp bml0aWFsaXplKFBhc3NSZWZQdHI8UlRDQ29uZmlndXJhdGlvbj4sIFBhc3NSZWZQdHI8TWVkaWFD b25zdHJhaW50cz4pIE9WRVJSSURFOwogCiAgICAgdmlydHVhbCB2b2lkIGNyZWF0ZU9mZmVyKFBh c3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uUmVxdWVzdD4sIFBhc3NSZWZQdHI8TWVkaWFD b25zdHJhaW50cz4pIE9WRVJSSURFOwo= 169111 2012-10-17 00:48:47 -0700 2012-10-17 08:53:43 -0700 Patch bug-99308-20121017094734.patch text/plain 9002 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjk0MzhkMWZlZGVhNzFk OGUxZDVlNTZiYWQxYWM4MGIzYjEwMjFkYS4uZjVmNzUxOTdiZmRhODAyM2RkNWM2ZWVkNzE0MmVh Njc0MDU0NzM3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTEwLTE3ICBUb21t eSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgorCisgICAgICAgIE1lZGlhU3RyZWFt IEFQSTogQWRkIGJldHRlciBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXIgY3JlYXRpb24gbG9naWMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5MzA4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBtYWtlcyBzdXJlIHRoYXQgaWYgdGhlIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlciBjYW4ndCBi ZSBmdWxseSBpbml0aWFsaXplZC9jcmVhdGVkCisgICAgICAgIHRoZSBSVENQZWVyQ29ubmVjdGlv biBjb25zdHJ1Y3RvciB0aHJvd3MgYW4gZXhjZXB0aW9uLgorCisgICAgICAgIE5vdCBmdWxsIHRl c3RhYmxlLCBleGlzdGluZyB0ZXN0cyBjb3ZlciB0aGUgbm9ybWFsIGNhc2UgdGhvdWdoLgorCisg ICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5k bGVyQ2hyb21pdW06OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtKToKKyAgICAgICAg KFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpjcmVhdGVXZWJIYW5k bGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVt Ojppbml0aWFsaXplKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxl ckNocm9taXVtOjpjcmVhdGVPZmZlcik6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVj dGlvbkhhbmRsZXJDaHJvbWl1bTo6Y3JlYXRlQW5zd2VyKToKKyAgICAgICAgKFdlYkNvcmU6OlJU Q1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZXRMb2NhbERlc2NyaXB0aW9uKToKKyAg ICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZXRSZW1v dGVEZXNjcmlwdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXJDaHJvbWl1bTo6dXBkYXRlSWNlKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0 aW9uSGFuZGxlckNocm9taXVtOjphZGRJY2VDYW5kaWRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6 UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmxvY2FsRGVzY3JpcHRpb24pOgorICAg ICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnJlbW90ZURl c2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtOjphZGRTdHJlYW0pOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW06OnJlbW92ZVN0cmVhbSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVy Q29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6Z2V0U3RhdHMpOgorICAgICAgICAoV2ViQ29yZTo6 UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06Om9wZW5EYXRhQ2hhbm5lbCk6CisgICAg ICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6c2VuZFN0cmlu Z0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21p dW06OnNlbmRSYXdEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFu ZGxlckNocm9taXVtOjpjbG9zZURhdGFDaGFubmVsKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1Bl ZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzdG9wKToKKyAgICAgICAgKiBwbGF0Zm9ybS9t ZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bS5oOgor ICAgICAgICAoUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0pOgorCiAyMDEyLTEwLTE3 ICBEb3VnbGFzIFN0b2Nrd2VsbCAgPGRzdG9ja3dlbGxAY2hyb21pdW0ub3JnPgogCiAgICAgICAg IENvbnRlbnQgb2YgcmVwbGFjZWQgZWxlbWVudHMgc2hvdWxkIGJlIHRyaW1tZWQgdG8gdGhlIGNv bnRlbnQgZWRnZSBjdXJ2ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21l ZGlhc3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25u ZWN0aW9uSGFuZGxlckNocm9taXVtLmNwcAppbmRleCA2MWZiMWM0OGFkMGQwZDQyM2RkYWRiYTg4 NDNkYTZlODRiNjBhN2FiLi5hMTVmMzM0MGZmZGNmMWFkZjMyYzg5Nzc3MDkwYWVkZGMyMjFkNGFm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJvbWl1 bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVy Q2hyb21pdW0uY3BwCkBAIC02NCwxNTUgKzY0LDExMiBAQCBXZWJLaXQ6OldlYlJUQ1BlZXJDb25u ZWN0aW9uSGFuZGxlciogUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnRvV2ViUlRD UAogCiBQYXNzT3duUHRyPFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlcj4gUlRDUGVlckNvbm5lY3Rp b25IYW5kbGVyOjpjcmVhdGUoUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2xpZW50KiBjbGllbnQp CiB7Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJv bWl1bShjbGllbnQpKTsKKyAgICBBU1NFUlQoY2xpZW50KTsKKyAgICBPd25QdHI8UlRDUGVlckNv bm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0+IGhhbmRsZXIgPSBhZG9wdFB0cihuZXcgUlRDUGVlckNv bm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0oY2xpZW50KSk7CisKKyAgICBpZiAoIWhhbmRsZXItPmNy ZWF0ZVdlYkhhbmRsZXIoKSkKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyPFJUQ1BlZXJDb25uZWN0 aW9uSGFuZGxlcj4oMCk7CisKKyAgICByZXR1cm4gaGFuZGxlci5yZWxlYXNlKCk7CiB9CiAKIFJU Q1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJD aHJvbWl1bShSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDbGllbnQqIGNsaWVudCkKICAgICA6IG1f Y2xpZW50KGNsaWVudCkKIHsKLSAgICBBU1NFUlQobV9jbGllbnQpOwotICAgIG1fd2ViSGFuZGxl ciA9IGFkb3B0UHRyKFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+Y3JlYXRlUlRDUGVlckNv bm5lY3Rpb25IYW5kbGVyKHRoaXMpKTsKIH0KIAogUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hy b21pdW06On5SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bSgpCiB7CiB9CiAKLWJvb2wg UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmluaXRpYWxpemUoUGFzc1JlZlB0cjxS VENDb25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uLCBQYXNzUmVmUHRyPE1lZGlhQ29uc3RyYWlu dHM+IGNvbnN0cmFpbnRzKQorYm9vbCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6 Y3JlYXRlV2ViSGFuZGxlcigpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKKyAgICBtX3dlYkhhbmRsZXIgPSBhZG9wdFB0cihXZWJLaXQ6OlBsYXRmb3Jt OjpjdXJyZW50KCktPmNyZWF0ZVJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlcih0aGlzKSk7CisgICAg cmV0dXJuIG1fd2ViSGFuZGxlcjsKK30KIAorYm9vbCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJD aHJvbWl1bTo6aW5pdGlhbGl6ZShQYXNzUmVmUHRyPFJUQ0NvbmZpZ3VyYXRpb24+IGNvbmZpZ3Vy YXRpb24sIFBhc3NSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4gY29uc3RyYWludHMpCit7CiAgICAg cmV0dXJuIG1fd2ViSGFuZGxlci0+aW5pdGlhbGl6ZShjb25maWd1cmF0aW9uLCBjb25zdHJhaW50 cyk7CiB9CiAKIHZvaWQgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmNyZWF0ZU9m ZmVyKFBhc3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uUmVxdWVzdD4gcmVxdWVzdCwgUGFz c1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRzPiBjb25zdHJhaW50cykKIHsKLSAgICAvLyBGSVhNRTog U2hvdWxkIHRoZSBlcnJvciBjYWxsYmFjayBiZSB0cmlnZ2VyZWQgaGVyZT8KLSAgICBpZiAoIW1f d2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5jcmVhdGVP ZmZlcihyZXF1ZXN0LCBjb25zdHJhaW50cyk7CiB9CiAKIHZvaWQgUlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW06OmNyZWF0ZUFuc3dlcihQYXNzUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlw dGlvblJlcXVlc3Q+IHJlcXVlc3QsIFBhc3NSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4gY29uc3Ry YWludHMpCiB7Ci0gICAgLy8gRklYTUU6IFNob3VsZCB0aGUgZXJyb3IgY2FsbGJhY2sgYmUgdHJp Z2dlcmVkIGhlcmU/Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQog ICAgIG1fd2ViSGFuZGxlci0+Y3JlYXRlQW5zd2VyKHJlcXVlc3QsIGNvbnN0cmFpbnRzKTsKIH0K IAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6c2V0TG9jYWxEZXNjcmlw dGlvbihQYXNzUmVmUHRyPFJUQ1ZvaWRSZXF1ZXN0PiByZXF1ZXN0LCBQYXNzUmVmUHRyPFJUQ1Nl c3Npb25EZXNjcmlwdGlvbkRlc2NyaXB0b3I+IHNlc3Npb25EZXNjcmlwdGlvbikKIHsKLSAgICBp ZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5z ZXRMb2NhbERlc2NyaXB0aW9uKHJlcXVlc3QsIHNlc3Npb25EZXNjcmlwdGlvbik7CiB9CiAKIHZv aWQgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnNldFJlbW90ZURlc2NyaXB0aW9u KFBhc3NSZWZQdHI8UlRDVm9pZFJlcXVlc3Q+IHJlcXVlc3QsIFBhc3NSZWZQdHI8UlRDU2Vzc2lv bkRlc2NyaXB0aW9uRGVzY3JpcHRvcj4gc2Vzc2lvbkRlc2NyaXB0aW9uKQogewotICAgIGlmICgh bV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm47Ci0KICAgICBtX3dlYkhhbmRsZXItPnNldFJl bW90ZURlc2NyaXB0aW9uKHJlcXVlc3QsIHNlc3Npb25EZXNjcmlwdGlvbik7CiB9CiAKIGJvb2wg UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnVwZGF0ZUljZShQYXNzUmVmUHRyPFJU Q0NvbmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24sIFBhc3NSZWZQdHI8TWVkaWFDb25zdHJhaW50 cz4gY29uc3RyYWludHMpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVy biBmYWxzZTsKLQogICAgIHJldHVybiBtX3dlYkhhbmRsZXItPnVwZGF0ZUlDRShjb25maWd1cmF0 aW9uLCBjb25zdHJhaW50cyk7CiB9CiAKIGJvb2wgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hy b21pdW06OmFkZEljZUNhbmRpZGF0ZShQYXNzUmVmUHRyPFJUQ0ljZUNhbmRpZGF0ZURlc2NyaXB0 b3I+IGljZUNhbmRpZGF0ZSkKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0 dXJuIGZhbHNlOwotCiAgICAgcmV0dXJuIG1fd2ViSGFuZGxlci0+YWRkSUNFQ2FuZGlkYXRlKGlj ZUNhbmRpZGF0ZSk7CiB9CiAKIFBhc3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uRGVzY3Jp cHRvcj4gUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmxvY2FsRGVzY3JpcHRpb24o KQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm4gMDsKLQogICAgIHJl dHVybiBtX3dlYkhhbmRsZXItPmxvY2FsRGVzY3JpcHRpb24oKTsKIH0KIAogUGFzc1JlZlB0cjxS VENTZXNzaW9uRGVzY3JpcHRpb25EZXNjcmlwdG9yPiBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJD aHJvbWl1bTo6cmVtb3RlRGVzY3JpcHRpb24oKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQot ICAgICAgICByZXR1cm4gMDsKLQogICAgIHJldHVybiBtX3dlYkhhbmRsZXItPnJlbW90ZURlc2Ny aXB0aW9uKCk7CiB9CiAKIGJvb2wgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmFk ZFN0cmVhbShQYXNzUmVmUHRyPE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4gbWVkaWFTdHJlYW0sIFBh c3NSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4gY29uc3RyYWludHMpCiB7Ci0gICAgaWYgKCFtX3dl YkhhbmRsZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIHJldHVybiBtX3dlYkhhbmRs ZXItPmFkZFN0cmVhbShtZWRpYVN0cmVhbSwgY29uc3RyYWludHMpOwogfQogCiB2b2lkIFJUQ1Bl ZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpyZW1vdmVTdHJlYW0oUGFzc1JlZlB0cjxNZWRp YVN0cmVhbURlc2NyaXB0b3I+IG1lZGlhU3RyZWFtKQogewotICAgIGlmICghbV93ZWJIYW5kbGVy KQotICAgICAgICByZXR1cm47Ci0KICAgICBtX3dlYkhhbmRsZXItPnJlbW92ZVN0cmVhbShtZWRp YVN0cmVhbSk7CiB9CiAKIHZvaWQgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06Omdl dFN0YXRzKFBhc3NSZWZQdHI8UlRDU3RhdHNSZXF1ZXN0PiByZXF1ZXN0KQogewotICAgIGlmICgh bV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm47Ci0KICAgICBtX3dlYkhhbmRsZXItPmdldFN0 YXRzKHJlcXVlc3QpOwogfQogCiBib29sIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVt OjpvcGVuRGF0YUNoYW5uZWwoUGFzc1JlZlB0cjxSVENEYXRhQ2hhbm5lbERlc2NyaXB0b3I+IGRh dGFDaGFubmVsKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm4gZmFs c2U7Ci0KICAgICByZXR1cm4gbV93ZWJIYW5kbGVyLT5vcGVuRGF0YUNoYW5uZWwoZGF0YUNoYW5u ZWwpOwogfQogCiBib29sIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZW5kU3Ry aW5nRGF0YShQYXNzUmVmUHRyPFJUQ0RhdGFDaGFubmVsRGVzY3JpcHRvcj4gZGF0YUNoYW5uZWws IGNvbnN0IFN0cmluZyYgZGF0YSkKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAg cmV0dXJuIGZhbHNlOwotCiAgICAgcmV0dXJuIG1fd2ViSGFuZGxlci0+c2VuZFN0cmluZ0RhdGEo ZGF0YUNoYW5uZWwsIGRhdGEpOwogfQogCiBib29sIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtOjpzZW5kUmF3RGF0YShQYXNzUmVmUHRyPFJUQ0RhdGFDaGFubmVsRGVzY3JpcHRvcj4g ZGF0YUNoYW5uZWwsIGNvbnN0IGNoYXIqIGRhdGEsIHNpemVfdCBkYXRhTGVuZ3RoKQogewotICAg IGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICByZXR1cm4g bV93ZWJIYW5kbGVyLT5zZW5kUmF3RGF0YShkYXRhQ2hhbm5lbCwgZGF0YSwgZGF0YUxlbmd0aCk7 CiB9CiAKIHZvaWQgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmNsb3NlRGF0YUNo YW5uZWwoUGFzc1JlZlB0cjxSVENEYXRhQ2hhbm5lbERlc2NyaXB0b3I+IGRhdGFDaGFubmVsKQog ewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm47Ci0KICAgICByZXR1cm4g bV93ZWJIYW5kbGVyLT5jbG9zZURhdGFDaGFubmVsKGRhdGFDaGFubmVsKTsKIH0KIAogdm9pZCBS VENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6c3RvcCgpCiB7Ci0gICAgaWYgKCFtX3dl YkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fd2ViSGFuZGxlci0+c3RvcCgpOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJv bWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hy b21pdW0uaAppbmRleCA2ZGExMTk1N2E3YzVmODZmYjViYmU3ZDZkZGY3YWQ2ZjhhMzc4ZTBkLi4z NmU5MmQ0NDQ3ZjNjNjZjNzk0NjdhOGYyNWNiNTg4ZGQ4NmMyYTQ0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlv bkhhbmRsZXJDaHJvbWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtLmgKQEAgLTUyLDYg KzUyLDggQEAgcHVibGljOgogICAgIGV4cGxpY2l0IFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtKFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNsaWVudCopOwogICAgIHZpcnR1YWwgflJU Q1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtKCk7CiAKKyAgICBib29sIGNyZWF0ZVdlYkhh bmRsZXIoKTsKKwogICAgIHZpcnR1YWwgYm9vbCBpbml0aWFsaXplKFBhc3NSZWZQdHI8UlRDQ29u ZmlndXJhdGlvbj4sIFBhc3NSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4pIE9WRVJSSURFOwogCiAg ICAgdmlydHVhbCB2b2lkIGNyZWF0ZU9mZmVyKFBhc3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0 aW9uUmVxdWVzdD4sIFBhc3NSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4pIE9WRVJSSURFOwo= 169370 2012-10-18 02:07:13 -0700 2012-10-18 02:11:29 -0700 Patch for landing bug-99308-20121018110558.patch text/plain 8984 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk1NGU3MGE0ZTQ2ODVh MjJkMDQ0MDViZWFlYzgxZTkzMjg0MmQwNy4uZTM3MjczODNkODM0MzBhMjc1NjM5MjI2M2RkNTEw ZGEwNGM2MmYyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTEwLTE3ICBUb21t eSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgorCisgICAgICAgIE1lZGlhU3RyZWFt IEFQSTogQWRkIGJldHRlciBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXIgY3JlYXRpb24gbG9naWMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5MzA4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBUaGlzIHBhdGNoIG1h a2VzIHN1cmUgdGhhdCBpZiB0aGUgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyIGNhbid0IGJlIGZ1 bGx5IGluaXRpYWxpemVkL2NyZWF0ZWQKKyAgICAgICAgdGhlIFJUQ1BlZXJDb25uZWN0aW9uIGNv bnN0cnVjdG9yIHRocm93cyBhbiBleGNlcHRpb24uCisKKyAgICAgICAgTm90IGZ1bGwgdGVzdGFi bGUsIGV4aXN0aW5nIHRlc3RzIGNvdmVyIHRoZSBub3JtYWwgY2FzZSB0aG91Z2guCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXI6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJD aHJvbWl1bTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0pOgorICAgICAgICAoV2Vi Q29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmNyZWF0ZVdlYkhhbmRsZXIp OgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06Omlu aXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hy b21pdW06OmNyZWF0ZU9mZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtOjpjcmVhdGVBbnN3ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVl ckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnNldExvY2FsRGVzY3JpcHRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnNldFJlbW90ZURl c2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtOjp1cGRhdGVJY2UpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW06OmFkZEljZUNhbmRpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQ ZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6bG9jYWxEZXNjcmlwdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6cmVtb3RlRGVzY3Jp cHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21p dW06OmFkZFN0cmVhbSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXJDaHJvbWl1bTo6cmVtb3ZlU3RyZWFtKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25u ZWN0aW9uSGFuZGxlckNocm9taXVtOjpnZXRTdGF0cyk6CisgICAgICAgIChXZWJDb3JlOjpSVENQ ZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6b3BlbkRhdGFDaGFubmVsKToKKyAgICAgICAg KFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZW5kU3RyaW5nRGF0 YSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6 c2VuZFJhd0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVy Q2hyb21pdW06OmNsb3NlRGF0YUNoYW5uZWwpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNv bm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnN0b3ApOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlh c3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtLmg6CisgICAg ICAgIChSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bSk6CisKIDIwMTItMTAtMTggIEtl bnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFNldCBtaW4td2lkdGgg cHJvcGVydHkgaW5zdGVhZCBvZiB3aWR0aCBwcm9wZXJ0eSBmb3IgZGF0ZS90aW1lIGZpZWxkcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0v UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21p dW0uY3BwCmluZGV4IDYxZmIxYzQ4YWQwZDBkNDIzZGRhZGJhODg0M2RhNmU4NGI2MGE3YWIuLjk4 MjdmY2MxNDcxY2MxZDQyNzc0OTUzZTI1NjgxNmRkZmY1MjkyY2UgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bS5jcHAKQEAgLTY0 LDE1NSArNjQsMTEyIEBAIFdlYktpdDo6V2ViUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyKiBSVENQ ZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6dG9XZWJSVENQCiAKIFBhc3NPd25QdHI8UlRD UGVlckNvbm5lY3Rpb25IYW5kbGVyPiBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXI6OmNyZWF0ZShS VENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDbGllbnQqIGNsaWVudCkKIHsKLSAgICByZXR1cm4gYWRv cHRQdHIobmV3IFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtKGNsaWVudCkpOworICAg IEFTU0VSVChjbGllbnQpOworICAgIE93blB0cjxSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJv bWl1bT4gaGFuZGxlciA9IGFkb3B0UHRyKG5ldyBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJv bWl1bShjbGllbnQpKTsKKworICAgIGlmICghaGFuZGxlci0+Y3JlYXRlV2ViSGFuZGxlcigpKQor ICAgICAgICByZXR1cm4gUGFzc093blB0cjxSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXI+KCk7CisK KyAgICByZXR1cm4gaGFuZGxlci5yZWxlYXNlKCk7CiB9CiAKIFJUQ1BlZXJDb25uZWN0aW9uSGFu ZGxlckNocm9taXVtOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bShSVENQZWVyQ29u bmVjdGlvbkhhbmRsZXJDbGllbnQqIGNsaWVudCkKICAgICA6IG1fY2xpZW50KGNsaWVudCkKIHsK LSAgICBBU1NFUlQobV9jbGllbnQpOwotICAgIG1fd2ViSGFuZGxlciA9IGFkb3B0UHRyKFdlYktp dDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+Y3JlYXRlUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyKHRo aXMpKTsKIH0KIAogUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06On5SVENQZWVyQ29u bmVjdGlvbkhhbmRsZXJDaHJvbWl1bSgpCiB7CiB9CiAKLWJvb2wgUlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW06OmluaXRpYWxpemUoUGFzc1JlZlB0cjxSVENDb25maWd1cmF0aW9uPiBj b25maWd1cmF0aW9uLCBQYXNzUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IGNvbnN0cmFpbnRzKQor Ym9vbCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6Y3JlYXRlV2ViSGFuZGxlcigp CiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBt X3dlYkhhbmRsZXIgPSBhZG9wdFB0cihXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmNyZWF0 ZVJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlcih0aGlzKSk7CisgICAgcmV0dXJuIG1fd2ViSGFuZGxl cjsKK30KIAorYm9vbCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6aW5pdGlhbGl6 ZShQYXNzUmVmUHRyPFJUQ0NvbmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24sIFBhc3NSZWZQdHI8 TWVkaWFDb25zdHJhaW50cz4gY29uc3RyYWludHMpCit7CiAgICAgcmV0dXJuIG1fd2ViSGFuZGxl ci0+aW5pdGlhbGl6ZShjb25maWd1cmF0aW9uLCBjb25zdHJhaW50cyk7CiB9CiAKIHZvaWQgUlRD UGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmNyZWF0ZU9mZmVyKFBhc3NSZWZQdHI8UlRD U2Vzc2lvbkRlc2NyaXB0aW9uUmVxdWVzdD4gcmVxdWVzdCwgUGFzc1JlZlB0cjxNZWRpYUNvbnN0 cmFpbnRzPiBjb25zdHJhaW50cykKIHsKLSAgICAvLyBGSVhNRTogU2hvdWxkIHRoZSBlcnJvciBj YWxsYmFjayBiZSB0cmlnZ2VyZWQgaGVyZT8KLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAgICAg ICAgcmV0dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5jcmVhdGVPZmZlcihyZXF1ZXN0LCBjb25z dHJhaW50cyk7CiB9CiAKIHZvaWQgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmNy ZWF0ZUFuc3dlcihQYXNzUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvblJlcXVlc3Q+IHJlcXVl c3QsIFBhc3NSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4gY29uc3RyYWludHMpCiB7Ci0gICAgLy8g RklYTUU6IFNob3VsZCB0aGUgZXJyb3IgY2FsbGJhY2sgYmUgdHJpZ2dlcmVkIGhlcmU/Ci0gICAg aWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fd2ViSGFuZGxlci0+ Y3JlYXRlQW5zd2VyKHJlcXVlc3QsIGNvbnN0cmFpbnRzKTsKIH0KIAogdm9pZCBSVENQZWVyQ29u bmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6c2V0TG9jYWxEZXNjcmlwdGlvbihQYXNzUmVmUHRyPFJU Q1ZvaWRSZXF1ZXN0PiByZXF1ZXN0LCBQYXNzUmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbkRl c2NyaXB0b3I+IHNlc3Npb25EZXNjcmlwdGlvbikKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikK LSAgICAgICAgcmV0dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5zZXRMb2NhbERlc2NyaXB0aW9u KHJlcXVlc3QsIHNlc3Npb25EZXNjcmlwdGlvbik7CiB9CiAKIHZvaWQgUlRDUGVlckNvbm5lY3Rp b25IYW5kbGVyQ2hyb21pdW06OnNldFJlbW90ZURlc2NyaXB0aW9uKFBhc3NSZWZQdHI8UlRDVm9p ZFJlcXVlc3Q+IHJlcXVlc3QsIFBhc3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uRGVzY3Jp cHRvcj4gc2Vzc2lvbkRlc2NyaXB0aW9uKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAg ICAgICByZXR1cm47Ci0KICAgICBtX3dlYkhhbmRsZXItPnNldFJlbW90ZURlc2NyaXB0aW9uKHJl cXVlc3QsIHNlc3Npb25EZXNjcmlwdGlvbik7CiB9CiAKIGJvb2wgUlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW06OnVwZGF0ZUljZShQYXNzUmVmUHRyPFJUQ0NvbmZpZ3VyYXRpb24+IGNv bmZpZ3VyYXRpb24sIFBhc3NSZWZQdHI8TWVkaWFDb25zdHJhaW50cz4gY29uc3RyYWludHMpCiB7 Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIHJl dHVybiBtX3dlYkhhbmRsZXItPnVwZGF0ZUlDRShjb25maWd1cmF0aW9uLCBjb25zdHJhaW50cyk7 CiB9CiAKIGJvb2wgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmFkZEljZUNhbmRp ZGF0ZShQYXNzUmVmUHRyPFJUQ0ljZUNhbmRpZGF0ZURlc2NyaXB0b3I+IGljZUNhbmRpZGF0ZSkK IHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAg cmV0dXJuIG1fd2ViSGFuZGxlci0+YWRkSUNFQ2FuZGlkYXRlKGljZUNhbmRpZGF0ZSk7CiB9CiAK IFBhc3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uRGVzY3JpcHRvcj4gUlRDUGVlckNvbm5l Y3Rpb25IYW5kbGVyQ2hyb21pdW06OmxvY2FsRGVzY3JpcHRpb24oKQogewotICAgIGlmICghbV93 ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm4gMDsKLQogICAgIHJldHVybiBtX3dlYkhhbmRsZXIt PmxvY2FsRGVzY3JpcHRpb24oKTsKIH0KIAogUGFzc1JlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRp b25EZXNjcmlwdG9yPiBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6cmVtb3RlRGVz Y3JpcHRpb24oKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm4gMDsK LQogICAgIHJldHVybiBtX3dlYkhhbmRsZXItPnJlbW90ZURlc2NyaXB0aW9uKCk7CiB9CiAKIGJv b2wgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmFkZFN0cmVhbShQYXNzUmVmUHRy PE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4gbWVkaWFTdHJlYW0sIFBhc3NSZWZQdHI8TWVkaWFDb25z dHJhaW50cz4gY29uc3RyYWludHMpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAg IHJldHVybiBmYWxzZTsKLQogICAgIHJldHVybiBtX3dlYkhhbmRsZXItPmFkZFN0cmVhbShtZWRp YVN0cmVhbSwgY29uc3RyYWludHMpOwogfQogCiB2b2lkIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxl ckNocm9taXVtOjpyZW1vdmVTdHJlYW0oUGFzc1JlZlB0cjxNZWRpYVN0cmVhbURlc2NyaXB0b3I+ IG1lZGlhU3RyZWFtKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm47 Ci0KICAgICBtX3dlYkhhbmRsZXItPnJlbW92ZVN0cmVhbShtZWRpYVN0cmVhbSk7CiB9CiAKIHZv aWQgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmdldFN0YXRzKFBhc3NSZWZQdHI8 UlRDU3RhdHNSZXF1ZXN0PiByZXF1ZXN0KQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAg ICAgICByZXR1cm47Ci0KICAgICBtX3dlYkhhbmRsZXItPmdldFN0YXRzKHJlcXVlc3QpOwogfQog CiBib29sIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpvcGVuRGF0YUNoYW5uZWwo UGFzc1JlZlB0cjxSVENEYXRhQ2hhbm5lbERlc2NyaXB0b3I+IGRhdGFDaGFubmVsKQogewotICAg IGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICByZXR1cm4g bV93ZWJIYW5kbGVyLT5vcGVuRGF0YUNoYW5uZWwoZGF0YUNoYW5uZWwpOwogfQogCiBib29sIFJU Q1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZW5kU3RyaW5nRGF0YShQYXNzUmVmUHRy PFJUQ0RhdGFDaGFubmVsRGVzY3JpcHRvcj4gZGF0YUNoYW5uZWwsIGNvbnN0IFN0cmluZyYgZGF0 YSkKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAg ICAgcmV0dXJuIG1fd2ViSGFuZGxlci0+c2VuZFN0cmluZ0RhdGEoZGF0YUNoYW5uZWwsIGRhdGEp OwogfQogCiBib29sIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZW5kUmF3RGF0 YShQYXNzUmVmUHRyPFJUQ0RhdGFDaGFubmVsRGVzY3JpcHRvcj4gZGF0YUNoYW5uZWwsIGNvbnN0 IGNoYXIqIGRhdGEsIHNpemVfdCBkYXRhTGVuZ3RoKQogewotICAgIGlmICghbV93ZWJIYW5kbGVy KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICByZXR1cm4gbV93ZWJIYW5kbGVyLT5zZW5k UmF3RGF0YShkYXRhQ2hhbm5lbCwgZGF0YSwgZGF0YUxlbmd0aCk7CiB9CiAKIHZvaWQgUlRDUGVl ckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmNsb3NlRGF0YUNoYW5uZWwoUGFzc1JlZlB0cjxS VENEYXRhQ2hhbm5lbERlc2NyaXB0b3I+IGRhdGFDaGFubmVsKQogewotICAgIGlmICghbV93ZWJI YW5kbGVyKQotICAgICAgICByZXR1cm47Ci0KICAgICByZXR1cm4gbV93ZWJIYW5kbGVyLT5jbG9z ZURhdGFDaGFubmVsKGRhdGFDaGFubmVsKTsKIH0KIAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbkhh bmRsZXJDaHJvbWl1bTo6c3RvcCgpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAg IHJldHVybjsKLQogICAgIG1fd2ViSGFuZGxlci0+c3RvcCgpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVj dGlvbkhhbmRsZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0uaAppbmRleCA2ZGEx MTk1N2E3YzVmODZmYjViYmU3ZDZkZGY3YWQ2ZjhhMzc4ZTBkLi4zNmU5MmQ0NDQ3ZjNjNjZjNzk0 NjdhOGYyNWNiNTg4ZGQ4NmMyYTQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2Nocm9taXVtL1JUQ1Bl ZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtLmgKQEAgLTUyLDYgKzUyLDggQEAgcHVibGljOgog ICAgIGV4cGxpY2l0IFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtKFJUQ1BlZXJDb25u ZWN0aW9uSGFuZGxlckNsaWVudCopOwogICAgIHZpcnR1YWwgflJUQ1BlZXJDb25uZWN0aW9uSGFu ZGxlckNocm9taXVtKCk7CiAKKyAgICBib29sIGNyZWF0ZVdlYkhhbmRsZXIoKTsKKwogICAgIHZp cnR1YWwgYm9vbCBpbml0aWFsaXplKFBhc3NSZWZQdHI8UlRDQ29uZmlndXJhdGlvbj4sIFBhc3NS ZWZQdHI8TWVkaWFDb25zdHJhaW50cz4pIE9WRVJSSURFOwogCiAgICAgdmlydHVhbCB2b2lkIGNy ZWF0ZU9mZmVyKFBhc3NSZWZQdHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uUmVxdWVzdD4sIFBhc3NS ZWZQdHI8TWVkaWFDb25zdHJhaW50cz4pIE9WRVJSSURFOwo= 169371 2012-10-18 02:10:44 -0700 2012-10-18 03:23:49 -0700 Patch for landing bug-99308-20121018110930.patch text/plain 8953 tommyw U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxNzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTk1NGU3MGE0ZTQ2ODVh MjJkMDQ0MDViZWFlYzgxZTkzMjg0MmQwNy4uZTM3MjczODNkODM0MzBhMjc1NjM5MjI2M2RkNTEw ZGEwNGM2MmYyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDEyLTEwLTE3ICBUb21t eSBXaWRlbmZseWNodCAgPHRvbW15d0Bnb29nbGUuY29tPgorCisgICAgICAgIE1lZGlhU3RyZWFt IEFQSTogQWRkIGJldHRlciBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXIgY3JlYXRpb24gbG9naWMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5MzA4CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBUaGlzIHBhdGNoIG1h a2VzIHN1cmUgdGhhdCBpZiB0aGUgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyIGNhbid0IGJlIGZ1 bGx5IGluaXRpYWxpemVkL2NyZWF0ZWQKKyAgICAgICAgdGhlIFJUQ1BlZXJDb25uZWN0aW9uIGNv bnN0cnVjdG9yIHRocm93cyBhbiBleGNlcHRpb24uCisKKyAgICAgICAgTm90IGZ1bGwgdGVzdGFi bGUsIGV4aXN0aW5nIHRlc3RzIGNvdmVyIHRoZSBub3JtYWwgY2FzZSB0aG91Z2guCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXJDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXI6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJD aHJvbWl1bTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0pOgorICAgICAgICAoV2Vi Q29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OmNyZWF0ZVdlYkhhbmRsZXIp OgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06Omlu aXRpYWxpemUpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hy b21pdW06OmNyZWF0ZU9mZmVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtOjpjcmVhdGVBbnN3ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVl ckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnNldExvY2FsRGVzY3JpcHRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnNldFJlbW90ZURl c2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtOjp1cGRhdGVJY2UpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW06OmFkZEljZUNhbmRpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQ ZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6bG9jYWxEZXNjcmlwdGlvbik6CisgICAgICAg IChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6cmVtb3RlRGVzY3Jp cHRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21p dW06OmFkZFN0cmVhbSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRs ZXJDaHJvbWl1bTo6cmVtb3ZlU3RyZWFtKToKKyAgICAgICAgKFdlYkNvcmU6OlJUQ1BlZXJDb25u ZWN0aW9uSGFuZGxlckNocm9taXVtOjpnZXRTdGF0cyk6CisgICAgICAgIChXZWJDb3JlOjpSVENQ ZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6b3BlbkRhdGFDaGFubmVsKToKKyAgICAgICAg KFdlYkNvcmU6OlJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZW5kU3RyaW5nRGF0 YSk6CisgICAgICAgIChXZWJDb3JlOjpSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6 c2VuZFJhd0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVy Q2hyb21pdW06OmNsb3NlRGF0YUNoYW5uZWwpOgorICAgICAgICAoV2ViQ29yZTo6UlRDUGVlckNv bm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnN0b3ApOgorICAgICAgICAqIHBsYXRmb3JtL21lZGlh c3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtLmg6CisgICAg ICAgIChSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bSk6CisKIDIwMTItMTAtMTggIEtl bnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFNldCBtaW4td2lkdGgg cHJvcGVydHkgaW5zdGVhZCBvZiB3aWR0aCBwcm9wZXJ0eSBmb3IgZGF0ZS90aW1lIGZpZWxkcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0v UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21p dW0uY3BwCmluZGV4IDYxZmIxYzQ4YWQwZDBkNDIzZGRhZGJhODg0M2RhNmU4NGI2MGE3YWIuLmU4 ZDE2N2NhZTMxNmMyMWJjMGFkMzA4ZGUzMzVhZGU2NWU5OGI5MWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0 cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bS5jcHAKQEAgLTY0 LDE1NSArNjQsMTEyIEBAIFdlYktpdDo6V2ViUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyKiBSVENQ ZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6dG9XZWJSVENQCiAKIFBhc3NPd25QdHI8UlRD UGVlckNvbm5lY3Rpb25IYW5kbGVyPiBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXI6OmNyZWF0ZShS VENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDbGllbnQqIGNsaWVudCkKIHsKLSAgICByZXR1cm4gYWRv cHRQdHIobmV3IFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtKGNsaWVudCkpOworICAg IEFTU0VSVChjbGllbnQpOworICAgIE93blB0cjxSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJv bWl1bT4gaGFuZGxlciA9IGFkb3B0UHRyKG5ldyBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJv bWl1bShjbGllbnQpKTsKKworICAgIGlmICghaGFuZGxlci0+Y3JlYXRlV2ViSGFuZGxlcigpKQor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIHJldHVybiBoYW5kbGVyLnJlbGVhc2UoKTsK IH0KIAogUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OlJUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtKFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNsaWVudCogY2xpZW50KQog ICAgIDogbV9jbGllbnQoY2xpZW50KQogewotICAgIEFTU0VSVChtX2NsaWVudCk7Ci0gICAgbV93 ZWJIYW5kbGVyID0gYWRvcHRQdHIoV2ViS2l0OjpQbGF0Zm9ybTo6Y3VycmVudCgpLT5jcmVhdGVS VENQZWVyQ29ubmVjdGlvbkhhbmRsZXIodGhpcykpOwogfQogCiBSVENQZWVyQ29ubmVjdGlvbkhh bmRsZXJDaHJvbWl1bTo6flJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtKCkKIHsKIH0K IAotYm9vbCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6aW5pdGlhbGl6ZShQYXNz UmVmUHRyPFJUQ0NvbmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24sIFBhc3NSZWZQdHI8TWVkaWFD b25zdHJhaW50cz4gY29uc3RyYWludHMpCitib29sIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNo cm9taXVtOjpjcmVhdGVXZWJIYW5kbGVyKCkKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIG1fd2ViSGFuZGxlciA9IGFkb3B0UHRyKFdlYktpdDo6 UGxhdGZvcm06OmN1cnJlbnQoKS0+Y3JlYXRlUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyKHRoaXMp KTsKKyAgICByZXR1cm4gbV93ZWJIYW5kbGVyOworfQogCitib29sIFJUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtOjppbml0aWFsaXplKFBhc3NSZWZQdHI8UlRDQ29uZmlndXJhdGlvbj4g Y29uZmlndXJhdGlvbiwgUGFzc1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRzPiBjb25zdHJhaW50cykK K3sKICAgICByZXR1cm4gbV93ZWJIYW5kbGVyLT5pbml0aWFsaXplKGNvbmZpZ3VyYXRpb24sIGNv bnN0cmFpbnRzKTsKIH0KIAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6 Y3JlYXRlT2ZmZXIoUGFzc1JlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRpb25SZXF1ZXN0PiByZXF1 ZXN0LCBQYXNzUmVmUHRyPE1lZGlhQ29uc3RyYWludHM+IGNvbnN0cmFpbnRzKQogewotICAgIC8v IEZJWE1FOiBTaG91bGQgdGhlIGVycm9yIGNhbGxiYWNrIGJlIHRyaWdnZXJlZCBoZXJlPwotICAg IGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm47Ci0KICAgICBtX3dlYkhhbmRsZXIt PmNyZWF0ZU9mZmVyKHJlcXVlc3QsIGNvbnN0cmFpbnRzKTsKIH0KIAogdm9pZCBSVENQZWVyQ29u bmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6Y3JlYXRlQW5zd2VyKFBhc3NSZWZQdHI8UlRDU2Vzc2lv bkRlc2NyaXB0aW9uUmVxdWVzdD4gcmVxdWVzdCwgUGFzc1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRz PiBjb25zdHJhaW50cykKIHsKLSAgICAvLyBGSVhNRTogU2hvdWxkIHRoZSBlcnJvciBjYWxsYmFj ayBiZSB0cmlnZ2VyZWQgaGVyZT8KLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0 dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5jcmVhdGVBbnN3ZXIocmVxdWVzdCwgY29uc3RyYWlu dHMpOwogfQogCiB2b2lkIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzZXRMb2Nh bERlc2NyaXB0aW9uKFBhc3NSZWZQdHI8UlRDVm9pZFJlcXVlc3Q+IHJlcXVlc3QsIFBhc3NSZWZQ dHI8UlRDU2Vzc2lvbkRlc2NyaXB0aW9uRGVzY3JpcHRvcj4gc2Vzc2lvbkRlc2NyaXB0aW9uKQog ewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAgICAgICByZXR1cm47Ci0KICAgICBtX3dlYkhh bmRsZXItPnNldExvY2FsRGVzY3JpcHRpb24ocmVxdWVzdCwgc2Vzc2lvbkRlc2NyaXB0aW9uKTsK IH0KIAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6c2V0UmVtb3RlRGVz Y3JpcHRpb24oUGFzc1JlZlB0cjxSVENWb2lkUmVxdWVzdD4gcmVxdWVzdCwgUGFzc1JlZlB0cjxS VENTZXNzaW9uRGVzY3JpcHRpb25EZXNjcmlwdG9yPiBzZXNzaW9uRGVzY3JpcHRpb24pCiB7Ci0g ICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fd2ViSGFuZGxl ci0+c2V0UmVtb3RlRGVzY3JpcHRpb24ocmVxdWVzdCwgc2Vzc2lvbkRlc2NyaXB0aW9uKTsKIH0K IAogYm9vbCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6dXBkYXRlSWNlKFBhc3NS ZWZQdHI8UlRDQ29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiwgUGFzc1JlZlB0cjxNZWRpYUNv bnN0cmFpbnRzPiBjb25zdHJhaW50cykKIHsKLSAgICBpZiAoIW1fd2ViSGFuZGxlcikKLSAgICAg ICAgcmV0dXJuIGZhbHNlOwotCiAgICAgcmV0dXJuIG1fd2ViSGFuZGxlci0+dXBkYXRlSUNFKGNv bmZpZ3VyYXRpb24sIGNvbnN0cmFpbnRzKTsKIH0KIAogYm9vbCBSVENQZWVyQ29ubmVjdGlvbkhh bmRsZXJDaHJvbWl1bTo6YWRkSWNlQ2FuZGlkYXRlKFBhc3NSZWZQdHI8UlRDSWNlQ2FuZGlkYXRl RGVzY3JpcHRvcj4gaWNlQ2FuZGlkYXRlKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQotICAg ICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICByZXR1cm4gbV93ZWJIYW5kbGVyLT5hZGRJQ0VDYW5k aWRhdGUoaWNlQ2FuZGlkYXRlKTsKIH0KIAogUGFzc1JlZlB0cjxSVENTZXNzaW9uRGVzY3JpcHRp b25EZXNjcmlwdG9yPiBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6bG9jYWxEZXNj cmlwdGlvbigpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybiAwOwot CiAgICAgcmV0dXJuIG1fd2ViSGFuZGxlci0+bG9jYWxEZXNjcmlwdGlvbigpOwogfQogCiBQYXNz UmVmUHRyPFJUQ1Nlc3Npb25EZXNjcmlwdGlvbkRlc2NyaXB0b3I+IFJUQ1BlZXJDb25uZWN0aW9u SGFuZGxlckNocm9taXVtOjpyZW1vdGVEZXNjcmlwdGlvbigpCiB7Ci0gICAgaWYgKCFtX3dlYkhh bmRsZXIpCi0gICAgICAgIHJldHVybiAwOwotCiAgICAgcmV0dXJuIG1fd2ViSGFuZGxlci0+cmVt b3RlRGVzY3JpcHRpb24oKTsKIH0KIAogYm9vbCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJv bWl1bTo6YWRkU3RyZWFtKFBhc3NSZWZQdHI8TWVkaWFTdHJlYW1EZXNjcmlwdG9yPiBtZWRpYVN0 cmVhbSwgUGFzc1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRzPiBjb25zdHJhaW50cykKIHsKLSAgICBp ZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgcmV0dXJuIG1f d2ViSGFuZGxlci0+YWRkU3RyZWFtKG1lZGlhU3RyZWFtLCBjb25zdHJhaW50cyk7CiB9CiAKIHZv aWQgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06OnJlbW92ZVN0cmVhbShQYXNzUmVm UHRyPE1lZGlhU3RyZWFtRGVzY3JpcHRvcj4gbWVkaWFTdHJlYW0pCiB7Ci0gICAgaWYgKCFtX3dl YkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fd2ViSGFuZGxlci0+cmVtb3ZlU3Ry ZWFtKG1lZGlhU3RyZWFtKTsKIH0KIAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJv bWl1bTo6Z2V0U3RhdHMoUGFzc1JlZlB0cjxSVENTdGF0c1JlcXVlc3Q+IHJlcXVlc3QpCiB7Ci0g ICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1fd2ViSGFuZGxl ci0+Z2V0U3RhdHMocmVxdWVzdCk7CiB9CiAKIGJvb2wgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVy Q2hyb21pdW06Om9wZW5EYXRhQ2hhbm5lbChQYXNzUmVmUHRyPFJUQ0RhdGFDaGFubmVsRGVzY3Jp cHRvcj4gZGF0YUNoYW5uZWwpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLQogICAgIHJldHVybiBtX3dlYkhhbmRsZXItPm9wZW5EYXRhQ2hhbm5lbChk YXRhQ2hhbm5lbCk7CiB9CiAKIGJvb2wgUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW06 OnNlbmRTdHJpbmdEYXRhKFBhc3NSZWZQdHI8UlRDRGF0YUNoYW5uZWxEZXNjcmlwdG9yPiBkYXRh Q2hhbm5lbCwgY29uc3QgU3RyaW5nJiBkYXRhKQogewotICAgIGlmICghbV93ZWJIYW5kbGVyKQot ICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICByZXR1cm4gbV93ZWJIYW5kbGVyLT5zZW5kU3Ry aW5nRGF0YShkYXRhQ2hhbm5lbCwgZGF0YSk7CiB9CiAKIGJvb2wgUlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW06OnNlbmRSYXdEYXRhKFBhc3NSZWZQdHI8UlRDRGF0YUNoYW5uZWxEZXNj cmlwdG9yPiBkYXRhQ2hhbm5lbCwgY29uc3QgY2hhciogZGF0YSwgc2l6ZV90IGRhdGFMZW5ndGgp CiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAg IHJldHVybiBtX3dlYkhhbmRsZXItPnNlbmRSYXdEYXRhKGRhdGFDaGFubmVsLCBkYXRhLCBkYXRh TGVuZ3RoKTsKIH0KIAogdm9pZCBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXJDaHJvbWl1bTo6Y2xv c2VEYXRhQ2hhbm5lbChQYXNzUmVmUHRyPFJUQ0RhdGFDaGFubmVsRGVzY3JpcHRvcj4gZGF0YUNo YW5uZWwpCiB7Ci0gICAgaWYgKCFtX3dlYkhhbmRsZXIpCi0gICAgICAgIHJldHVybjsKLQogICAg IHJldHVybiBtX3dlYkhhbmRsZXItPmNsb3NlRGF0YUNoYW5uZWwoZGF0YUNoYW5uZWwpOwogfQog CiB2b2lkIFJUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtOjpzdG9wKCkKIHsKLSAgICBp ZiAoIW1fd2ViSGFuZGxlcikKLSAgICAgICAgcmV0dXJuOwotCiAgICAgbV93ZWJIYW5kbGVyLT5z dG9wKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL2Nocm9taXVtL1JUQ1BlZXJDb25uZWN0aW9uSGFuZGxlckNocm9taXVtLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9jaHJvbWl1bS9SVENQZWVyQ29ubmVjdGlvbkhh bmRsZXJDaHJvbWl1bS5oCmluZGV4IDZkYTExOTU3YTdjNWY4NmZiNWJiZTdkNmRkZjdhZDZmOGEz NzhlMGQuLjM2ZTkyZDQ0NDdmM2M2NmM3OTQ2N2E4ZjI1Y2I1ODhkZDg2YzJhNDQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL2Nocm9taXVtL1JUQ1BlZXJD b25uZWN0aW9uSGFuZGxlckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vY2hyb21pdW0vUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0uaApA QCAtNTIsNiArNTIsOCBAQCBwdWJsaWM6CiAgICAgZXhwbGljaXQgUlRDUGVlckNvbm5lY3Rpb25I YW5kbGVyQ2hyb21pdW0oUlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2xpZW50Kik7CiAgICAgdmly dHVhbCB+UlRDUGVlckNvbm5lY3Rpb25IYW5kbGVyQ2hyb21pdW0oKTsKIAorICAgIGJvb2wgY3Jl YXRlV2ViSGFuZGxlcigpOworCiAgICAgdmlydHVhbCBib29sIGluaXRpYWxpemUoUGFzc1JlZlB0 cjxSVENDb25maWd1cmF0aW9uPiwgUGFzc1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRzPikgT1ZFUlJJ REU7CiAKICAgICB2aXJ0dWFsIHZvaWQgY3JlYXRlT2ZmZXIoUGFzc1JlZlB0cjxSVENTZXNzaW9u RGVzY3JpcHRpb25SZXF1ZXN0PiwgUGFzc1JlZlB0cjxNZWRpYUNvbnN0cmFpbnRzPikgT1ZFUlJJ REU7Cg==