107278 2013-01-18 06:51:45 -0800 Web Inspector: Native Memory Instrumentation: replace nodeName argument with className 2013-01-31 22:53:57 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 107303 107254 1 loislo loislo apavlov benjamin keishi loislo ojan.autocc pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 810548 0 loislo 2013-01-18 06:51:45 -0800 I found that in all the cases we need className when we report raw and private buffers and never need nodeName. 810549 1 183444 loislo 2013-01-18 06:55:08 -0800 Created attachment 183444 Patch 810571 2 183444 yurys 2013-01-18 07:23:37 -0800 Comment on attachment 183444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183444&action=review > Source/WTF/wtf/MemoryInstrumentation.h:261 > + MemoryClassInfo info(memoryObjectInfo, object, 0, sizeof(T)); How is it related to this change? > Source/WTF/wtf/MemoryInstrumentationHashCountedSet.h:45 > + info.addPrivateBuffer(sizeof(typename HashMapType::ValueType) * hashSet->capacity(), "ValueType[]", "data"); It seems that we can derive actual name for ValueType automatically the same way as you do for other classes in https://bugs.webkit.org/show_bug.cgi?id=107262. > Source/WTF/wtf/MemoryInstrumentationParsedURL.h:43 > + info.addMember(urlString->string(), "string"); This seems unrelated. You can do this as part of https://bugs.webkit.org/show_bug.cgi?id=107262 or similar bug. 810791 3 183499 loislo 2013-01-18 10:28:26 -0800 Created attachment 183499 Patch 822350 4 loislo 2013-01-31 22:53:57 -0800 Committed r141539: <http://trac.webkit.org/changeset/141539> 183444 2013-01-18 06:55:08 -0800 2013-01-18 10:28:18 -0800 Patch bug-107278-20130118185206.patch text/plain 15907 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDhmYWJmMGQyNzQ0ZWIyM2VlOTA0NjM1 MTU0Mzg0YWYwMTAyZTNlMDQuLjY4ZThhNjY4ZDMzNzZkNTkxYmY0ZTNmNWM3OGU1MmQwZWI5Njcz YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTMtMDEtMTggIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5hdGl2ZSBNZW1v cnkgSW5zdHJ1bWVudGF0aW9uOiByZXBsYWNlIG5vZGVOYW1lIGFyZ3VtZW50IHdpdGggY2xhc3NO YW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcy NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIHJl cGxhY2VkIG5vZGVOYW1lIHdpdGggY2xhc3NOYW1lLgorICAgICAgICBEcml2ZSBieSBmaXg6IHJl cG9ydCBjbGFzc05hbWVzIGFuZCBlZGdlTmFtZXMgZm9yIGdlbmVyaWMgY29udGFpbmVycyBhbmQg c3RyaW5ncy4KKworICAgICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uY3BwOgorICAg ICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50YXRpb246OnJlcG9ydExpbmtUb0J1ZmZlcik6Cisg ICAgICAgIChXVEY6Ok1lbW9yeUNsYXNzSW5mbzo6YWRkUmF3QnVmZmVyKToKKyAgICAgICAgKFdU Rjo6TWVtb3J5Q2xhc3NJbmZvOjphZGRQcml2YXRlQnVmZmVyKToKKyAgICAgICAgKiB3dGYvTWVt b3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChNZW1vcnlDbGFzc0luZm8pOgorICAgICAg ICAoV1RGKToKKyAgICAgICAgKFdURjo6OjpyZXBvcnRPYmplY3RNZW1vcnlVc2FnZSk6CisgICAg ICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkFycmF5QnVmZmVyVmlldy5oOgorICAgICAg ICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1l bnRhdGlvbkhhc2hDb3VudGVkU2V0Lmg6CisgICAgICAgIChXVEY6OnJlcG9ydE1lbW9yeVVzYWdl KToKKyAgICAgICAgKiB3dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaE1hcC5oOgorICAgICAg ICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1l bnRhdGlvbkhhc2hTZXQuaDoKKyAgICAgICAgKFdURjo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAg ICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25MaXN0SGFzaFNldC5oOgorICAgICAgICAo V1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRh dGlvblBhcnNlZFVSTC5oOgorICAgICAgICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAg ICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmg6CisgICAgICAgICogd3Rm L01lbW9yeUluc3RydW1lbnRhdGlvblN0cmluZy5oOgorICAgICAgICAoV1RGOjpyZXBvcnRNZW1v cnlVc2FnZSk6CisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5oOgor ICAgICAgICAoV1RGOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisKIDIwMTMtMDEtMTQgIERvbWluaWsg UsO2dHRzY2hlcyAgPGRvbWluaWsucm90dHNjaGVzQGludGVsLmNvbT4KIAogICAgICAgICBbRUZM XSBVcGRhdGUgZnJlZXR5cGUgaW4gamhidWlsZCB0byAyLjQuMTEgYW5kIGFjdGl2YXRlIHN1YnBp eGVsIGxheW91dApkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0 aW9uLmNwcCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5jcHAKaW5kZXgg MGU0NTJhOGE3MmUzZmM5OTVjMmY2ZTY5Y2QwZTg3MjYzMWRhMDg5My4uZGRjZWQ4ZjY3YTBjYThh MmI4ZDk5ZWY2NzU3NTkwMGJhZTIxODhiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvTWVt b3J5SW5zdHJ1bWVudGF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVt ZW50YXRpb24uY3BwCkBAIC02NCwxMSArNjQsMTEgQEAgdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRp b246OmNhbGxSZXBvcnRPYmplY3RJbmZvKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEkK ICAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRPYmplY3RJbmZvKHBvaW50ZXIsIG9iamVjdFR5 cGUsIG9iamVjdFNpemUpOwogfQogCi12b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0 TGlua1RvQnVmZmVyKGNvbnN0IHZvaWQqIGJ1ZmZlciwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9i amVjdFR5cGUsIHNpemVfdCBzaXplLCBjb25zdCBjaGFyKiBub2RlTmFtZSwgY29uc3QgY2hhciog ZWRnZU5hbWUpCit2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0TGlua1RvQnVmZmVy KGNvbnN0IHZvaWQqIGJ1ZmZlciwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUsIHNp emVfdCBzaXplLCBjb25zdCBjaGFyKiBjbGFzc05hbWUsIGNvbnN0IGNoYXIqIGVkZ2VOYW1lKQog ewogICAgIE1lbW9yeU9iamVjdEluZm8gbWVtb3J5T2JqZWN0SW5mbyh0aGlzLCBvd25lck9iamVj dFR5cGUsIDApOwogICAgIG1lbW9yeU9iamVjdEluZm8ucmVwb3J0T2JqZWN0SW5mbyhidWZmZXIs IG93bmVyT2JqZWN0VHlwZSwgc2l6ZSk7Ci0gICAgbWVtb3J5T2JqZWN0SW5mby5zZXROYW1lKG5v ZGVOYW1lKTsKKyAgICBtZW1vcnlPYmplY3RJbmZvLnNldENsYXNzTmFtZShjbGFzc05hbWUpOwog ICAgIG1fY2xpZW50LT5yZXBvcnRMZWFmKG1lbW9yeU9iamVjdEluZm8sIGVkZ2VOYW1lKTsKIH0K IApAQCAtMTI5LDEzICsxMjksMTMgQEAgdm9pZCBNZW1vcnlDbGFzc0luZm86OmluaXQoY29uc3Qg dm9pZCogb2JqZWN0QWRkcmVzcywgTWVtb3J5T2JqZWN0VHlwZSBvYmplY3RUeXAKICAgICBtX3Nr aXBNZW1iZXJzID0gIW1fbWVtb3J5T2JqZWN0SW5mby0+Zmlyc3RWaXNpdCgpOwogfQogCi12b2lk IE1lbW9yeUNsYXNzSW5mbzo6YWRkUmF3QnVmZmVyKGNvbnN0IHZvaWQqIGJ1ZmZlciwgc2l6ZV90 IHNpemUsIGNvbnN0IGNoYXIqIG5vZGVOYW1lLCBjb25zdCBjaGFyKiBlZGdlTmFtZSkKK3ZvaWQg TWVtb3J5Q2xhc3NJbmZvOjphZGRSYXdCdWZmZXIoY29uc3Qgdm9pZCogYnVmZmVyLCBzaXplX3Qg c2l6ZSwgY29uc3QgY2hhciogY2xhc3NOYW1lLCBjb25zdCBjaGFyKiBlZGdlTmFtZSkKIHsKICAg ICBpZiAoIW1fc2tpcE1lbWJlcnMpCi0gICAgICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5h ZGRSYXdCdWZmZXIoYnVmZmVyLCBtX29iamVjdFR5cGUsIHNpemUsIG5vZGVOYW1lLCBlZGdlTmFt ZSk7CisgICAgICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5hZGRSYXdCdWZmZXIoYnVmZmVy LCBtX29iamVjdFR5cGUsIHNpemUsIGNsYXNzTmFtZSwgZWRnZU5hbWUpOwogfQogCi12b2lkIE1l bW9yeUNsYXNzSW5mbzo6YWRkUHJpdmF0ZUJ1ZmZlcihzaXplX3Qgc2l6ZSwgTWVtb3J5T2JqZWN0 VHlwZSBvd25lck9iamVjdFR5cGUsIGNvbnN0IGNoYXIqIG5vZGVOYW1lLCBjb25zdCBjaGFyKiBl ZGdlTmFtZSkKK3ZvaWQgTWVtb3J5Q2xhc3NJbmZvOjphZGRQcml2YXRlQnVmZmVyKHNpemVfdCBz aXplLCBNZW1vcnlPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSwgY29uc3QgY2hhciogY2xhc3NO YW1lLCBjb25zdCBjaGFyKiBlZGdlTmFtZSkKIHsKICAgICBpZiAoIXNpemUpCiAgICAgICAgIHJl dHVybjsKQEAgLTE0NCw3ICsxNDQsNyBAQCB2b2lkIE1lbW9yeUNsYXNzSW5mbzo6YWRkUHJpdmF0 ZUJ1ZmZlcihzaXplX3Qgc2l6ZSwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVjdAogICAgIGlm ICghb3duZXJPYmplY3RUeXBlKQogICAgICAgICBvd25lck9iamVjdFR5cGUgPSBtX29iamVjdFR5 cGU7CiAgICAgbV9tZW1vcnlJbnN0cnVtZW50YXRpb24tPmNvdW50T2JqZWN0U2l6ZSgwLCBvd25l ck9iamVjdFR5cGUsIHNpemUpOwotICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5yZXBvcnRM aW5rVG9CdWZmZXIoMCwgb3duZXJPYmplY3RUeXBlLCBzaXplLCBub2RlTmFtZSwgZWRnZU5hbWUp OworICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5yZXBvcnRMaW5rVG9CdWZmZXIoMCwgb3du ZXJPYmplY3RUeXBlLCBzaXplLCBjbGFzc05hbWUsIGVkZ2VOYW1lKTsKIH0KIAogdm9pZCBNZW1v cnlDbGFzc0luZm86OnNldEN1c3RvbUFsbG9jYXRpb24oYm9vbCBjdXN0b21BbGxvY2F0aW9uKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmggYi9Tb3Vy Y2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaAppbmRleCBiYzMxY2I3OTQ2ZmE4ZmRm NmY0MjdlYWVhZmRkNmE4MzhjYTM2ZTY2Li45ZGEwZjRiNmJmYzFkZDg4YmIxMmMwZDE0ZDY5Zjhm MDMxMjVmODY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRp b24uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaApAQCAtMzQs NiArMzQsNyBAQAogI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUGFzc093 blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvVW51c2VkUGFy YW0uaD4KIAogI2RlZmluZSBERUJVR19QT0lOVEVSX0lOU1RSVU1FTlRBVElPTiAwCiAKQEAgLTIx MiwyMCArMjEzLDYgQEAgcHJpdmF0ZToKICAgICBNZW1vcnlJbnN0cnVtZW50YXRpb25DbGllbnQq IG1fY2xpZW50OwogfTsKIAotdGVtcGxhdGUgPD4KLXRlbXBsYXRlIDx0eXBlbmFtZSBUPgotdm9p ZCBNZW1vcnlJbnN0cnVtZW50YXRpb246Okluc3RydW1lbnRhdGlvblNlbGVjdG9yPHRydWU+Ojpy ZXBvcnRPYmplY3RNZW1vcnlVc2FnZShjb25zdCBUKiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8q IG1lbW9yeU9iamVjdEluZm8pCi17Ci0gICAgb2JqZWN0LT5yZXBvcnRNZW1vcnlVc2FnZShtZW1v cnlPYmplY3RJbmZvKTsKLX0KLQotdGVtcGxhdGUgPD4KLXRlbXBsYXRlIDx0eXBlbmFtZSBUPgot dm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246Okluc3RydW1lbnRhdGlvblNlbGVjdG9yPGZhbHNl Pjo6cmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2UoY29uc3QgVCogb2JqZWN0LCBNZW1vcnlPYmplY3RJ bmZvKiBtZW1vcnlPYmplY3RJbmZvKQotewotICAgIGNhbGxSZXBvcnRPYmplY3RJbmZvKG1lbW9y eU9iamVjdEluZm8sIG9iamVjdCwgMCwgc2l6ZW9mKFQpKTsKLX0KLQogY2xhc3MgTWVtb3J5Q2xh c3NJbmZvIHsKIHB1YmxpYzoKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgpAQCAtMjQ0LDggKzIz MSw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5hZGRP YmplY3QobWVtYmVyLCBtX21lbW9yeU9iamVjdEluZm8sIGVkZ2VOYW1lKTsKICAgICB9CiAKLSAg ICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBhZGRSYXdCdWZmZXIoY29uc3Qgdm9pZCogYnVmZmVy LCBzaXplX3QsIGNvbnN0IGNoYXIqIG5vZGVOYW1lID0gMCwgY29uc3QgY2hhciogZWRnZU5hbWUg PSAwKTsKLSAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBhZGRQcml2YXRlQnVmZmVyKHNpemVf dCwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUgPSAwLCBjb25zdCBjaGFyKiBub2Rl TmFtZSA9IDAsIGNvbnN0IGNoYXIqIGVkZ2VOYW1lID0gMCk7CisgICAgV1RGX0VYUE9SVF9QUklW QVRFIHZvaWQgYWRkUmF3QnVmZmVyKGNvbnN0IHZvaWQqIGJ1ZmZlciwgc2l6ZV90LCBjb25zdCBj aGFyKiBjbGFzc05hbWUgPSAwLCBjb25zdCBjaGFyKiBlZGdlTmFtZSA9IDApOworICAgIFdURl9F WFBPUlRfUFJJVkFURSB2b2lkIGFkZFByaXZhdGVCdWZmZXIoc2l6ZV90LCBNZW1vcnlPYmplY3RU eXBlIG93bmVyT2JqZWN0VHlwZSA9IDAsIGNvbnN0IGNoYXIqIGNsYXNzTmFtZSA9IDAsIGNvbnN0 IGNoYXIqIGVkZ2VOYW1lID0gMCk7CiAgICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgc2V0Q3Vz dG9tQWxsb2NhdGlvbihib29sKTsKIAogICAgIHZvaWQgYWRkV2Vha1BvaW50ZXIodm9pZCopIHsg fQpAQCAtMjYwLDYgKzI0NywyMSBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9za2lwTWVtYmVyczsK IH07CiAKK3RlbXBsYXRlIDw+Cit0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KK3ZvaWQgTWVtb3J5SW5z dHJ1bWVudGF0aW9uOjpJbnN0cnVtZW50YXRpb25TZWxlY3Rvcjx0cnVlPjo6cmVwb3J0T2JqZWN0 TWVtb3J5VXNhZ2UoY29uc3QgVCogb2JqZWN0LCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmpl Y3RJbmZvKQoreworICAgIG9iamVjdC0+cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5m byk7Cit9CisKK3RlbXBsYXRlIDw+Cit0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KK3ZvaWQgTWVtb3J5 SW5zdHJ1bWVudGF0aW9uOjpJbnN0cnVtZW50YXRpb25TZWxlY3RvcjxmYWxzZT46OnJlcG9ydE9i amVjdE1lbW9yeVVzYWdlKGNvbnN0IFQqIG9iamVjdCwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5 T2JqZWN0SW5mbykKK3sKKyAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZv LCBvYmplY3QsIDAsIHNpemVvZihUKSk7CisgICAgVU5VU0VEX1BBUkFNKGluZm8pOworfQorCiB0 ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25zdCBUKiBvYmpl Y3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25BcnJheUJ1ZmZlclZpZXcuaCBiL1Nv dXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkFycmF5QnVmZmVyVmlldy5oCmluZGV4 IDUyZGU1ZTMxODMzMGU0MjU4NGY0YjFlOGFhNmI4M2QxMDRjMGY3ZWQuLjQ1ZDQzYWRiNTA3NzJk N2VmMWU5NDUzNDBhMGM2ZTQwM2ZjMDFiM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01l bW9yeUluc3RydW1lbnRhdGlvbkFycmF5QnVmZmVyVmlldy5oCisrKyBiL1NvdXJjZS9XVEYvd3Rm L01lbW9yeUluc3RydW1lbnRhdGlvbkFycmF5QnVmZmVyVmlldy5oCkBAIC0zOSwxMyArMzksMTMg QEAgbmFtZXNwYWNlIFdURiB7CiBpbmxpbmUgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25zdCBB cnJheUJ1ZmZlclZpZXcqIGFycmF5QnVmZmVyVmlldywgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5 T2JqZWN0SW5mbykKIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZv LCBhcnJheUJ1ZmZlclZpZXcpOwotICAgIGluZm8uYWRkTWVtYmVyKGFycmF5QnVmZmVyVmlldy0+ YnVmZmVyKCkuZ2V0KCkpOworICAgIGluZm8uYWRkTWVtYmVyKGFycmF5QnVmZmVyVmlldy0+YnVm ZmVyKCkuZ2V0KCksICJidWZmZXIiKTsKIH0KIAogaW5saW5lIHZvaWQgcmVwb3J0TWVtb3J5VXNh Z2UoY29uc3QgQXJyYXlCdWZmZXIqIGFycmF5QnVmZmVyLCBNZW1vcnlPYmplY3RJbmZvKiBtZW1v cnlPYmplY3RJbmZvKQogewogICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdElu Zm8sIGFycmF5QnVmZmVyKTsKLSAgICBpbmZvLmFkZFJhd0J1ZmZlcihhcnJheUJ1ZmZlci0+ZGF0 YSgpLCBhcnJheUJ1ZmZlci0+Ynl0ZUxlbmd0aCgpKTsKKyAgICBpbmZvLmFkZFJhd0J1ZmZlcihh cnJheUJ1ZmZlci0+ZGF0YSgpLCBhcnJheUJ1ZmZlci0+Ynl0ZUxlbmd0aCgpLCAiYnl0ZVtdIiwg ImRhdGEiKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1 bWVudGF0aW9uSGFzaENvdW50ZWRTZXQuaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1l bnRhdGlvbkhhc2hDb3VudGVkU2V0LmgKaW5kZXggMTE4ODE1N2E5ZDIyZjIzZDMxNjQ2OGQ2OTRi ZWNmOTMwOTgyMWU4Yy4uMmJiYmIwZjJmODk4NGVjMTQzNjE2YTI1Y2Q4NjkwMmU5MTUxZmUzMiAx MDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaENvdW50 ZWRTZXQuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoQ291 bnRlZFNldC5oCkBAIC00Miw3ICs0Miw3IEBAIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3Qg SGFzaENvdW50ZWRTZXQ8VmFsdWVBcmcsIEhhc2hBcmcsIFRyYWl0c0FyZz4qIGhhc2hTCiAgICAg TWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgaGFzaFNldCk7CiAKICAgICB0 eXBlZGVmIEhhc2hNYXA8VmFsdWVBcmcsIHVuc2lnbmVkLCBIYXNoQXJnLCBUcmFpdHNBcmc+IEhh c2hNYXBUeXBlOwotICAgIGluZm8uYWRkUHJpdmF0ZUJ1ZmZlcihzaXplb2YodHlwZW5hbWUgSGFz aE1hcFR5cGU6OlZhbHVlVHlwZSkgKiBoYXNoU2V0LT5jYXBhY2l0eSgpKTsKKyAgICBpbmZvLmFk ZFByaXZhdGVCdWZmZXIoc2l6ZW9mKHR5cGVuYW1lIEhhc2hNYXBUeXBlOjpWYWx1ZVR5cGUpICog aGFzaFNldC0+Y2FwYWNpdHkoKSwgIlZhbHVlVHlwZVtdIiwgImRhdGEiKTsKICAgICBTZXF1ZW5j ZU1lbW9yeUluc3RydW1lbnRhdGlvblRyYWl0czxWYWx1ZUFyZz46OnJlcG9ydE1lbW9yeVVzYWdl KGhhc2hTZXQtPmJlZ2luKCkua2V5cygpLCBoYXNoU2V0LT5lbmQoKS5rZXlzKCksIGluZm8pOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNo TWFwLmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25IYXNoTWFwLmgKaW5k ZXggNDhmMzkyY2Q5NDdlOWJhYTc3ODY1MjgxMTFiM2YyZTAwNGM3YzQzNy4uYWFhYWYyYTZiODlj NjM5NTU2MjRjOGVmODkxNThmZDUyMGEzYjAwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uSGFzaE1hcC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9y eUluc3RydW1lbnRhdGlvbkhhc2hNYXAuaApAQCAtNDEsNyArNDEsNyBAQCB2b2lkIHJlcG9ydE1l bW9yeVVzYWdlKGNvbnN0IEhhc2hNYXA8S2V5QXJnLCBNYXBwZWRBcmcsIEhhc2hBcmcsIEtleVRy YWl0c0FyZywgTQogewogICAgIE1lbW9yeUNsYXNzSW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8s IGhhc2hNYXApOwogICAgIHR5cGVkZWYgSGFzaE1hcDxLZXlBcmcsIE1hcHBlZEFyZywgSGFzaEFy ZywgS2V5VHJhaXRzQXJnLCBNYXBwZWRUcmFpdHNBcmc+IEhhc2hNYXBUeXBlOwotICAgIGluZm8u YWRkUHJpdmF0ZUJ1ZmZlcihzaXplb2YodHlwZW5hbWUgSGFzaE1hcFR5cGU6OlZhbHVlVHlwZSkg KiBoYXNoTWFwLT5jYXBhY2l0eSgpKTsKKyAgICBpbmZvLmFkZFByaXZhdGVCdWZmZXIoc2l6ZW9m KHR5cGVuYW1lIEhhc2hNYXBUeXBlOjpWYWx1ZVR5cGUpICogaGFzaE1hcC0+Y2FwYWNpdHkoKSwg IlZhbHVlVHlwZVtdIiwgImRhdGEiKTsKIAogICAgIFNlcXVlbmNlTWVtb3J5SW5zdHJ1bWVudGF0 aW9uVHJhaXRzPEtleUFyZz46OnJlcG9ydE1lbW9yeVVzYWdlKGhhc2hNYXAtPmJlZ2luKCkua2V5 cygpLCBoYXNoTWFwLT5lbmQoKS5rZXlzKCksIGluZm8pOwogICAgIFNlcXVlbmNlTWVtb3J5SW5z dHJ1bWVudGF0aW9uVHJhaXRzPE1hcHBlZEFyZz46OnJlcG9ydE1lbW9yeVVzYWdlKGhhc2hNYXAt PmJlZ2luKCkudmFsdWVzKCksIGhhc2hNYXAtPmVuZCgpLnZhbHVlcygpLCBpbmZvKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hTZXQuaCBiL1Nv dXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkhhc2hTZXQuaAppbmRleCBkODE2NDdh YjIzNGEyN2ZlMTY3NGE3MzVkZWI2YTRjN2UxYzYyOWU1Li43ZDk4NmIxOGY1MzM5YzY1ZmE3ZDc1 YTE4M2E1Y2M4NDE3NTM3ZGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0 cnVtZW50YXRpb25IYXNoU2V0LmgKKysrIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVu dGF0aW9uSGFzaFNldC5oCkBAIC00MCw3ICs0MCw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFZhbHVl QXJnLCB0eXBlbmFtZSBIYXNoQXJnLCB0eXBlbmFtZSBUcmFpdHNBcmc+CiB2b2lkIHJlcG9ydE1l bW9yeVVzYWdlKGNvbnN0IEhhc2hTZXQ8VmFsdWVBcmcsIEhhc2hBcmcsIFRyYWl0c0FyZz4qIGhh c2hTZXQsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CiAgICAgTWVtb3J5 Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgaGFzaFNldCk7Ci0gICAgaW5mby5hZGRQ cml2YXRlQnVmZmVyKHNpemVvZih0eXBlbmFtZSBIYXNoVGFibGU8VmFsdWVBcmcsIFZhbHVlQXJn LCBJZGVudGl0eUV4dHJhY3RvciwgSGFzaEFyZywgVHJhaXRzQXJnLCBUcmFpdHNBcmc+OjpWYWx1 ZVR5cGUpICogaGFzaFNldC0+Y2FwYWNpdHkoKSk7CisgICAgaW5mby5hZGRQcml2YXRlQnVmZmVy KHNpemVvZih0eXBlbmFtZSBIYXNoVGFibGU8VmFsdWVBcmcsIFZhbHVlQXJnLCBJZGVudGl0eUV4 dHJhY3RvciwgSGFzaEFyZywgVHJhaXRzQXJnLCBUcmFpdHNBcmc+OjpWYWx1ZVR5cGUpICogaGFz aFNldC0+Y2FwYWNpdHkoKSwgIlZhbHVlVHlwZVtdIiwgImRhdGEiKTsKICAgICBTZXF1ZW5jZU1l bW9yeUluc3RydW1lbnRhdGlvblRyYWl0czxWYWx1ZUFyZz46OnJlcG9ydE1lbW9yeVVzYWdlKGhh c2hTZXQtPmJlZ2luKCksIGhhc2hTZXQtPmVuZCgpLCBpbmZvKTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uTGlzdEhhc2hTZXQuaCBiL1NvdXJj ZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbkxpc3RIYXNoU2V0LmgKaW5kZXggOWNhZThh MWYzZjQ0ZTlkZDZiOTE3YjEwZDg1MjYwM2ZjNWZkNjY5Ni4uNWQyYjk2ZGY1NjFmY2JiM2IzMTZj OTg2MjY0ZWM1MmJkYjEzMWUwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5z dHJ1bWVudGF0aW9uTGlzdEhhc2hTZXQuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0 cnVtZW50YXRpb25MaXN0SGFzaFNldC5oCkBAIC00MCw3ICs0MCw3IEBAIHRlbXBsYXRlPHR5cGVu YW1lIFZhbHVlQXJnLCBzaXplX3QgaW5saW5lQ2FwYWNpdHksIHR5cGVuYW1lIEhhc2hBcmc+CiB2 b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IExpc3RIYXNoU2V0PFZhbHVlQXJnLCBpbmxpbmVD YXBhY2l0eSwgSGFzaEFyZz4qIHNldCwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5m bykKIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCBzZXQpOwot ICAgIGluZm8uYWRkUHJpdmF0ZUJ1ZmZlcihzZXQtPnNpemVJbkJ5dGVzKCkgLSBzaXplb2YoKnNl dCkpOworICAgIGluZm8uYWRkUHJpdmF0ZUJ1ZmZlcihzZXQtPnNpemVJbkJ5dGVzKCkgLSBzaXpl b2YoKnNldCksICJWYWx1ZVR5cGVbXSIsICJkYXRhIik7CiAgICAgU2VxdWVuY2VNZW1vcnlJbnN0 cnVtZW50YXRpb25UcmFpdHM8VmFsdWVBcmc+OjpyZXBvcnRNZW1vcnlVc2FnZShzZXQtPmJlZ2lu KCksIHNldC0+ZW5kKCksIGluZm8pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9N ZW1vcnlJbnN0cnVtZW50YXRpb25QYXJzZWRVUkwuaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUlu c3RydW1lbnRhdGlvblBhcnNlZFVSTC5oCmluZGV4IDgyOTU1ZTY4OTk3YzczMjNjMjMxZGI4NTU5 MGQ0ZmM4ZWZiMjgzZGYuLjMwODQ5MTAxOTEzZGRjMGVjNDg0N2U4ZTg1NzI0NDliM2E5NDUxNmQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblBhcnNlZFVS TC5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblBhcnNlZFVSTC5o CkBAIC00MCwxMyArNDAsMTMgQEAgbmFtZXNwYWNlIFdURiB7CiBpbmxpbmUgdm9pZCByZXBvcnRN ZW1vcnlVc2FnZShjb25zdCBVUkxTdHJpbmcqIHVybFN0cmluZywgTWVtb3J5T2JqZWN0SW5mbyog bWVtb3J5T2JqZWN0SW5mbykKIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmpl Y3RJbmZvLCB1cmxTdHJpbmcpOwotICAgIGluZm8uYWRkTWVtYmVyKHVybFN0cmluZy0+c3RyaW5n KCkpOworICAgIGluZm8uYWRkTWVtYmVyKHVybFN0cmluZy0+c3RyaW5nKCksICJzdHJpbmciKTsK IH0KIAogaW5saW5lIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgUGFyc2VkVVJMKiBwYXJz ZWRVUkwsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CiAgICAgTWVtb3J5 Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgcGFyc2VkVVJMKTsKLSAgICBpbmZvLmFk ZE1lbWJlcihwYXJzZWRVUkwtPnNwZWMoKSk7CisgICAgaW5mby5hZGRNZW1iZXIocGFyc2VkVVJM LT5zcGVjKCksICJzcGVjIik7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01l bW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0 cnVtZW50YXRpb25TZXF1ZW5jZS5oCmluZGV4IGY3NzFmOTc3MTBlNzNmOWJmNzk5NzY1ZDk4NWEy YTQ5YTM2ZjkzZjMuLmUzZjczOTQ1OWY3MzUzMTEzZTIxYjU1ZmEyODJmZDk5YmQ2NzMwNzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblNlcXVlbmNlLmgK KysrIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uU2VxdWVuY2UuaApAQCAt NTgsNyArNTgsNyBAQCBzdHJ1Y3QgU2VxdWVuY2VNZW1vcnlJbnN0cnVtZW50YXRpb25UcmFpdHM8 Tm90Q29udmVydGlibGVUb0ludGVnZXI8VmFsdWVUeXBlPiA+CiAgICAgc3RhdGljIHZvaWQgcmVw b3J0TWVtb3J5VXNhZ2UoSSBpdGVyYXRvciwgSSBlbmQsIE1lbW9yeUNsYXNzSW5mbyYgaW5mbykK ICAgICB7CiAgICAgICAgIHdoaWxlIChpdGVyYXRvciAhPSBlbmQpIHsKLSAgICAgICAgICAgIGlu Zm8uYWRkTWVtYmVyKCppdGVyYXRvcik7CisgICAgICAgICAgICBpbmZvLmFkZE1lbWJlcigqaXRl cmF0b3IsICJpdGVtIik7CiAgICAgICAgICAgICArK2l0ZXJhdG9yOwogICAgICAgICB9CiAgICAg fQpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uU3RyaW5n LmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaAppbmRleCBh MjNiYWEzZGFmYWYxZmNlY2E4NTVhNWJlMjYzY2RkNzM3NzljYWY1Li5kMjQ5MmM4ODI1MGJkNzUx ODRkODc0Y2ZlMGVjYjFkZDM3NjFjYjc0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1v cnlJbnN0cnVtZW50YXRpb25TdHJpbmcuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0 cnVtZW50YXRpb25TdHJpbmcuaApAQCAtNTQsMjYgKzU0LDI2IEBAIGlubGluZSB2b2lkIHJlcG9y dE1lbW9yeVVzYWdlKGNvbnN0IFN0cmluZ0ltcGwqIHN0cmluZ0ltcGwsIE1lbW9yeU9iamVjdElu Zm8qIG1lCiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgc3RyaW5n SW1wbCwgMCwgc2VsZlNpemUpOwogCiAgICAgaWYgKFN0cmluZ0ltcGwqIGJhc2VTdHJpbmcgPSBz dHJpbmdJbXBsLT5iYXNlU3RyaW5nKCkpCi0gICAgICAgIGluZm8uYWRkTWVtYmVyKGJhc2VTdHJp bmcpOworICAgICAgICBpbmZvLmFkZE1lbWJlcihiYXNlU3RyaW5nLCAiYmFzZVN0cmluZyIpOwog ICAgIGVsc2UgewogICAgICAgICBpZiAoc3RyaW5nSW1wbC0+aGFzT3duZWRCdWZmZXIoKSkKLSAg ICAgICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKGJ1ZmZlciwgYnVmZmVyU2l6ZSk7CisgICAgICAg ICAgICBpbmZvLmFkZFJhd0J1ZmZlcihidWZmZXIsIGJ1ZmZlclNpemUsICJjaGFyW10iLCAib3du ZWRCdWZmZXIiKTsKIAogICAgICAgICBpZiAoc3RyaW5nSW1wbC0+aGFzMTZCaXRTaGFkb3coKSkK LSAgICAgICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKHN0cmluZ0ltcGwtPmNoYXJhY3RlcnMoKSwg bGVuZ3RoICogc2l6ZW9mKFVDaGFyKSk7CisgICAgICAgICAgICBpbmZvLmFkZFJhd0J1ZmZlcihz dHJpbmdJbXBsLT5jaGFyYWN0ZXJzKCksIGxlbmd0aCAqIHNpemVvZihVQ2hhciksICJVQ2hhcltd IiwgIjE2Yml0U2hhZG93Iik7CiAgICAgfQogfQogCiBpbmxpbmUgdm9pZCByZXBvcnRNZW1vcnlV c2FnZShjb25zdCBTdHJpbmcqIHN0cmluZywgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0 SW5mbykKIHsKICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCBzdHJp bmcpOwotICAgIGluZm8uYWRkTWVtYmVyKHN0cmluZy0+aW1wbCgpKTsKKyAgICBpbmZvLmFkZE1l bWJlcihzdHJpbmctPmltcGwoKSwgInN0cmluZ0ltcGwiKTsKIH0KIAogaW5saW5lIHZvaWQgcmVw b3J0TWVtb3J5VXNhZ2UoY29uc3QgQXRvbWljU3RyaW5nKiBhdG9taWNTdHJpbmcsIE1lbW9yeU9i amVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8o bWVtb3J5T2JqZWN0SW5mbywgYXRvbWljU3RyaW5nKTsKLSAgICBpbmZvLmFkZE1lbWJlcihhdG9t aWNTdHJpbmctPnN0cmluZygpKTsKKyAgICBpbmZvLmFkZE1lbWJlcihhdG9taWNTdHJpbmctPnN0 cmluZygpLCAic3RyaW5nIik7CiB9CiAKIGlubGluZSB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKGNv bnN0IENTdHJpbmdCdWZmZXIqIGNTdHJpbmdCdWZmZXIsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9y eU9iamVjdEluZm8pCkBAIC04NCw3ICs4NCw3IEBAIGlubGluZSB2b2lkIHJlcG9ydE1lbW9yeVVz YWdlKGNvbnN0IENTdHJpbmdCdWZmZXIqIGNTdHJpbmdCdWZmZXIsIE1lbW9yeU9iamVjdEluCiBp bmxpbmUgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25zdCBDU3RyaW5nKiBjU3RyaW5nLCBNZW1v cnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQogewogICAgIE1lbW9yeUNsYXNzSW5mbyBp bmZvKG1lbW9yeU9iamVjdEluZm8sIGNTdHJpbmcpOwotICAgIGluZm8uYWRkTWVtYmVyKGNTdHJp bmctPmJ1ZmZlcigpKTsKKyAgICBpbmZvLmFkZE1lbWJlcihjU3RyaW5nLT5idWZmZXIoKSwgImJ1 ZmZlciIpOwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVt ZW50YXRpb25WZWN0b3IuaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZl Y3Rvci5oCmluZGV4IGNhZTg0N2M5ZWQ5NzhlY2I3MTBhMTdlYTU1ZDE0MzNkYmUxOTUzZGYuLmUz NDllZGY4M2MyYWE1MmI0OTVmODlkOTUyMGU4MTkwOTY1NGRiZDcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5oCisrKyBiL1NvdXJjZS9XVEYv d3RmL01lbW9yeUluc3RydW1lbnRhdGlvblZlY3Rvci5oCkBAIC00MSw3ICs0MSw3IEBAIHZvaWQg cmVwb3J0TWVtb3J5VXNhZ2UoY29uc3QgVmVjdG9yPFQsIGlubGluZUNhcGFjaXR5PiogdmVjdG9y LCBNZW1vcnlPYmplY3RJbmZvCiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2Jq ZWN0SW5mbywgdmVjdG9yKTsKICAgICBpZiAoaW5saW5lQ2FwYWNpdHkgPCB2ZWN0b3ItPmNhcGFj aXR5KCkpCi0gICAgICAgIGluZm8uYWRkUmF3QnVmZmVyKHZlY3Rvci0+ZGF0YSgpLCB2ZWN0b3It PmNhcGFjaXR5KCkgKiBzaXplb2YoVCkpOworICAgICAgICBpbmZvLmFkZFJhd0J1ZmZlcih2ZWN0 b3ItPmRhdGEoKSwgdmVjdG9yLT5jYXBhY2l0eSgpICogc2l6ZW9mKFQpLCAiVmFsdWVUeXBlW10i LCAiZGF0YSIpOwogICAgIFNlcXVlbmNlTWVtb3J5SW5zdHJ1bWVudGF0aW9uVHJhaXRzPFQ+Ojpy ZXBvcnRNZW1vcnlVc2FnZSh2ZWN0b3ItPmJlZ2luKCksIHZlY3Rvci0+ZW5kKCksIGluZm8pOwog fQogCg== 183499 2013-01-18 10:28:26 -0800 2013-01-31 07:28:36 -0800 Patch bug-107278-20130118222524.patch text/plain 5598 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDE4MDA0Nzc4NmI0MGFmMGJiZTcyODBk ZGIyNmQxZjUxNGNlZGUxMzIuLjBhZDVkYmVjYjk0MGZkMWJkYmIxOGExZmFiYWM5NTRjOTFlN2Q2 N2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTMtMDEtMTggIElseWEgVGlraG9ub3Zza3kgIDxs b2lzbG9AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5hdGl2ZSBNZW1v cnkgSW5zdHJ1bWVudGF0aW9uOiByZXBsYWNlIG5vZGVOYW1lIGFyZ3VtZW50IHdpdGggY2xhc3NO YW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDcy NzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIHJl cGxhY2VkIG5vZGVOYW1lIHdpdGggY2xhc3NOYW1lIGJlY2F1c2Ugd2UgbmV3ZXIgcmVwb3J0IG5v ZGUgbmFtZSBmb3IgcHJpdmF0ZSBhbmQgcmF3IGJ1ZmZlcnMKKyAgICAgICAgYnV0IG5lZWQgdG8g cmVwb3J0IHRoZWlyIGNsYXNzIG5hbWVzLgorCisgICAgICAgICogd3RmL01lbW9yeUluc3RydW1l bnRhdGlvbi5jcHA6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0 TGlua1RvQnVmZmVyKToKKyAgICAgICAgKFdURjo6TWVtb3J5Q2xhc3NJbmZvOjphZGRSYXdCdWZm ZXIpOgorICAgICAgICAoV1RGOjpNZW1vcnlDbGFzc0luZm86OmFkZFByaXZhdGVCdWZmZXIpOgor ICAgICAgICAqIHd0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdURjo6TWVt b3J5SW5zdHJ1bWVudGF0aW9uOjphZGRSYXdCdWZmZXIpOgorICAgICAgICAoTWVtb3J5Q2xhc3NJ bmZvKToKKwogMjAxMy0wMS0xOCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUuY29tPgog CiAgICAgICAgIEZpeCBXVEY6OmNvcHlMQ2hhcnNGcm9tVUNoYXJTb3VyY2UoKSB0byBjb21waWxl IHdpdGggLVdzaG9ydGVuLTY0LXRvLTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1v cnlJbnN0cnVtZW50YXRpb24uY3BwIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0 aW9uLmNwcAppbmRleCAwZTQ1MmE4YTcyZTNmYzk5NWMyZjZlNjljZDBlODcyNjMxZGEwODkzLi5k ZGNlZDhmNjdhMGNhOGEyYjhkOTllZjY3NTc1OTAwYmFlMjE4OGI3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XVEYvd3Rm L01lbW9yeUluc3RydW1lbnRhdGlvbi5jcHAKQEAgLTY0LDExICs2NCwxMSBAQCB2b2lkIE1lbW9y eUluc3RydW1lbnRhdGlvbjo6Y2FsbFJlcG9ydE9iamVjdEluZm8oTWVtb3J5T2JqZWN0SW5mbyog bWVtb3J5T2JqZWN0SQogICAgIG1lbW9yeU9iamVjdEluZm8tPnJlcG9ydE9iamVjdEluZm8ocG9p bnRlciwgb2JqZWN0VHlwZSwgb2JqZWN0U2l6ZSk7CiB9CiAKLXZvaWQgTWVtb3J5SW5zdHJ1bWVu dGF0aW9uOjpyZXBvcnRMaW5rVG9CdWZmZXIoY29uc3Qgdm9pZCogYnVmZmVyLCBNZW1vcnlPYmpl Y3RUeXBlIG93bmVyT2JqZWN0VHlwZSwgc2l6ZV90IHNpemUsIGNvbnN0IGNoYXIqIG5vZGVOYW1l LCBjb25zdCBjaGFyKiBlZGdlTmFtZSkKK3ZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpyZXBv cnRMaW5rVG9CdWZmZXIoY29uc3Qgdm9pZCogYnVmZmVyLCBNZW1vcnlPYmplY3RUeXBlIG93bmVy T2JqZWN0VHlwZSwgc2l6ZV90IHNpemUsIGNvbnN0IGNoYXIqIGNsYXNzTmFtZSwgY29uc3QgY2hh ciogZWRnZU5hbWUpCiB7CiAgICAgTWVtb3J5T2JqZWN0SW5mbyBtZW1vcnlPYmplY3RJbmZvKHRo aXMsIG93bmVyT2JqZWN0VHlwZSwgMCk7CiAgICAgbWVtb3J5T2JqZWN0SW5mby5yZXBvcnRPYmpl Y3RJbmZvKGJ1ZmZlciwgb3duZXJPYmplY3RUeXBlLCBzaXplKTsKLSAgICBtZW1vcnlPYmplY3RJ bmZvLnNldE5hbWUobm9kZU5hbWUpOworICAgIG1lbW9yeU9iamVjdEluZm8uc2V0Q2xhc3NOYW1l KGNsYXNzTmFtZSk7CiAgICAgbV9jbGllbnQtPnJlcG9ydExlYWYobWVtb3J5T2JqZWN0SW5mbywg ZWRnZU5hbWUpOwogfQogCkBAIC0xMjksMTMgKzEyOSwxMyBAQCB2b2lkIE1lbW9yeUNsYXNzSW5m bzo6aW5pdChjb25zdCB2b2lkKiBvYmplY3RBZGRyZXNzLCBNZW1vcnlPYmplY3RUeXBlIG9iamVj dFR5cAogICAgIG1fc2tpcE1lbWJlcnMgPSAhbV9tZW1vcnlPYmplY3RJbmZvLT5maXJzdFZpc2l0 KCk7CiB9CiAKLXZvaWQgTWVtb3J5Q2xhc3NJbmZvOjphZGRSYXdCdWZmZXIoY29uc3Qgdm9pZCog YnVmZmVyLCBzaXplX3Qgc2l6ZSwgY29uc3QgY2hhciogbm9kZU5hbWUsIGNvbnN0IGNoYXIqIGVk Z2VOYW1lKQordm9pZCBNZW1vcnlDbGFzc0luZm86OmFkZFJhd0J1ZmZlcihjb25zdCB2b2lkKiBi dWZmZXIsIHNpemVfdCBzaXplLCBjb25zdCBjaGFyKiBjbGFzc05hbWUsIGNvbnN0IGNoYXIqIGVk Z2VOYW1lKQogewogICAgIGlmICghbV9za2lwTWVtYmVycykKLSAgICAgICAgbV9tZW1vcnlJbnN0 cnVtZW50YXRpb24tPmFkZFJhd0J1ZmZlcihidWZmZXIsIG1fb2JqZWN0VHlwZSwgc2l6ZSwgbm9k ZU5hbWUsIGVkZ2VOYW1lKTsKKyAgICAgICAgbV9tZW1vcnlJbnN0cnVtZW50YXRpb24tPmFkZFJh d0J1ZmZlcihidWZmZXIsIG1fb2JqZWN0VHlwZSwgc2l6ZSwgY2xhc3NOYW1lLCBlZGdlTmFtZSk7 CiB9CiAKLXZvaWQgTWVtb3J5Q2xhc3NJbmZvOjphZGRQcml2YXRlQnVmZmVyKHNpemVfdCBzaXpl LCBNZW1vcnlPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSwgY29uc3QgY2hhciogbm9kZU5hbWUs IGNvbnN0IGNoYXIqIGVkZ2VOYW1lKQordm9pZCBNZW1vcnlDbGFzc0luZm86OmFkZFByaXZhdGVC dWZmZXIoc2l6ZV90IHNpemUsIE1lbW9yeU9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlLCBjb25z dCBjaGFyKiBjbGFzc05hbWUsIGNvbnN0IGNoYXIqIGVkZ2VOYW1lKQogewogICAgIGlmICghc2l6 ZSkKICAgICAgICAgcmV0dXJuOwpAQCAtMTQ0LDcgKzE0NCw3IEBAIHZvaWQgTWVtb3J5Q2xhc3NJ bmZvOjphZGRQcml2YXRlQnVmZmVyKHNpemVfdCBzaXplLCBNZW1vcnlPYmplY3RUeXBlIG93bmVy T2JqZWN0CiAgICAgaWYgKCFvd25lck9iamVjdFR5cGUpCiAgICAgICAgIG93bmVyT2JqZWN0VHlw ZSA9IG1fb2JqZWN0VHlwZTsKICAgICBtX21lbW9yeUluc3RydW1lbnRhdGlvbi0+Y291bnRPYmpl Y3RTaXplKDAsIG93bmVyT2JqZWN0VHlwZSwgc2l6ZSk7Ci0gICAgbV9tZW1vcnlJbnN0cnVtZW50 YXRpb24tPnJlcG9ydExpbmtUb0J1ZmZlcigwLCBvd25lck9iamVjdFR5cGUsIHNpemUsIG5vZGVO YW1lLCBlZGdlTmFtZSk7CisgICAgbV9tZW1vcnlJbnN0cnVtZW50YXRpb24tPnJlcG9ydExpbmtU b0J1ZmZlcigwLCBvd25lck9iamVjdFR5cGUsIHNpemUsIGNsYXNzTmFtZSwgZWRnZU5hbWUpOwog fQogCiB2b2lkIE1lbW9yeUNsYXNzSW5mbzo6c2V0Q3VzdG9tQWxsb2NhdGlvbihib29sIGN1c3Rv bUFsbG9jYXRpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50 YXRpb24uaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5oCmluZGV4IGJj MzFjYjc5NDZmYThmZGY2ZjQyN2VhZWFmZGQ2YTgzOGNhMzZlNjYuLmYzYTFkOGRlNDQ4NDNlNDk1 MWMzNjg5MmQyYjk1YmZlNTUxOWQ3MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01lbW9y eUluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRh dGlvbi5oCkBAIC0xNjksMTIgKzE2OSwxMiBAQCBwcml2YXRlOgogICAgIH07CiAKICAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBUPiB2b2lkIGFkZE9iamVjdChjb25zdCBUJiB0LCBNZW1vcnlPYmplY3RJ bmZvKiBvd25lck9iamVjdEluZm8sIGNvbnN0IGNoYXIqIGVkZ2VOYW1lKSB7IE1lbWJlclR5cGVU cmFpdHM8VD46OmFkZE9iamVjdCh0aGlzLCB0LCBvd25lck9iamVjdEluZm8sIGVkZ2VOYW1lKTsg fQotICAgIHZvaWQgYWRkUmF3QnVmZmVyKGNvbnN0IHZvaWQqIGJ1ZmZlciwgTWVtb3J5T2JqZWN0 VHlwZSBvd25lck9iamVjdFR5cGUsIHNpemVfdCBzaXplLCBjb25zdCBjaGFyKiBub2RlTmFtZSA9 IDAsIGNvbnN0IGNoYXIqIGVkZ2VOYW1lID0gMCkKKyAgICB2b2lkIGFkZFJhd0J1ZmZlcihjb25z dCB2b2lkKiBidWZmZXIsIE1lbW9yeU9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlLCBzaXplX3Qg c2l6ZSwgY29uc3QgY2hhciogY2xhc3NOYW1lID0gMCwgY29uc3QgY2hhciogZWRnZU5hbWUgPSAw KQogICAgIHsKICAgICAgICAgaWYgKCFidWZmZXIgfHwgdmlzaXRlZChidWZmZXIpKQogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICBjb3VudE9iamVjdFNpemUoYnVmZmVyLCBvd25lck9iamVj dFR5cGUsIHNpemUpOwotICAgICAgICByZXBvcnRMaW5rVG9CdWZmZXIoYnVmZmVyLCBvd25lck9i amVjdFR5cGUsIHNpemUsIG5vZGVOYW1lLCBlZGdlTmFtZSk7CisgICAgICAgIHJlcG9ydExpbmtU b0J1ZmZlcihidWZmZXIsIG93bmVyT2JqZWN0VHlwZSwgc2l6ZSwgY2xhc3NOYW1lLCBlZGdlTmFt ZSk7CiAgICAgfQogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2b2lkIHJlcG9ydExpbmtUb0J1ZmZl cihjb25zdCB2b2lkKiBidWZmZXIsIE1lbW9yeU9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlLCBz aXplX3QsIGNvbnN0IGNoYXIqIG5vZGVOYW1lLCBjb25zdCBjaGFyKiBlZGdlTmFtZSk7CiAKQEAg LTI0NCw4ICsyNDQsOCBAQCBwdWJsaWM6CiAgICAgICAgICAgICBtX21lbW9yeUluc3RydW1lbnRh dGlvbi0+YWRkT2JqZWN0KG1lbWJlciwgbV9tZW1vcnlPYmplY3RJbmZvLCBlZGdlTmFtZSk7CiAg ICAgfQogCi0gICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgYWRkUmF3QnVmZmVyKGNvbnN0IHZv aWQqIGJ1ZmZlciwgc2l6ZV90LCBjb25zdCBjaGFyKiBub2RlTmFtZSA9IDAsIGNvbnN0IGNoYXIq IGVkZ2VOYW1lID0gMCk7Ci0gICAgV1RGX0VYUE9SVF9QUklWQVRFIHZvaWQgYWRkUHJpdmF0ZUJ1 ZmZlcihzaXplX3QsIE1lbW9yeU9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlID0gMCwgY29uc3Qg Y2hhciogbm9kZU5hbWUgPSAwLCBjb25zdCBjaGFyKiBlZGdlTmFtZSA9IDApOworICAgIFdURl9F WFBPUlRfUFJJVkFURSB2b2lkIGFkZFJhd0J1ZmZlcihjb25zdCB2b2lkKiBidWZmZXIsIHNpemVf dCwgY29uc3QgY2hhciogY2xhc3NOYW1lID0gMCwgY29uc3QgY2hhciogZWRnZU5hbWUgPSAwKTsK KyAgICBXVEZfRVhQT1JUX1BSSVZBVEUgdm9pZCBhZGRQcml2YXRlQnVmZmVyKHNpemVfdCwgTWVt b3J5T2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUgPSAwLCBjb25zdCBjaGFyKiBjbGFzc05hbWUg PSAwLCBjb25zdCBjaGFyKiBlZGdlTmFtZSA9IDApOwogICAgIFdURl9FWFBPUlRfUFJJVkFURSB2 b2lkIHNldEN1c3RvbUFsbG9jYXRpb24oYm9vbCk7CiAKICAgICB2b2lkIGFkZFdlYWtQb2ludGVy KHZvaWQqKSB7IH0K