91164 2012-07-12 16:39:17 -0700 Move m_type and m_hasNameCache from HTMLCollectionCacheBase to DynamicNodeListCacheBase for better bit packing 2012-07-12 17:35:13 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89919 1 rniwa rniwa andersca darin dglazkov gustavo kling koivisto philn sam webkit.review.bot xan.lopez oldest_to_newest 668387 0 rniwa 2012-07-12 16:39:17 -0700 Move m_collectionType and m_isNameCacheValid from HTMLCollectionCacheBase to DynamicNodeListCacheBase for better bit packing 668393 1 152095 rniwa 2012-07-12 16:44:16 -0700 Created attachment 152095 Patch 668396 2 152095 rniwa 2012-07-12 16:46:05 -0700 Comment on attachment 152095 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152095&action=review > Source/WebCore/html/HTMLCollection.cpp:73 > + case InvalidCollectionType: > + break; Oops, this shouldn't be here. I'm getting ahead of myself. 668397 3 152097 rniwa 2012-07-12 16:47:12 -0700 Created attachment 152097 Removed the bits from the future 668401 4 152097 gyuyoung.kim 2012-07-12 16:52:16 -0700 Comment on attachment 152097 Removed the bits from the future Attachment 152097 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13230005 668407 5 rniwa 2012-07-12 16:58:05 -0700 Oh oops, I did need InvalidCollectionType in DynamicNodeListCacheBase. Will add back & make sure it builds before landing it. 668411 6 152097 webkit-ews 2012-07-12 17:02:20 -0700 Comment on attachment 152097 Removed the bits from the future Attachment 152097 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/13221423 668412 7 152097 buildbot 2012-07-12 17:03:32 -0700 Comment on attachment 152097 Removed the bits from the future Attachment 152097 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13221422 668415 8 152097 buildbot 2012-07-12 17:04:29 -0700 Comment on attachment 152097 Removed the bits from the future Attachment 152097 did not pass win-ews (win): Output: http://queues.webkit.org/results/13203909 668420 9 152097 webkit-ews 2012-07-12 17:09:59 -0700 Comment on attachment 152097 Removed the bits from the future Attachment 152097 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13209932 668426 10 152097 webkit.review.bot 2012-07-12 17:12:31 -0700 Comment on attachment 152097 Removed the bits from the future Attachment 152097 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13202879 668430 11 rniwa 2012-07-12 17:20:50 -0700 Committed r122531: <http://trac.webkit.org/changeset/122531> 668443 12 rniwa 2012-07-12 17:35:13 -0700 Apparently gcc doesn't catch all warnings :( I've landed a build fix in r122533. 152095 2012-07-12 16:44:16 -0700 2012-07-12 16:47:08 -0700 Patch bug-91164-20120712164748.patch text/plain 9872 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMjUyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA3LTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgbV90eXBlIGFuZCBtX2hh c05hbWVDYWNoZSBmcm9tIEhUTUxDb2xsZWN0aW9uQ2FjaGVCYXNlIHRvIER5bmFtaWNOb2RlTGlz dENhY2hlQmFzZSBmb3IgYmV0dGVyIGJpdCBwYWNraW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTE2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVkIG1fdHlwZSBhbmQgbV9oYXNOYW1lQ2FjaGUg ZnJvbSBIVE1MQ29sbGVjdGlvbiBhbmQgcmVuYW1lZCB0aGVtIHRvIG1fY29sbGVjdGlvblR5cGUg YW5kIG1faXNOYW1lQ2FjaGVWYWxpZC4KKworICAgICAgICBBbHNvIHJlbmFtZWQgc2hvdWxkSW5j bHVkZUNoaWxkcmVuIHRvIHNob3VsZE9ubHlJbmNsdWRlRGlyZWN0Q2hpbGRyZW4gYW5kIG5lZ2F0 ZWQgdGhlIHJldHVybiB2YWx1ZSBzaW5jZQorICAgICAgICBhbGwgSFRNTENvbGxlY3Rpb24gaW5j bHVkZSBjaGlsZHJlbiBpbiB0aGUgY29sbGVjdGlvbiBhbmQgdGhlIGZ1bmN0aW9uIHdhcyBtZWFu dCB0byB0ZWxsIHVzIHdoZXRoZXIgdGhlIGNvbGxlY3Rpb24KKyAgICAgICAgc2hvdWxkIGluY2x1 ZGUgZGVzY2VuZGVudHMgdGhhdCBhcmUgbm90IGRpcmVjdCBjaGlsZHJlbiBvZiBiYXNlKCkuCisK KyAgICAgICAgSW4gYWRkaXRpb24sIHJlbmFtZWQgbmV4dE5vZGVPclNpYmxpbmcgdG8gbmV4dE5v ZGUgc2luY2UgIm9yIHNpYmxpbmciIGRvZXNuJ3Qgc2VlbSB0byBhZGQgYW55IHNlbWFudGljIGNs YXJpdHkuCisKKyAgICAgICAgKiBkb20vRHluYW1pY05vZGVMaXN0Lmg6CisgICAgICAgIChXZWJD b3JlOjpEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2U6OkR5bmFtaWNOb2RlTGlzdENhY2hlQmFzZSk6 CisgICAgICAgIChEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6 RHluYW1pY05vZGVMaXN0Q2FjaGVCYXNlOjp0eXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkR5bmFt aWNOb2RlTGlzdENhY2hlQmFzZTo6aGFzTmFtZUNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OkR5 bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6c2V0SGFzTmFtZUNhY2hlKToKKyAgICAgICAgKFdlYkNv cmU6OkR5bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6Y2xlYXJDYWNoZSk6CisgICAgICAgICogaHRt bC9IVE1MQ29sbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRPbmx5SW5jbHVk ZURpcmVjdENoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb2xsZWN0aW9uOjpIVE1M Q29sbGVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29sbGVjdGlvbjo6aXNBY2NlcHRh YmxlRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpuZXh0Tm9kZSk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MQ29sbGVjdGlvbjo6aXRlbUFmdGVyKToKKyAgICAgICAgKiBodG1sL0hUTUxDb2xs ZWN0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29sbGVjdGlvbkNhY2hlQmFzZTo6SFRN TENvbGxlY3Rpb25DYWNoZUJhc2UpOgorICAgICAgICAoSFRNTENvbGxlY3Rpb25DYWNoZUJhc2Up OgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbGxlY3Rpb25DYWNoZUJhc2U6OmNsZWFyQ2FjaGUp OgorCiAyMDEyLTA3LTEyICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIHRoZSBSZW5kZXJQYXNzIHBvaW50ZXIgZnJvbSBSZW5k ZXJQYXNzRHJhd1F1YWQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9EeW5hbWljTm9kZUxpc3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRHluYW1pY05vZGVMaXN0LmgJKHJl dmlzaW9uIDEyMjUxOSkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9EeW5hbWljTm9kZUxpc3QuaAko d29ya2luZyBjb3B5KQpAQCAtMjQsNiArMjQsNyBAQAogI2lmbmRlZiBEeW5hbWljTm9kZUxpc3Rf aAogI2RlZmluZSBEeW5hbWljTm9kZUxpc3RfaAogCisjaW5jbHVkZSAiQ29sbGVjdGlvblR5cGUu aCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIk5vZGVMaXN0LmgiCiAjaW5jbHVk ZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTM5LDE2ICs0MCwyNSBAQCBwdWJsaWM6CiAgICAgRHluYW1p Y05vZGVMaXN0Q2FjaGVCYXNlKE5vZGVMaXN0Um9vdFR5cGUgcm9vdFR5cGUsIE5vZGVMaXN0SW52 YWxpZGF0aW9uVHlwZSBpbnZhbGlkYXRpb25UeXBlKQogICAgICAgICA6IG1fcm9vdGVkQXREb2N1 bWVudChyb290VHlwZSA9PSBOb2RlTGlzdElzUm9vdGVkQXREb2N1bWVudCkKICAgICAgICAgLCBt X2ludmFsaWRhdGlvblR5cGUoaW52YWxpZGF0aW9uVHlwZSkKKyAgICAgICAgLCBtX2NvbGxlY3Rp b25UeXBlKEludmFsaWRDb2xsZWN0aW9uVHlwZSkKICAgICB7CiAgICAgICAgIEFTU0VSVChtX2lu dmFsaWRhdGlvblR5cGUgPT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGludmFsaWRhdGlvblR5cGUp KTsKICAgICAgICAgY2xlYXJDYWNoZSgpOwogICAgIH0KIAorICAgIER5bmFtaWNOb2RlTGlzdENh Y2hlQmFzZShDb2xsZWN0aW9uVHlwZSBjb2xsZWN0aW9uVHlwZSkKKyAgICAgICAgOiBtX2NvbGxl Y3Rpb25UeXBlKGNvbGxlY3Rpb25UeXBlKQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fY29sbGVj dGlvblR5cGUgPT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGNvbGxlY3Rpb25UeXBlKSk7CisgICAg ICAgIGNsZWFyQ2FjaGUoKTsKKyAgICB9CisKIHB1YmxpYzoKICAgICBBTFdBWVNfSU5MSU5FIGJv b2wgaXNSb290ZWRBdERvY3VtZW50KCkgY29uc3QgeyByZXR1cm4gbV9yb290ZWRBdERvY3VtZW50 OyB9CiAgICAgQUxXQVlTX0lOTElORSBib29sIHNob3VsZEludmFsaWRhdGVPbkF0dHJpYnV0ZUNo YW5nZSgpIGNvbnN0IHsgcmV0dXJuIG1faW52YWxpZGF0aW9uVHlwZSAhPSBEb05vdEludmFsaWRh dGVPbkF0dHJpYnV0ZUNoYW5nZXM7IH0KICAgICBBTFdBWVNfSU5MSU5FIE5vZGVMaXN0Um9vdFR5 cGUgcm9vdFR5cGUoKSB7IHJldHVybiBtX3Jvb3RlZEF0RG9jdW1lbnQgPyBOb2RlTGlzdElzUm9v dGVkQXREb2N1bWVudCA6IE5vZGVMaXN0SXNSb290ZWRBdE5vZGU7IH0KICAgICBBTFdBWVNfSU5M SU5FIE5vZGVMaXN0SW52YWxpZGF0aW9uVHlwZSBpbnZhbGlkYXRpb25UeXBlKCkgY29uc3QgeyBy ZXR1cm4gc3RhdGljX2Nhc3Q8Tm9kZUxpc3RJbnZhbGlkYXRpb25UeXBlPihtX2ludmFsaWRhdGlv blR5cGUpOyB9CisgICAgQUxXQVlTX0lOTElORSBDb2xsZWN0aW9uVHlwZSB0eXBlKCkgY29uc3Qg eyByZXR1cm4gc3RhdGljX2Nhc3Q8Q29sbGVjdGlvblR5cGU+KG1fY29sbGVjdGlvblR5cGUpOyB9 CiAKIHByb3RlY3RlZDoKICAgICBBTFdBWVNfSU5MSU5FIGJvb2wgaXNJdGVtQ2FjaGVWYWxpZCgp IGNvbnN0IHsgcmV0dXJuIG1faXNJdGVtQ2FjaGVWYWxpZDsgfQpAQCAtNzAsMTEgKzgwLDE1IEBA IHByb3RlY3RlZDoKICAgICAgICAgbV9pc0l0ZW1DYWNoZVZhbGlkID0gdHJ1ZTsKICAgICB9CiAK KyAgICBib29sIGhhc05hbWVDYWNoZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNOYW1lQ2FjaGVWYWxp ZDsgfQorICAgIHZvaWQgc2V0SGFzTmFtZUNhY2hlKCkgY29uc3QgeyBtX2lzTmFtZUNhY2hlVmFs aWQgPSB0cnVlOyB9CisKICAgICB2b2lkIGNsZWFyQ2FjaGUoKSBjb25zdAogICAgIHsKICAgICAg ICAgbV9jYWNoZWRJdGVtID0gMDsKICAgICAgICAgbV9pc0xlbmd0aENhY2hlVmFsaWQgPSBmYWxz ZTsKICAgICAgICAgbV9pc0l0ZW1DYWNoZVZhbGlkID0gZmFsc2U7CisgICAgICAgIG1faXNOYW1l Q2FjaGVWYWxpZCA9IGZhbHNlOwogICAgIH0KIAogcHJpdmF0ZToKQEAgLTg3LDYgKzEwMSwxMCBA QCBwcml2YXRlOgogICAgIC8vIEZyb20gRHluYW1pY05vZGVMaXN0CiAgICAgY29uc3QgdW5zaWdu ZWQgbV9yb290ZWRBdERvY3VtZW50IDogMTsKICAgICBjb25zdCB1bnNpZ25lZCBtX2ludmFsaWRh dGlvblR5cGUgOiAzOworCisgICAgLy8gRnJvbSBIVE1MQ29sbGVjdGlvbgorICAgIG11dGFibGUg dW5zaWduZWQgbV9pc05hbWVDYWNoZVZhbGlkIDogMTsKKyAgICBjb25zdCB1bnNpZ25lZCBtX2Nv bGxlY3Rpb25UeXBlIDogNTsKIH07CiAKIGNsYXNzIER5bmFtaWNOb2RlTGlzdCA6IHB1YmxpYyBO b2RlTGlzdCwgcHVibGljIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZSB7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmNwcAkocmV2aXNpb24gMTIyNTE5KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDcg KzQwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVz OwogCi1zdGF0aWMgYm9vbCBzaG91bGRJbmNsdWRlQ2hpbGRyZW4oQ29sbGVjdGlvblR5cGUgdHlw ZSkKK3N0YXRpYyBib29sIHNob3VsZE9ubHlJbmNsdWRlRGlyZWN0Q2hpbGRyZW4oQ29sbGVjdGlv blR5cGUgdHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIERvY0FsbDoKQEAg LTYzLDE5ICs2MywyMSBAQCBzdGF0aWMgYm9vbCBzaG91bGRJbmNsdWRlQ2hpbGRyZW4oQ29sbGVj CiAgICAgY2FzZSBJdGVtUHJvcGVydGllczoKICNlbmRpZgogICAgIGNhc2UgRm9ybUNvbnRyb2xz OgotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGNhc2Ug Tm9kZUNoaWxkcmVuOgogICAgIGNhc2UgVFJDZWxsczoKICAgICBjYXNlIFRTZWN0aW9uUm93czoK ICAgICBjYXNlIFRhYmxlVEJvZGllczoKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICBjYXNlIEludmFsaWRDb2xsZWN0aW9uVHlwZToKKyAgICAgICAgYnJl YWs7CiAgICAgfQogICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIHJldHVybiBmYWxzZTsK IH0KIAogSFRNTENvbGxlY3Rpb246OkhUTUxDb2xsZWN0aW9uKE5vZGUqIGJhc2UsIENvbGxlY3Rp b25UeXBlIHR5cGUpCi0gICAgOiBIVE1MQ29sbGVjdGlvbkNhY2hlQmFzZSh0eXBlLCBzaG91bGRJ bmNsdWRlQ2hpbGRyZW4odHlwZSkpCisgICAgOiBIVE1MQ29sbGVjdGlvbkNhY2hlQmFzZSh0eXBl KQogICAgICwgbV9iYXNlKGJhc2UpCiB7CiAgICAgQVNTRVJUKG1fYmFzZSk7CkBAIC0xNzAsMzEg KzE3MiwyNyBAQCBpbmxpbmUgYm9vbCBIVE1MQ29sbGVjdGlvbjo6aXNBY2NlcHRhYmxlCiAgICAg Y2FzZSBEb2N1bWVudE5hbWVkSXRlbXM6CiAgICAgY2FzZSBUYWJsZVJvd3M6CiAgICAgY2FzZSBX aW5kb3dOYW1lZEl0ZW1zOgorICAgIGNhc2UgSW52YWxpZENvbGxlY3Rpb25UeXBlOgogICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1z dGF0aWMgTm9kZSogbmV4dE5vZGVPclNpYmxpbmcoTm9kZSogYmFzZSwgTm9kZSogbm9kZSwgYm9v bCBpbmNsdWRlQ2hpbGRyZW4pCitzdGF0aWMgQUxXQVlTX0lOTElORSBOb2RlKiBuZXh0Tm9kZShO b2RlKiBiYXNlLCBOb2RlKiBwcmV2aW91cywgYm9vbCBvbmx5SW5jbHVkZURpcmVjdENoaWxkcmVu KQogewotICAgIHJldHVybiBpbmNsdWRlQ2hpbGRyZW4gPyBub2RlLT50cmF2ZXJzZU5leHROb2Rl KGJhc2UpIDogbm9kZS0+dHJhdmVyc2VOZXh0U2libGluZyhiYXNlKTsKKyAgICByZXR1cm4gb25s eUluY2x1ZGVEaXJlY3RDaGlsZHJlbiA/IHByZXZpb3VzLT50cmF2ZXJzZU5leHRTaWJsaW5nKGJh c2UpIDogcHJldmlvdXMtPnRyYXZlcnNlTmV4dE5vZGUoYmFzZSk7CiB9CiAKIEVsZW1lbnQqIEhU TUxDb2xsZWN0aW9uOjppdGVtQWZ0ZXIodW5zaWduZWQmIG9mZnNldEluQXJyYXksIEVsZW1lbnQq IHByZXZpb3VzKSBjb25zdAogewogICAgIEFTU0VSVF9VTlVTRUQob2Zmc2V0SW5BcnJheSwgIW9m ZnNldEluQXJyYXkpOwotICAgIE5vZGUqIGN1cnJlbnQ7Ci0gICAgaWYgKCFwcmV2aW91cykKLSAg ICAgICAgY3VycmVudCA9IG1fYmFzZS0+Zmlyc3RDaGlsZCgpOwotICAgIGVsc2UKLSAgICAgICAg Y3VycmVudCA9IG5leHROb2RlT3JTaWJsaW5nKGJhc2UoKSwgcHJldmlvdXMsIGluY2x1ZGVDaGls ZHJlbigpKTsKLQotICAgIGZvciAoOyBjdXJyZW50OyBjdXJyZW50ID0gbmV4dE5vZGVPclNpYmxp bmcoYmFzZSgpLCBjdXJyZW50LCBpbmNsdWRlQ2hpbGRyZW4oKSkpIHsKLSAgICAgICAgaWYgKCFj dXJyZW50LT5pc0VsZW1lbnROb2RlKCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAg RWxlbWVudCogZWxlbWVudCA9IHN0YXRpY19jYXN0PEVsZW1lbnQqPihjdXJyZW50KTsKLSAgICAg ICAgaWYgKGlzQWNjZXB0YWJsZUVsZW1lbnQoZWxlbWVudCkpCi0gICAgICAgICAgICByZXR1cm4g ZWxlbWVudDsKKyAgICBib29sIG9ubHlJbmNsdWRlRGlyZWN0Q2hpbGRyZW4gPSBzaG91bGRPbmx5 SW5jbHVkZURpcmVjdENoaWxkcmVuKHR5cGUoKSk7CisgICAgTm9kZSogcm9vdE5vZGUgPSBiYXNl KCk7CisgICAgTm9kZSogY3VycmVudCA9IHByZXZpb3VzID8gbmV4dE5vZGUocm9vdE5vZGUsIHBy ZXZpb3VzLCBvbmx5SW5jbHVkZURpcmVjdENoaWxkcmVuKSA6IG1fYmFzZS0+Zmlyc3RDaGlsZCgp OworCisgICAgZm9yICg7IGN1cnJlbnQ7IGN1cnJlbnQgPSBuZXh0Tm9kZShyb290Tm9kZSwgY3Vy cmVudCwgb25seUluY2x1ZGVEaXJlY3RDaGlsZHJlbikpIHsKKyAgICAgICAgaWYgKGN1cnJlbnQt PmlzRWxlbWVudE5vZGUoKSAmJiBpc0FjY2VwdGFibGVFbGVtZW50KHRvRWxlbWVudChjdXJyZW50 KSkpCisgICAgICAgICAgICByZXR1cm4gdG9FbGVtZW50KGN1cnJlbnQpOwogICAgIH0KIAogICAg IHJldHVybiAwOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENvbGxlY3Rpb24uaAkocmV2aXNp b24gMTIyNTE5KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zOSwxOSArMzksMTMgQEAgY2xhc3MgTm9kZUxpc3Q7CiAKIGNsYXNzIEhU TUxDb2xsZWN0aW9uQ2FjaGVCYXNlIDogcHVibGljIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZSB7 CiBwdWJsaWM6Ci0gICAgSFRNTENvbGxlY3Rpb25DYWNoZUJhc2UoQ29sbGVjdGlvblR5cGUgdHlw ZSwgYm9vbCBpbmNsdWRlQ2hpbGRyZW4pCi0gICAgICAgIDogRHluYW1pY05vZGVMaXN0Q2FjaGVC YXNlKE5vZGVMaXN0SXNSb290ZWRBdE5vZGUsIERvTm90SW52YWxpZGF0ZU9uQXR0cmlidXRlQ2hh bmdlcykgLy8gVGhlc2UgdHdvIGZsYWdzIGFyZSBuZXZlciB1c2VkCisgICAgSFRNTENvbGxlY3Rp b25DYWNoZUJhc2UoQ29sbGVjdGlvblR5cGUgdHlwZSkKKyAgICAgICAgOiBEeW5hbWljTm9kZUxp c3RDYWNoZUJhc2UodHlwZSkKICAgICAgICAgLCBtX2NhY2hlZEVsZW1lbnRzQXJyYXlPZmZzZXQo MCkKICAgICAgICAgLCBtX2NhY2hlVHJlZVZlcnNpb24oMCkKLSAgICAgICAgLCBtX2hhc05hbWVD YWNoZShmYWxzZSkKLSAgICAgICAgLCBtX3R5cGUodHlwZSkKLSAgICAgICAgLCBtX2luY2x1ZGVD aGlsZHJlbihpbmNsdWRlQ2hpbGRyZW4pCiAgICAgewotICAgICAgICBBU1NFUlQoc3RhdGljX2Nh c3Q8Q29sbGVjdGlvblR5cGU+KG1fdHlwZSkgPT0gdHlwZSk7CiAgICAgfQogCi0gICAgQ29sbGVj dGlvblR5cGUgdHlwZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PENvbGxlY3Rpb25UeXBl PihtX3R5cGUpOyB9Ci0KIHByb3RlY3RlZDoKICAgICB2b2lkIGNsZWFyQ2FjaGUodWludDY0X3Qg Y3VycmVudERvbVRyZWVWZXJzaW9uKSBjb25zdAogICAgIHsKQEAgLTYwLDcgKzU0LDYgQEAgcHJv dGVjdGVkOgogICAgICAgICBtX25hbWVDYWNoZS5jbGVhcigpOwogICAgICAgICBtX2NhY2hlZEVs ZW1lbnRzQXJyYXlPZmZzZXQgPSAwOwogICAgICAgICBtX2NhY2hlVHJlZVZlcnNpb24gPSBjdXJy ZW50RG9tVHJlZVZlcnNpb247Ci0gICAgICAgIG1faGFzTmFtZUNhY2hlID0gZmFsc2U7CiAgICAg fQogCiAgICAgdm9pZCBzZXRJdGVtQ2FjaGUoTm9kZSogaXRlbSwgdW5zaWduZWQgb2Zmc2V0LCB1 bnNpZ25lZCBlbGVtZW50c0FycmF5T2Zmc2V0KSBjb25zdApAQCAtNzAsNyArNjMsNiBAQCBwcm90 ZWN0ZWQ6CiAgICAgfQogICAgIHVuc2lnbmVkIGNhY2hlZEVsZW1lbnRzQXJyYXlPZmZzZXQoKSBj b25zdCB7IHJldHVybiBtX2NhY2hlZEVsZW1lbnRzQXJyYXlPZmZzZXQ7IH0KIAotICAgIGJvb2wg aW5jbHVkZUNoaWxkcmVuKCkgY29uc3QgeyByZXR1cm4gbV9pbmNsdWRlQ2hpbGRyZW47IH0KICAg ICB1aW50NjRfdCBjYWNoZVRyZWVWZXJzaW9uKCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZVRyZWVW ZXJzaW9uOyB9CiAKICAgICB0eXBlZGVmIEhhc2hNYXA8QXRvbWljU3RyaW5nSW1wbCosIE93blB0 cjxWZWN0b3I8RWxlbWVudCo+ID4gPiBOb2RlQ2FjaGVNYXA7CkBAIC03OSw5ICs3MSw2IEBAIHBy b3RlY3RlZDoKICAgICB2b2lkIGFwcGVuZElkQ2FjaGUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1l LCBFbGVtZW50KiBlbGVtZW50KSBjb25zdCB7IGFwcGVuZChtX2lkQ2FjaGUsIG5hbWUsIGVsZW1l bnQpOyB9CiAgICAgdm9pZCBhcHBlbmROYW1lQ2FjaGUoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1l LCBFbGVtZW50KiBlbGVtZW50KSBjb25zdCB7IGFwcGVuZChtX25hbWVDYWNoZSwgbmFtZSwgZWxl bWVudCk7IH0KIAotICAgIGJvb2wgaGFzTmFtZUNhY2hlKCkgY29uc3QgeyByZXR1cm4gbV9oYXNO YW1lQ2FjaGU7IH0KLSAgICB2b2lkIHNldEhhc05hbWVDYWNoZSgpIGNvbnN0IHsgbV9oYXNOYW1l Q2FjaGUgPSB0cnVlOyB9Ci0KICAgICBzdGF0aWMgdm9pZCBhcHBlbmQoTm9kZUNhY2hlTWFwJiwg Y29uc3QgQXRvbWljU3RyaW5nJiwgRWxlbWVudCopOwogCiBwcml2YXRlOgpAQCAtOTQsMTEgKzgz LDYgQEAgcHJpdmF0ZToKICAgICBtdXRhYmxlIE5vZGVDYWNoZU1hcCBtX25hbWVDYWNoZTsKICAg ICBtdXRhYmxlIHVuc2lnbmVkIG1fY2FjaGVkRWxlbWVudHNBcnJheU9mZnNldDsKICAgICBtdXRh YmxlIHVpbnQ2NF90IG1fY2FjaGVUcmVlVmVyc2lvbjsKLQotICAgIC8vIEZJWE1FOiBNb3ZlIHRo ZXNlIGJpdCBmbGFncyB0byBEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2UgdG8gcGFjayB0aGVtIGJl dHRlci4KLSAgICBtdXRhYmxlIHVuc2lnbmVkIG1faGFzTmFtZUNhY2hlIDogMTsKLSAgICBjb25z dCB1bnNpZ25lZCBtX3R5cGUgOiA1OyAvLyBDb2xsZWN0aW9uVHlwZQotICAgIGNvbnN0IHVuc2ln bmVkIG1faW5jbHVkZUNoaWxkcmVuIDogMTsKIH07CiAKIGNsYXNzIEhUTUxDb2xsZWN0aW9uIDog cHVibGljIFJlZkNvdW50ZWQ8SFRNTENvbGxlY3Rpb24+LCBwdWJsaWMgSFRNTENvbGxlY3Rpb25D YWNoZUJhc2Ugewo= 152097 2012-07-12 16:47:12 -0700 2012-07-12 17:12:31 -0700 Removed the bits from the future bug-91164-20120712165043.patch text/plain 9673 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMjUyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA3LTEyICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1vdmUgbV90eXBlIGFuZCBtX2hh c05hbWVDYWNoZSBmcm9tIEhUTUxDb2xsZWN0aW9uQ2FjaGVCYXNlIHRvIER5bmFtaWNOb2RlTGlz dENhY2hlQmFzZSBmb3IgYmV0dGVyIGJpdCBwYWNraW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTE2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVkIG1fdHlwZSBhbmQgbV9oYXNOYW1lQ2FjaGUg ZnJvbSBIVE1MQ29sbGVjdGlvbiBhbmQgcmVuYW1lZCB0aGVtIHRvIG1fY29sbGVjdGlvblR5cGUg YW5kIG1faXNOYW1lQ2FjaGVWYWxpZC4KKworICAgICAgICBBbHNvIHJlbmFtZWQgc2hvdWxkSW5j bHVkZUNoaWxkcmVuIHRvIHNob3VsZE9ubHlJbmNsdWRlRGlyZWN0Q2hpbGRyZW4gYW5kIG5lZ2F0 ZWQgdGhlIHJldHVybiB2YWx1ZSBzaW5jZQorICAgICAgICBhbGwgSFRNTENvbGxlY3Rpb24gaW5j bHVkZSBjaGlsZHJlbiBpbiB0aGUgY29sbGVjdGlvbiBhbmQgdGhlIGZ1bmN0aW9uIHdhcyBtZWFu dCB0byB0ZWxsIHVzIHdoZXRoZXIgdGhlIGNvbGxlY3Rpb24KKyAgICAgICAgc2hvdWxkIGluY2x1 ZGUgZGVzY2VuZGVudHMgdGhhdCBhcmUgbm90IGRpcmVjdCBjaGlsZHJlbiBvZiBiYXNlKCkuCisK KyAgICAgICAgSW4gYWRkaXRpb24sIHJlbmFtZWQgbmV4dE5vZGVPclNpYmxpbmcgdG8gbmV4dE5v ZGUgc2luY2UgIm9yIHNpYmxpbmciIGRvZXNuJ3Qgc2VlbSB0byBhZGQgYW55IHNlbWFudGljIGNs YXJpdHkuCisKKyAgICAgICAgKiBkb20vRHluYW1pY05vZGVMaXN0Lmg6CisgICAgICAgIChXZWJD b3JlOjpEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2U6OkR5bmFtaWNOb2RlTGlzdENhY2hlQmFzZSk6 CisgICAgICAgIChEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2UpOgorICAgICAgICAoV2ViQ29yZTo6 RHluYW1pY05vZGVMaXN0Q2FjaGVCYXNlOjp0eXBlKToKKyAgICAgICAgKFdlYkNvcmU6OkR5bmFt aWNOb2RlTGlzdENhY2hlQmFzZTo6aGFzTmFtZUNhY2hlKToKKyAgICAgICAgKFdlYkNvcmU6OkR5 bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6c2V0SGFzTmFtZUNhY2hlKToKKyAgICAgICAgKFdlYkNv cmU6OkR5bmFtaWNOb2RlTGlzdENhY2hlQmFzZTo6Y2xlYXJDYWNoZSk6CisgICAgICAgICogaHRt bC9IVE1MQ29sbGVjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRPbmx5SW5jbHVk ZURpcmVjdENoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxDb2xsZWN0aW9uOjpIVE1M Q29sbGVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29sbGVjdGlvbjo6aXNBY2NlcHRh YmxlRWxlbWVudCk6CisgICAgICAgIChXZWJDb3JlOjpuZXh0Tm9kZSk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MQ29sbGVjdGlvbjo6aXRlbUFmdGVyKToKKyAgICAgICAgKiBodG1sL0hUTUxDb2xs ZWN0aW9uLmg6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29sbGVjdGlvbkNhY2hlQmFzZTo6SFRN TENvbGxlY3Rpb25DYWNoZUJhc2UpOgorICAgICAgICAoSFRNTENvbGxlY3Rpb25DYWNoZUJhc2Up OgorICAgICAgICAoV2ViQ29yZTo6SFRNTENvbGxlY3Rpb25DYWNoZUJhc2U6OmNsZWFyQ2FjaGUp OgorCiAyMDEyLTA3LTEyICBEYW5hIEphbnNlbnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIHRoZSBSZW5kZXJQYXNzIHBvaW50ZXIgZnJvbSBSZW5k ZXJQYXNzRHJhd1F1YWQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9EeW5hbWljTm9kZUxpc3Qu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRHluYW1pY05vZGVMaXN0LmgJKHJl dmlzaW9uIDEyMjUxOSkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9EeW5hbWljTm9kZUxpc3QuaAko d29ya2luZyBjb3B5KQpAQCAtMjQsNiArMjQsNyBAQAogI2lmbmRlZiBEeW5hbWljTm9kZUxpc3Rf aAogI2RlZmluZSBEeW5hbWljTm9kZUxpc3RfaAogCisjaW5jbHVkZSAiQ29sbGVjdGlvblR5cGUu aCIKICNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIk5vZGVMaXN0LmgiCiAjaW5jbHVk ZSA8d3RmL0ZvcndhcmQuaD4KQEAgLTM5LDE2ICs0MCwyNSBAQCBwdWJsaWM6CiAgICAgRHluYW1p Y05vZGVMaXN0Q2FjaGVCYXNlKE5vZGVMaXN0Um9vdFR5cGUgcm9vdFR5cGUsIE5vZGVMaXN0SW52 YWxpZGF0aW9uVHlwZSBpbnZhbGlkYXRpb25UeXBlKQogICAgICAgICA6IG1fcm9vdGVkQXREb2N1 bWVudChyb290VHlwZSA9PSBOb2RlTGlzdElzUm9vdGVkQXREb2N1bWVudCkKICAgICAgICAgLCBt X2ludmFsaWRhdGlvblR5cGUoaW52YWxpZGF0aW9uVHlwZSkKKyAgICAgICAgLCBtX2NvbGxlY3Rp b25UeXBlKEludmFsaWRDb2xsZWN0aW9uVHlwZSkKICAgICB7CiAgICAgICAgIEFTU0VSVChtX2lu dmFsaWRhdGlvblR5cGUgPT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGludmFsaWRhdGlvblR5cGUp KTsKICAgICAgICAgY2xlYXJDYWNoZSgpOwogICAgIH0KIAorICAgIER5bmFtaWNOb2RlTGlzdENh Y2hlQmFzZShDb2xsZWN0aW9uVHlwZSBjb2xsZWN0aW9uVHlwZSkKKyAgICAgICAgOiBtX2NvbGxl Y3Rpb25UeXBlKGNvbGxlY3Rpb25UeXBlKQorICAgIHsKKyAgICAgICAgQVNTRVJUKG1fY29sbGVj dGlvblR5cGUgPT0gc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGNvbGxlY3Rpb25UeXBlKSk7CisgICAg ICAgIGNsZWFyQ2FjaGUoKTsKKyAgICB9CisKIHB1YmxpYzoKICAgICBBTFdBWVNfSU5MSU5FIGJv b2wgaXNSb290ZWRBdERvY3VtZW50KCkgY29uc3QgeyByZXR1cm4gbV9yb290ZWRBdERvY3VtZW50 OyB9CiAgICAgQUxXQVlTX0lOTElORSBib29sIHNob3VsZEludmFsaWRhdGVPbkF0dHJpYnV0ZUNo YW5nZSgpIGNvbnN0IHsgcmV0dXJuIG1faW52YWxpZGF0aW9uVHlwZSAhPSBEb05vdEludmFsaWRh dGVPbkF0dHJpYnV0ZUNoYW5nZXM7IH0KICAgICBBTFdBWVNfSU5MSU5FIE5vZGVMaXN0Um9vdFR5 cGUgcm9vdFR5cGUoKSB7IHJldHVybiBtX3Jvb3RlZEF0RG9jdW1lbnQgPyBOb2RlTGlzdElzUm9v dGVkQXREb2N1bWVudCA6IE5vZGVMaXN0SXNSb290ZWRBdE5vZGU7IH0KICAgICBBTFdBWVNfSU5M SU5FIE5vZGVMaXN0SW52YWxpZGF0aW9uVHlwZSBpbnZhbGlkYXRpb25UeXBlKCkgY29uc3QgeyBy ZXR1cm4gc3RhdGljX2Nhc3Q8Tm9kZUxpc3RJbnZhbGlkYXRpb25UeXBlPihtX2ludmFsaWRhdGlv blR5cGUpOyB9CisgICAgQUxXQVlTX0lOTElORSBDb2xsZWN0aW9uVHlwZSB0eXBlKCkgY29uc3Qg eyByZXR1cm4gc3RhdGljX2Nhc3Q8Q29sbGVjdGlvblR5cGU+KG1fY29sbGVjdGlvblR5cGUpOyB9 CiAKIHByb3RlY3RlZDoKICAgICBBTFdBWVNfSU5MSU5FIGJvb2wgaXNJdGVtQ2FjaGVWYWxpZCgp IGNvbnN0IHsgcmV0dXJuIG1faXNJdGVtQ2FjaGVWYWxpZDsgfQpAQCAtNzAsMTEgKzgwLDE1IEBA IHByb3RlY3RlZDoKICAgICAgICAgbV9pc0l0ZW1DYWNoZVZhbGlkID0gdHJ1ZTsKICAgICB9CiAK KyAgICBib29sIGhhc05hbWVDYWNoZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNOYW1lQ2FjaGVWYWxp ZDsgfQorICAgIHZvaWQgc2V0SGFzTmFtZUNhY2hlKCkgY29uc3QgeyBtX2lzTmFtZUNhY2hlVmFs aWQgPSB0cnVlOyB9CisKICAgICB2b2lkIGNsZWFyQ2FjaGUoKSBjb25zdAogICAgIHsKICAgICAg ICAgbV9jYWNoZWRJdGVtID0gMDsKICAgICAgICAgbV9pc0xlbmd0aENhY2hlVmFsaWQgPSBmYWxz ZTsKICAgICAgICAgbV9pc0l0ZW1DYWNoZVZhbGlkID0gZmFsc2U7CisgICAgICAgIG1faXNOYW1l Q2FjaGVWYWxpZCA9IGZhbHNlOwogICAgIH0KIAogcHJpdmF0ZToKQEAgLTg3LDYgKzEwMSwxMCBA QCBwcml2YXRlOgogICAgIC8vIEZyb20gRHluYW1pY05vZGVMaXN0CiAgICAgY29uc3QgdW5zaWdu ZWQgbV9yb290ZWRBdERvY3VtZW50IDogMTsKICAgICBjb25zdCB1bnNpZ25lZCBtX2ludmFsaWRh dGlvblR5cGUgOiAzOworCisgICAgLy8gRnJvbSBIVE1MQ29sbGVjdGlvbgorICAgIG11dGFibGUg dW5zaWduZWQgbV9pc05hbWVDYWNoZVZhbGlkIDogMTsKKyAgICBjb25zdCB1bnNpZ25lZCBtX2Nv bGxlY3Rpb25UeXBlIDogNTsKIH07CiAKIGNsYXNzIER5bmFtaWNOb2RlTGlzdCA6IHB1YmxpYyBO b2RlTGlzdCwgcHVibGljIER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZSB7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmNwcAkocmV2aXNpb24gMTIyNTE5KQorKysgU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MQ29sbGVjdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDcg KzQwLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiB1c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVz OwogCi1zdGF0aWMgYm9vbCBzaG91bGRJbmNsdWRlQ2hpbGRyZW4oQ29sbGVjdGlvblR5cGUgdHlw ZSkKK3N0YXRpYyBib29sIHNob3VsZE9ubHlJbmNsdWRlRGlyZWN0Q2hpbGRyZW4oQ29sbGVjdGlv blR5cGUgdHlwZSkKIHsKICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICBjYXNlIERvY0FsbDoKQEAg LTYzLDE5ICs2MywxOSBAQCBzdGF0aWMgYm9vbCBzaG91bGRJbmNsdWRlQ2hpbGRyZW4oQ29sbGVj CiAgICAgY2FzZSBJdGVtUHJvcGVydGllczoKICNlbmRpZgogICAgIGNhc2UgRm9ybUNvbnRyb2xz OgotICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGNhc2Ug Tm9kZUNoaWxkcmVuOgogICAgIGNhc2UgVFJDZWxsczoKICAgICBjYXNlIFRTZWN0aW9uUm93czoK ICAgICBjYXNlIFRhYmxlVEJvZGllczoKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgcmV0dXJu IGZhbHNlOwogfQogCiBIVE1MQ29sbGVjdGlvbjo6SFRNTENvbGxlY3Rpb24oTm9kZSogYmFzZSwg Q29sbGVjdGlvblR5cGUgdHlwZSkKLSAgICA6IEhUTUxDb2xsZWN0aW9uQ2FjaGVCYXNlKHR5cGUs IHNob3VsZEluY2x1ZGVDaGlsZHJlbih0eXBlKSkKKyAgICA6IEhUTUxDb2xsZWN0aW9uQ2FjaGVC YXNlKHR5cGUpCiAgICAgLCBtX2Jhc2UoYmFzZSkKIHsKICAgICBBU1NFUlQobV9iYXNlKTsKQEAg LTE3NSwyNiArMTc1LDIxIEBAIGlubGluZSBib29sIEhUTUxDb2xsZWN0aW9uOjppc0FjY2VwdGFi bGUKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLXN0YXRpYyBOb2RlKiBuZXh0Tm9kZU9yU2libGlu ZyhOb2RlKiBiYXNlLCBOb2RlKiBub2RlLCBib29sIGluY2x1ZGVDaGlsZHJlbikKK3N0YXRpYyBB TFdBWVNfSU5MSU5FIE5vZGUqIG5leHROb2RlKE5vZGUqIGJhc2UsIE5vZGUqIHByZXZpb3VzLCBi b29sIG9ubHlJbmNsdWRlRGlyZWN0Q2hpbGRyZW4pCiB7Ci0gICAgcmV0dXJuIGluY2x1ZGVDaGls ZHJlbiA/IG5vZGUtPnRyYXZlcnNlTmV4dE5vZGUoYmFzZSkgOiBub2RlLT50cmF2ZXJzZU5leHRT aWJsaW5nKGJhc2UpOworICAgIHJldHVybiBvbmx5SW5jbHVkZURpcmVjdENoaWxkcmVuID8gcHJl dmlvdXMtPnRyYXZlcnNlTmV4dFNpYmxpbmcoYmFzZSkgOiBwcmV2aW91cy0+dHJhdmVyc2VOZXh0 Tm9kZShiYXNlKTsKIH0KIAogRWxlbWVudCogSFRNTENvbGxlY3Rpb246Oml0ZW1BZnRlcih1bnNp Z25lZCYgb2Zmc2V0SW5BcnJheSwgRWxlbWVudCogcHJldmlvdXMpIGNvbnN0CiB7CiAgICAgQVNT RVJUX1VOVVNFRChvZmZzZXRJbkFycmF5LCAhb2Zmc2V0SW5BcnJheSk7Ci0gICAgTm9kZSogY3Vy cmVudDsKLSAgICBpZiAoIXByZXZpb3VzKQotICAgICAgICBjdXJyZW50ID0gbV9iYXNlLT5maXJz dENoaWxkKCk7Ci0gICAgZWxzZQotICAgICAgICBjdXJyZW50ID0gbmV4dE5vZGVPclNpYmxpbmco YmFzZSgpLCBwcmV2aW91cywgaW5jbHVkZUNoaWxkcmVuKCkpOwotCi0gICAgZm9yICg7IGN1cnJl bnQ7IGN1cnJlbnQgPSBuZXh0Tm9kZU9yU2libGluZyhiYXNlKCksIGN1cnJlbnQsIGluY2x1ZGVD aGlsZHJlbigpKSkgewotICAgICAgICBpZiAoIWN1cnJlbnQtPmlzRWxlbWVudE5vZGUoKSkKLSAg ICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBFbGVtZW50KiBlbGVtZW50ID0gc3RhdGljX2Nh c3Q8RWxlbWVudCo+KGN1cnJlbnQpOwotICAgICAgICBpZiAoaXNBY2NlcHRhYmxlRWxlbWVudChl bGVtZW50KSkKLSAgICAgICAgICAgIHJldHVybiBlbGVtZW50OworICAgIGJvb2wgb25seUluY2x1 ZGVEaXJlY3RDaGlsZHJlbiA9IHNob3VsZE9ubHlJbmNsdWRlRGlyZWN0Q2hpbGRyZW4odHlwZSgp KTsKKyAgICBOb2RlKiByb290Tm9kZSA9IGJhc2UoKTsKKyAgICBOb2RlKiBjdXJyZW50ID0gcHJl dmlvdXMgPyBuZXh0Tm9kZShyb290Tm9kZSwgcHJldmlvdXMsIG9ubHlJbmNsdWRlRGlyZWN0Q2hp bGRyZW4pIDogbV9iYXNlLT5maXJzdENoaWxkKCk7CisKKyAgICBmb3IgKDsgY3VycmVudDsgY3Vy cmVudCA9IG5leHROb2RlKHJvb3ROb2RlLCBjdXJyZW50LCBvbmx5SW5jbHVkZURpcmVjdENoaWxk cmVuKSkgeworICAgICAgICBpZiAoY3VycmVudC0+aXNFbGVtZW50Tm9kZSgpICYmIGlzQWNjZXB0 YWJsZUVsZW1lbnQodG9FbGVtZW50KGN1cnJlbnQpKSkKKyAgICAgICAgICAgIHJldHVybiB0b0Vs ZW1lbnQoY3VycmVudCk7CiAgICAgfQogCiAgICAgcmV0dXJuIDA7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxDb2xsZWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MQ29sbGVjdGlvbi5oCShyZXZpc2lvbiAxMjI1MTkpCisrKyBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxDb2xsZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDE5ICszOSwxMyBA QCBjbGFzcyBOb2RlTGlzdDsKIAogY2xhc3MgSFRNTENvbGxlY3Rpb25DYWNoZUJhc2UgOiBwdWJs aWMgRHluYW1pY05vZGVMaXN0Q2FjaGVCYXNlIHsKIHB1YmxpYzoKLSAgICBIVE1MQ29sbGVjdGlv bkNhY2hlQmFzZShDb2xsZWN0aW9uVHlwZSB0eXBlLCBib29sIGluY2x1ZGVDaGlsZHJlbikKLSAg ICAgICAgOiBEeW5hbWljTm9kZUxpc3RDYWNoZUJhc2UoTm9kZUxpc3RJc1Jvb3RlZEF0Tm9kZSwg RG9Ob3RJbnZhbGlkYXRlT25BdHRyaWJ1dGVDaGFuZ2VzKSAvLyBUaGVzZSB0d28gZmxhZ3MgYXJl IG5ldmVyIHVzZWQKKyAgICBIVE1MQ29sbGVjdGlvbkNhY2hlQmFzZShDb2xsZWN0aW9uVHlwZSB0 eXBlKQorICAgICAgICA6IER5bmFtaWNOb2RlTGlzdENhY2hlQmFzZSh0eXBlKQogICAgICAgICAs IG1fY2FjaGVkRWxlbWVudHNBcnJheU9mZnNldCgwKQogICAgICAgICAsIG1fY2FjaGVUcmVlVmVy c2lvbigwKQotICAgICAgICAsIG1faGFzTmFtZUNhY2hlKGZhbHNlKQotICAgICAgICAsIG1fdHlw ZSh0eXBlKQotICAgICAgICAsIG1faW5jbHVkZUNoaWxkcmVuKGluY2x1ZGVDaGlsZHJlbikKICAg ICB7Ci0gICAgICAgIEFTU0VSVChzdGF0aWNfY2FzdDxDb2xsZWN0aW9uVHlwZT4obV90eXBlKSA9 PSB0eXBlKTsKICAgICB9CiAKLSAgICBDb2xsZWN0aW9uVHlwZSB0eXBlKCkgY29uc3QgeyByZXR1 cm4gc3RhdGljX2Nhc3Q8Q29sbGVjdGlvblR5cGU+KG1fdHlwZSk7IH0KLQogcHJvdGVjdGVkOgog ICAgIHZvaWQgY2xlYXJDYWNoZSh1aW50NjRfdCBjdXJyZW50RG9tVHJlZVZlcnNpb24pIGNvbnN0 CiAgICAgewpAQCAtNjAsNyArNTQsNiBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIG1fbmFtZUNhY2hl LmNsZWFyKCk7CiAgICAgICAgIG1fY2FjaGVkRWxlbWVudHNBcnJheU9mZnNldCA9IDA7CiAgICAg ICAgIG1fY2FjaGVUcmVlVmVyc2lvbiA9IGN1cnJlbnREb21UcmVlVmVyc2lvbjsKLSAgICAgICAg bV9oYXNOYW1lQ2FjaGUgPSBmYWxzZTsKICAgICB9CiAKICAgICB2b2lkIHNldEl0ZW1DYWNoZShO b2RlKiBpdGVtLCB1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGVsZW1lbnRzQXJyYXlPZmZzZXQp IGNvbnN0CkBAIC03MCw3ICs2Myw2IEBAIHByb3RlY3RlZDoKICAgICB9CiAgICAgdW5zaWduZWQg Y2FjaGVkRWxlbWVudHNBcnJheU9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fY2FjaGVkRWxlbWVu dHNBcnJheU9mZnNldDsgfQogCi0gICAgYm9vbCBpbmNsdWRlQ2hpbGRyZW4oKSBjb25zdCB7IHJl dHVybiBtX2luY2x1ZGVDaGlsZHJlbjsgfQogICAgIHVpbnQ2NF90IGNhY2hlVHJlZVZlcnNpb24o KSBjb25zdCB7IHJldHVybiBtX2NhY2hlVHJlZVZlcnNpb247IH0KIAogICAgIHR5cGVkZWYgSGFz aE1hcDxBdG9taWNTdHJpbmdJbXBsKiwgT3duUHRyPFZlY3RvcjxFbGVtZW50Kj4gPiA+IE5vZGVD YWNoZU1hcDsKQEAgLTc5LDkgKzcxLDYgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgYXBwZW5kSWRD YWNoZShjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUsIEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0IHsg YXBwZW5kKG1faWRDYWNoZSwgbmFtZSwgZWxlbWVudCk7IH0KICAgICB2b2lkIGFwcGVuZE5hbWVD YWNoZShjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUsIEVsZW1lbnQqIGVsZW1lbnQpIGNvbnN0IHsg YXBwZW5kKG1fbmFtZUNhY2hlLCBuYW1lLCBlbGVtZW50KTsgfQogCi0gICAgYm9vbCBoYXNOYW1l Q2FjaGUoKSBjb25zdCB7IHJldHVybiBtX2hhc05hbWVDYWNoZTsgfQotICAgIHZvaWQgc2V0SGFz TmFtZUNhY2hlKCkgY29uc3QgeyBtX2hhc05hbWVDYWNoZSA9IHRydWU7IH0KLQogICAgIHN0YXRp YyB2b2lkIGFwcGVuZChOb2RlQ2FjaGVNYXAmLCBjb25zdCBBdG9taWNTdHJpbmcmLCBFbGVtZW50 Kik7CiAKIHByaXZhdGU6CkBAIC05NCwxMSArODMsNiBAQCBwcml2YXRlOgogICAgIG11dGFibGUg Tm9kZUNhY2hlTWFwIG1fbmFtZUNhY2hlOwogICAgIG11dGFibGUgdW5zaWduZWQgbV9jYWNoZWRF bGVtZW50c0FycmF5T2Zmc2V0OwogICAgIG11dGFibGUgdWludDY0X3QgbV9jYWNoZVRyZWVWZXJz aW9uOwotCi0gICAgLy8gRklYTUU6IE1vdmUgdGhlc2UgYml0IGZsYWdzIHRvIER5bmFtaWNOb2Rl TGlzdENhY2hlQmFzZSB0byBwYWNrIHRoZW0gYmV0dGVyLgotICAgIG11dGFibGUgdW5zaWduZWQg bV9oYXNOYW1lQ2FjaGUgOiAxOwotICAgIGNvbnN0IHVuc2lnbmVkIG1fdHlwZSA6IDU7IC8vIENv bGxlY3Rpb25UeXBlCi0gICAgY29uc3QgdW5zaWduZWQgbV9pbmNsdWRlQ2hpbGRyZW4gOiAxOwog fTsKIAogY2xhc3MgSFRNTENvbGxlY3Rpb24gOiBwdWJsaWMgUmVmQ291bnRlZDxIVE1MQ29sbGVj dGlvbj4sIHB1YmxpYyBIVE1MQ29sbGVjdGlvbkNhY2hlQmFzZSB7Cg==