55748 2011-03-03 22:24:29 -0800 [chromium] Get rid of IsContentFiltered flags since they're not used anymore 2011-03-04 09:31:11 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jam jam abarth oldest_to_newest 362283 0 jam 2011-03-03 22:24:29 -0800 [chromium] Get rid of IsContentFiltered flags since they're not used anymore 362287 1 84691 jam 2011-03-03 22:29:50 -0800 Created attachment 84691 Patch 362288 2 84692 jam 2011-03-03 22:37:41 -0800 Created attachment 84692 Patch 362542 3 84692 dglazkov 2011-03-04 08:54:03 -0800 Comment on attachment 84692 Patch ok. 362559 4 jam 2011-03-04 09:31:11 -0800 Committed r80361: <http://trac.webkit.org/changeset/80361> 84691 2011-03-03 22:29:50 -0800 2011-03-03 22:37:38 -0800 Patch bug-55748-20110303222921.patch text/plain 6602 jam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwMzI3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMDMgIEpvaG4gQWJk LUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEdldCByaWQgb2YgSXNDb250ZW50Rmls dGVyZWQgZmxhZ3Mgc2luY2UgdGhleSZhcG9zO3JlIG5vdCB1c2VkIGFueW1vcmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1NzQ4CisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9t aXVtL1Jlc291cmNlUmVzcG9uc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNw b25zZTo6ZG9QbGF0Zm9ybUNvcHlEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVz cG9uc2U6OmRvUGxhdGZvcm1BZG9wdCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jaHJv bWl1bS9SZXNvdXJjZVJlc3BvbnNlLmg6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3Bv bnNlOjpSZXNvdXJjZVJlc3BvbnNlKToKKwogMjAxMS0wMy0wMyAgTmF0IER1Y2EgIDxuZHVjYUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9iaW5zb24uCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9u c2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hy b21pdW0vUmVzb3VyY2VSZXNwb25zZS5jcHAJKHJldmlzaW9uIDgwMzIzKQorKysgU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNiBAQCBQYXNzT3duUHRyPENyb3NzVGhyZWFkUmVzb3Vy Y2VSZXNwb25zZURhCiB7CiAgICAgZGF0YS0+bV9hcHBDYWNoZUlEID0gbV9hcHBDYWNoZUlEOwog ICAgIGRhdGEtPm1fYXBwQ2FjaGVNYW5pZmVzdFVSTCA9IG1fYXBwQ2FjaGVNYW5pZmVzdFVSTC5j b3B5KCk7Ci0gICAgZGF0YS0+bV9pc0NvbnRlbnRGaWx0ZXJlZCA9IG1faXNDb250ZW50RmlsdGVy ZWQ7CiAgICAgZGF0YS0+bV9pc011bHRpcGFydFBheWxvYWQgPSBtX2lzTXVsdGlwYXJ0UGF5bG9h ZDsKICAgICBkYXRhLT5tX3dhc0ZldGNoZWRWaWFTUERZID0gbV93YXNGZXRjaGVkVmlhU1BEWTsK ICAgICBkYXRhLT5tX3dhc05wbk5lZ290aWF0ZWQgPSBtX3dhc05wbk5lZ290aWF0ZWQ7CkBAIC00 OSw3ICs0OCw2IEBAIHZvaWQgUmVzb3VyY2VSZXNwb25zZTo6ZG9QbGF0Zm9ybUFkb3B0KFAKIHsK ICAgICBtX2FwcENhY2hlSUQgPSBkYXRhLT5tX2FwcENhY2hlSUQ7CiAgICAgbV9hcHBDYWNoZU1h bmlmZXN0VVJMID0gZGF0YS0+bV9hcHBDYWNoZU1hbmlmZXN0VVJMLmNvcHkoKTsKLSAgICBtX2lz Q29udGVudEZpbHRlcmVkID0gZGF0YS0+bV9pc0NvbnRlbnRGaWx0ZXJlZDsKICAgICBtX2lzTXVs dGlwYXJ0UGF5bG9hZCA9IGRhdGEtPm1faXNNdWx0aXBhcnRQYXlsb2FkOwogICAgIG1fd2FzRmV0 Y2hlZFZpYVNQRFkgPSBkYXRhLT5tX3dhc0ZldGNoZWRWaWFTUERZOwogICAgIG1fd2FzTnBuTmVn b3RpYXRlZCA9IGRhdGEtPm1fd2FzTnBuTmVnb3RpYXRlZDsKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNw b25zZS5oCShyZXZpc2lvbiA4MDMyMykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3ICsz Nyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBwdWJsaWM6CiAgICAgICAgIFJlc291cmNl UmVzcG9uc2UoKQogICAgICAgICAgICAgOiBtX2FwcENhY2hlSUQoMCkKLSAgICAgICAgICAgICwg bV9pc0NvbnRlbnRGaWx0ZXJlZChmYWxzZSkKICAgICAgICAgICAgICwgbV9pc011bHRpcGFydFBh eWxvYWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1fd2FzRmV0Y2hlZFZpYVNQRFkoZmFsc2UpCiAg ICAgICAgICAgICAsIG1fd2FzTnBuTmVnb3RpYXRlZChmYWxzZSkKQEAgLTUxLDcgKzUwLDYgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBSZXNvdXJjZVJlc3BvbnNlKGNvbnN0IEtVUkwm IHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgbG9uZyBsb25nIGV4cGVjdGVkTGVuZ3RoLCBj b25zdCBTdHJpbmcmIHRleHRFbmNvZGluZ05hbWUsIGNvbnN0IFN0cmluZyYgZmlsZW5hbWUpCiAg ICAgICAgICAgICA6IFJlc291cmNlUmVzcG9uc2VCYXNlKHVybCwgbWltZVR5cGUsIGV4cGVjdGVk TGVuZ3RoLCB0ZXh0RW5jb2RpbmdOYW1lLCBmaWxlbmFtZSkKICAgICAgICAgICAgICwgbV9hcHBD YWNoZUlEKDApCi0gICAgICAgICAgICAsIG1faXNDb250ZW50RmlsdGVyZWQoZmFsc2UpCiAgICAg ICAgICAgICAsIG1faXNNdWx0aXBhcnRQYXlsb2FkKGZhbHNlKQogICAgICAgICAgICAgLCBtX3dh c0ZldGNoZWRWaWFTUERZKGZhbHNlKQogICAgICAgICAgICAgLCBtX3dhc05wbk5lZ290aWF0ZWQo ZmFsc2UpCkBAIC03MSw5ICs2OSw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgY29u c3QgS1VSTCYgYXBwQ2FjaGVNYW5pZmVzdFVSTCgpIGNvbnN0IHsgcmV0dXJuIG1fYXBwQ2FjaGVN YW5pZmVzdFVSTDsgfQogICAgICAgICB2b2lkIHNldEFwcENhY2hlTWFuaWZlc3RVUkwoY29uc3Qg S1VSTCYgdXJsKSB7IG1fYXBwQ2FjaGVNYW5pZmVzdFVSTCA9IHVybDsgfQogCi0gICAgICAgIGJv b2wgaXNDb250ZW50RmlsdGVyZWQoKSBjb25zdCB7IHJldHVybiBtX2lzQ29udGVudEZpbHRlcmVk OyB9Ci0gICAgICAgIHZvaWQgc2V0SXNDb250ZW50RmlsdGVyZWQoYm9vbCB2YWx1ZSkgeyBtX2lz Q29udGVudEZpbHRlcmVkID0gdmFsdWU7IH0KLQogICAgICAgICBib29sIHdhc0ZldGNoZWRWaWFT UERZKCkgY29uc3QgeyByZXR1cm4gbV93YXNGZXRjaGVkVmlhU1BEWTsgfQogICAgICAgICB2b2lk IHNldFdhc0ZldGNoZWRWaWFTUERZKGJvb2wgdmFsdWUpIHsgbV93YXNGZXRjaGVkVmlhU1BEWSA9 IHZhbHVlOyB9CiAKQEAgLTEzMSwxMCArMTI2LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICAvLyBOb3RlOiBvbmx5IHZhbGlkIGZvciBtYWluIHJlc291cmNlIHJlc3BvbnNlcy4KICAg ICAgICAgS1VSTCBtX2FwcENhY2hlTWFuaWZlc3RVUkw7CiAKLSAgICAgICAgLy8gV2hldGhlciB0 aGUgY29udGVudHMgZm9yIHRoaXMgcmVzcG9uc2UgaGFzIGJlZW4gYWx0ZXJlZC9ibG9ja2VkICh1 c3VhbGx5Ci0gICAgICAgIC8vIGZvciBzZWN1cml0eSByZWFzb25zLgotICAgICAgICBib29sIG1f aXNDb250ZW50RmlsdGVyZWQ7Ci0KICAgICAgICAgLy8gU2V0IHRvIHRydWUgaWYgdGhpcyBpcyBw YXJ0IG9mIGEgbXVsdGlwYXJ0IHJlc3BvbnNlLgogICAgICAgICBib29sIG1faXNNdWx0aXBhcnRQ YXlsb2FkOwogCkBAIC0xNjgsNyArMTU5LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHN0 cnVjdCBDcm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VEYXRhIDogcHVibGljIENyb3NzVGhyZWFk UmVzb3VyY2VSZXNwb25zZURhdGFCYXNlIHsKICAgICAgICAgbG9uZyBsb25nIG1fYXBwQ2FjaGVJ RDsKICAgICAgICAgS1VSTCBtX2FwcENhY2hlTWFuaWZlc3RVUkw7Ci0gICAgICAgIGJvb2wgbV9p c0NvbnRlbnRGaWx0ZXJlZDsKICAgICAgICAgYm9vbCBtX2lzTXVsdGlwYXJ0UGF5bG9hZDsKICAg ICAgICAgYm9vbCBtX3dhc0ZldGNoZWRWaWFTUERZOwogICAgICAgICBib29sIG1fd2FzTnBuTmVn b3RpYXRlZDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA4MDMyNykK KysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTQgQEAKKzIwMTEtMDMtMDMgIEpvaG4gQWJkLUVsLU1hbGVrICA8amFtQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb Y2hyb21pdW1dIEdldCByaWQgb2YgSXNDb250ZW50RmlsdGVyZWQgZmxhZ3Mgc2luY2UgdGhleSZh cG9zO3JlIG5vdCB1c2VkIGFueW1vcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU1NzQ4CisKKyAgICAgICAgKiBERVBTOgorICAgICAgICAqIHB1Ymxp Yy9XZWJVUkxSZXNwb25zZS5oOgorICAgICAgICAqIHNyYy9XZWJVUkxSZXNwb25zZS5jcHA6CisK IDIwMTEtMDMtMDMgIE5hdCBEdWNhICA8bmR1Y2FAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpJbmRleDogU291cmNlL1dlYktpdC9jaHJvbWl1bS9E RVBTCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwkocmV2aXNpb24g ODAzMjMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMJKHdvcmtpbmcgY29weSkKQEAg LTMyLDcgKzMyLDcgQEAKIAogdmFycyA9IHsKICAgJ2Nocm9taXVtX3N2bic6ICdodHRwOi8vc3Jj LmNocm9taXVtLm9yZy9zdm4vdHJ1bmsvc3JjJywKLSAgJ2Nocm9taXVtX3Jldic6ICc3NjM2MicK KyAgJ2Nocm9taXVtX3Jldic6ICc3Njg4NScKIH0KIAogZGVwcyA9IHsKSW5kZXg6IFNvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3BvbnNlLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAkocmV2aXNpb24gODAz MjMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMTcsOSArMTE3LDYgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkg ZG91YmxlIGxhc3RNb2RpZmllZERhdGUoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0 TGFzdE1vZGlmaWVkRGF0ZShkb3VibGUpOwogCi0gICAgV0VCS0lUX0FQSSBib29sIGlzQ29udGVu dEZpbHRlcmVkKCkgY29uc3Q7Ci0gICAgV0VCS0lUX0FQSSB2b2lkIHNldElzQ29udGVudEZpbHRl cmVkKGJvb2wpOwotCiAgICAgV0VCS0lUX0FQSSBsb25nIGxvbmcgYXBwQ2FjaGVJRCgpIGNvbnN0 OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRBcHBDYWNoZUlEKGxvbmcgbG9uZyk7CiAKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJKHJldmlz aW9uIDgwMzIzKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTYsMTYgKzI1Niw2IEBAIHZvaWQgV2ViVVJMUmVzcG9u c2U6OnNldExhc3RNb2RpZmllZERhdGUKICAgICBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25z ZS0+c2V0TGFzdE1vZGlmaWVkRGF0ZShzdGF0aWNfY2FzdDx0aW1lX3Q+KGxhc3RNb2RpZmllZERh dGUpKTsKIH0KIAotYm9vbCBXZWJVUkxSZXNwb25zZTo6aXNDb250ZW50RmlsdGVyZWQoKSBjb25z dAotewotICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+aXNDb250ZW50 RmlsdGVyZWQoKTsKLX0KLQotdm9pZCBXZWJVUkxSZXNwb25zZTo6c2V0SXNDb250ZW50RmlsdGVy ZWQoYm9vbCBpc0NvbnRlbnRGaWx0ZXJlZCkKLXsKLSAgICBtX3ByaXZhdGUtPm1fcmVzb3VyY2VS ZXNwb25zZS0+c2V0SXNDb250ZW50RmlsdGVyZWQoaXNDb250ZW50RmlsdGVyZWQpOwotfQotCiBs b25nIGxvbmcgV2ViVVJMUmVzcG9uc2U6OmFwcENhY2hlSUQoKSBjb25zdAogewogICAgIHJldHVy biBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+YXBwQ2FjaGVJRCgpOwo= 84692 2011-03-03 22:37:41 -0800 2011-03-04 08:54:03 -0800 Patch bug-55748-20110303223711.patch text/plain 6569 jam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwMzI3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMtMDMgIEpvaG4gQWJk LUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEdldCByaWQgb2YgSXNDb250ZW50Rmls dGVyZWQgZmxhZ3Mgc2luY2UgdGhleSZhcG9zO3JlIG5vdCB1c2VkIGFueW1vcmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1NzQ4CisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6ZG9QbGF0Zm9ybUNvcHlEYXRhKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OmRvUGxhdGZvcm1BZG9wdCk6CisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmg6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpSZXNvdXJjZVJlc3BvbnNlKToKKwogMjAxMS0w My0wMyAgTmF0IER1Y2EgIDxuZHVjYUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgSmFtZXMgUm9iaW5zb24uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5jcHAJKHJldmlz aW9uIDgwMzIzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9S ZXNvdXJjZVJlc3BvbnNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIsNiBAQCBQYXNz T3duUHRyPENyb3NzVGhyZWFkUmVzb3VyY2VSZXNwb25zZURhCiB7CiAgICAgZGF0YS0+bV9hcHBD YWNoZUlEID0gbV9hcHBDYWNoZUlEOwogICAgIGRhdGEtPm1fYXBwQ2FjaGVNYW5pZmVzdFVSTCA9 IG1fYXBwQ2FjaGVNYW5pZmVzdFVSTC5jb3B5KCk7Ci0gICAgZGF0YS0+bV9pc0NvbnRlbnRGaWx0 ZXJlZCA9IG1faXNDb250ZW50RmlsdGVyZWQ7CiAgICAgZGF0YS0+bV9pc011bHRpcGFydFBheWxv YWQgPSBtX2lzTXVsdGlwYXJ0UGF5bG9hZDsKICAgICBkYXRhLT5tX3dhc0ZldGNoZWRWaWFTUERZ ID0gbV93YXNGZXRjaGVkVmlhU1BEWTsKICAgICBkYXRhLT5tX3dhc05wbk5lZ290aWF0ZWQgPSBt X3dhc05wbk5lZ290aWF0ZWQ7CkBAIC00OSw3ICs0OCw2IEBAIHZvaWQgUmVzb3VyY2VSZXNwb25z ZTo6ZG9QbGF0Zm9ybUFkb3B0KFAKIHsKICAgICBtX2FwcENhY2hlSUQgPSBkYXRhLT5tX2FwcENh Y2hlSUQ7CiAgICAgbV9hcHBDYWNoZU1hbmlmZXN0VVJMID0gZGF0YS0+bV9hcHBDYWNoZU1hbmlm ZXN0VVJMLmNvcHkoKTsKLSAgICBtX2lzQ29udGVudEZpbHRlcmVkID0gZGF0YS0+bV9pc0NvbnRl bnRGaWx0ZXJlZDsKICAgICBtX2lzTXVsdGlwYXJ0UGF5bG9hZCA9IGRhdGEtPm1faXNNdWx0aXBh cnRQYXlsb2FkOwogICAgIG1fd2FzRmV0Y2hlZFZpYVNQRFkgPSBkYXRhLT5tX3dhc0ZldGNoZWRW aWFTUERZOwogICAgIG1fd2FzTnBuTmVnb3RpYXRlZCA9IGRhdGEtPm1fd2FzTnBuTmVnb3RpYXRl ZDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3Vy Y2VSZXNwb25zZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCShyZXZpc2lvbiA4MDMyMykKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zNyw3ICszNyw2IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBw dWJsaWM6CiAgICAgICAgIFJlc291cmNlUmVzcG9uc2UoKQogICAgICAgICAgICAgOiBtX2FwcENh Y2hlSUQoMCkKLSAgICAgICAgICAgICwgbV9pc0NvbnRlbnRGaWx0ZXJlZChmYWxzZSkKICAgICAg ICAgICAgICwgbV9pc011bHRpcGFydFBheWxvYWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1fd2Fz RmV0Y2hlZFZpYVNQRFkoZmFsc2UpCiAgICAgICAgICAgICAsIG1fd2FzTnBuTmVnb3RpYXRlZChm YWxzZSkKQEAgLTUxLDcgKzUwLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBSZXNv dXJjZVJlc3BvbnNlKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgbG9u ZyBsb25nIGV4cGVjdGVkTGVuZ3RoLCBjb25zdCBTdHJpbmcmIHRleHRFbmNvZGluZ05hbWUsIGNv bnN0IFN0cmluZyYgZmlsZW5hbWUpCiAgICAgICAgICAgICA6IFJlc291cmNlUmVzcG9uc2VCYXNl KHVybCwgbWltZVR5cGUsIGV4cGVjdGVkTGVuZ3RoLCB0ZXh0RW5jb2RpbmdOYW1lLCBmaWxlbmFt ZSkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUlEKDApCi0gICAgICAgICAgICAsIG1faXNDb250 ZW50RmlsdGVyZWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1faXNNdWx0aXBhcnRQYXlsb2FkKGZh bHNlKQogICAgICAgICAgICAgLCBtX3dhc0ZldGNoZWRWaWFTUERZKGZhbHNlKQogICAgICAgICAg ICAgLCBtX3dhc05wbk5lZ290aWF0ZWQoZmFsc2UpCkBAIC03MSw5ICs2OSw2IEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgY29uc3QgS1VSTCYgYXBwQ2FjaGVNYW5pZmVzdFVSTCgpIGNv bnN0IHsgcmV0dXJuIG1fYXBwQ2FjaGVNYW5pZmVzdFVSTDsgfQogICAgICAgICB2b2lkIHNldEFw cENhY2hlTWFuaWZlc3RVUkwoY29uc3QgS1VSTCYgdXJsKSB7IG1fYXBwQ2FjaGVNYW5pZmVzdFVS TCA9IHVybDsgfQogCi0gICAgICAgIGJvb2wgaXNDb250ZW50RmlsdGVyZWQoKSBjb25zdCB7IHJl dHVybiBtX2lzQ29udGVudEZpbHRlcmVkOyB9Ci0gICAgICAgIHZvaWQgc2V0SXNDb250ZW50Rmls dGVyZWQoYm9vbCB2YWx1ZSkgeyBtX2lzQ29udGVudEZpbHRlcmVkID0gdmFsdWU7IH0KLQogICAg ICAgICBib29sIHdhc0ZldGNoZWRWaWFTUERZKCkgY29uc3QgeyByZXR1cm4gbV93YXNGZXRjaGVk VmlhU1BEWTsgfQogICAgICAgICB2b2lkIHNldFdhc0ZldGNoZWRWaWFTUERZKGJvb2wgdmFsdWUp IHsgbV93YXNGZXRjaGVkVmlhU1BEWSA9IHZhbHVlOyB9CiAKQEAgLTEzMSwxMCArMTI2LDYgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyBOb3RlOiBvbmx5IHZhbGlkIGZvciBtYWlu IHJlc291cmNlIHJlc3BvbnNlcy4KICAgICAgICAgS1VSTCBtX2FwcENhY2hlTWFuaWZlc3RVUkw7 CiAKLSAgICAgICAgLy8gV2hldGhlciB0aGUgY29udGVudHMgZm9yIHRoaXMgcmVzcG9uc2UgaGFz IGJlZW4gYWx0ZXJlZC9ibG9ja2VkICh1c3VhbGx5Ci0gICAgICAgIC8vIGZvciBzZWN1cml0eSBy ZWFzb25zLgotICAgICAgICBib29sIG1faXNDb250ZW50RmlsdGVyZWQ7Ci0KICAgICAgICAgLy8g U2V0IHRvIHRydWUgaWYgdGhpcyBpcyBwYXJ0IG9mIGEgbXVsdGlwYXJ0IHJlc3BvbnNlLgogICAg ICAgICBib29sIG1faXNNdWx0aXBhcnRQYXlsb2FkOwogCkBAIC0xNjgsNyArMTU5LDYgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgIHN0cnVjdCBDcm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VE YXRhIDogcHVibGljIENyb3NzVGhyZWFkUmVzb3VyY2VSZXNwb25zZURhdGFCYXNlIHsKICAgICAg ICAgbG9uZyBsb25nIG1fYXBwQ2FjaGVJRDsKICAgICAgICAgS1VSTCBtX2FwcENhY2hlTWFuaWZl c3RVUkw7Ci0gICAgICAgIGJvb2wgbV9pc0NvbnRlbnRGaWx0ZXJlZDsKICAgICAgICAgYm9vbCBt X2lzTXVsdGlwYXJ0UGF5bG9hZDsKICAgICAgICAgYm9vbCBtX3dhc0ZldGNoZWRWaWFTUERZOwog ICAgICAgICBib29sIG1fd2FzTnBuTmVnb3RpYXRlZDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCShyZXZpc2lvbiA4MDMyNykKKysrIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDMtMDMgIEpvaG4gQWJk LUVsLU1hbGVrICA8amFtQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEdldCByaWQgb2YgSXNDb250ZW50Rmls dGVyZWQgZmxhZ3Mgc2luY2UgdGhleSZhcG9zO3JlIG5vdCB1c2VkIGFueW1vcmUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1NzQ4CisKKyAgICAgICAg KiBERVBTOgorICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXNwb25zZS5oOgorICAgICAgICAqIHNy Yy9XZWJVUkxSZXNwb25zZS5jcHA6CisKIDIwMTEtMDMtMDMgIE5hdCBEdWNhICA8bmR1Y2FAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpJbmRleDog U291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv Y2hyb21pdW0vREVQUwkocmV2aXNpb24gODAzMjMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVt L0RFUFMJKHdvcmtpbmcgY29weSkKQEAgLTMyLDcgKzMyLDcgQEAKIAogdmFycyA9IHsKICAgJ2No cm9taXVtX3N2bic6ICdodHRwOi8vc3JjLmNocm9taXVtLm9yZy9zdm4vdHJ1bmsvc3JjJywKLSAg J2Nocm9taXVtX3Jldic6ICc3NjM2MicKKyAgJ2Nocm9taXVtX3Jldic6ICc3Njg4NScKIH0KIAog ZGVwcyA9IHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVSTFJlc3Bv bnNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJM UmVzcG9uc2UuaAkocmV2aXNpb24gODAzMjMpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9XZWJVUkxSZXNwb25zZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTcsOSArMTE3LDYgQEAg cHVibGljOgogICAgIFdFQktJVF9BUEkgZG91YmxlIGxhc3RNb2RpZmllZERhdGUoKSBjb25zdDsK ICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0TGFzdE1vZGlmaWVkRGF0ZShkb3VibGUpOwogCi0gICAg V0VCS0lUX0FQSSBib29sIGlzQ29udGVudEZpbHRlcmVkKCkgY29uc3Q7Ci0gICAgV0VCS0lUX0FQ SSB2b2lkIHNldElzQ29udGVudEZpbHRlcmVkKGJvb2wpOwotCiAgICAgV0VCS0lUX0FQSSBsb25n IGxvbmcgYXBwQ2FjaGVJRCgpIGNvbnN0OwogICAgIFdFQktJVF9BUEkgdm9pZCBzZXRBcHBDYWNo ZUlEKGxvbmcgbG9uZyk7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVS TFJlc3BvbnNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJVUkxSZXNwb25zZS5jcHAJKHJldmlzaW9uIDgwMzIzKQorKysgU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTYsMTYgKzI1 Niw2IEBAIHZvaWQgV2ViVVJMUmVzcG9uc2U6OnNldExhc3RNb2RpZmllZERhdGUKICAgICBtX3By aXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+c2V0TGFzdE1vZGlmaWVkRGF0ZShzdGF0aWNfY2Fz dDx0aW1lX3Q+KGxhc3RNb2RpZmllZERhdGUpKTsKIH0KIAotYm9vbCBXZWJVUkxSZXNwb25zZTo6 aXNDb250ZW50RmlsdGVyZWQoKSBjb25zdAotewotICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcmVz b3VyY2VSZXNwb25zZS0+aXNDb250ZW50RmlsdGVyZWQoKTsKLX0KLQotdm9pZCBXZWJVUkxSZXNw b25zZTo6c2V0SXNDb250ZW50RmlsdGVyZWQoYm9vbCBpc0NvbnRlbnRGaWx0ZXJlZCkKLXsKLSAg ICBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+c2V0SXNDb250ZW50RmlsdGVyZWQoaXND b250ZW50RmlsdGVyZWQpOwotfQotCiBsb25nIGxvbmcgV2ViVVJMUmVzcG9uc2U6OmFwcENhY2hl SUQoKSBjb25zdAogewogICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+ YXBwQ2FjaGVJRCgpOwo=