39605 2010-05-24 11:07:48 -0700 restore r58765: notifications should have dir and replaceId attributes 2010-05-25 15:48:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke johnnyg oldest_to_newest 229815 0 dpranke 2010-05-24 11:07:48 -0700 re-revert r58765 229816 1 56905 dpranke 2010-05-24 11:08:19 -0700 Created attachment 56905 Patch 230445 2 dpranke 2010-05-25 14:09:09 -0700 Re-commit r58765 - it had been rolled out to see if it was causing a perf regression (in r59787 and r59789), but that does not seem to have been the case. https://bugs.webkit.org/show_bug.cgi?id=38336 tracked the original bug ; https://bugs.webkit.org/show_bug.cgi?id=3928 tracked the revert. 230446 3 56905 dglazkov 2010-05-25 14:09:57 -0700 Comment on attachment 56905 Patch ok. 230510 4 dpranke 2010-05-25 15:48:03 -0700 Committed r60193: <http://trac.webkit.org/changeset/60193> 56905 2010-05-24 11:08:19 -0700 2010-05-25 14:09:57 -0700 Patch bug-39605-20100524110818.patch text/plain 14216 dpranke ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmOTBlY2Y3ZjJiYzkxMDg4YTU0YjFhYWVmMmZlZTY1N2I4NTRkN2Y1Li5hZDljYzRj NWUyODdlZWViYjhiYThhNGRiZThmYzA5M2QyN2VmOTk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTAtMDUtMjQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmUtY29tbWl0IHI1ODc2 NSAtIGl0IGhhZCBiZWVuIHJvbGxlZCBvdXQgdG8gc2VlIGlmIGl0IHdhcyBjYXVzaW5nCisgICAg ICAgIGEgcGVyZiByZWdyZXNzaW9uIChpbiByNTk3ODcgYW5kIHI1OTc4OSksIGJ1dCB0aGF0IGRv ZXMgbm90IHNlZW0gdG8KKyAgICAgICAgaGF2ZSBiZWVuIHRoZSBjYXNlLgorCisgICAgICAgICog ZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlvbnMtcmVwbGFjZS1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIGZhc3Qvbm90aWZpY2F0aW9ucy9ub3RpZmljYXRpb25zLXJlcGxhY2Uu aHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlvbnMt cnRsLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9ub3RpZmljYXRpb25zL25v dGlmaWNhdGlvbnMtcnRsLmh0bWw6IEFkZGVkLgorCiAyMDEwLTA1LTI0ICBTaGVyaWZmIEJvdCAg PHdlYmtpdC5yZXZpZXcuYm90QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xs aW5nIG91dCByNjAwNjguCkBAIC0zNDI3LDIwICszNDQwLDYgQEAKICAgICAgICAgKiBmYXN0L25v dGlmaWNhdGlvbnMvbm90aWZpY2F0aW9ucy1ydGwtZXhwZWN0ZWQudHh0OiBBZGRlZC4KICAgICAg ICAgKiBmYXN0L25vdGlmaWNhdGlvbnMvbm90aWZpY2F0aW9ucy1ydGwuaHRtbDogQWRkZWQuCiAK LTIwMTAtMDUtMTggIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+Ci0KLSAgICAg ICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgotCi0gICAgICAgIEF0dGVtcHQgdG8gcmV2 ZXJ0IHI1ODc2NSB0byBzZWUgaWYgaXQgd2FzIGNhdXNpbmcgYSBwZXJmb3JtYW5jZQotICAgICAg ICByZWdyZXNzaW9uLgotCi0gICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0zOTMyOAotCi0gICAgICAgICogZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlv bnMtcmVwbGFjZS1leHBlY3RlZC50eHQ6IFJlbW92ZWQuCi0gICAgICAgICogZmFzdC9ub3RpZmlj YXRpb25zL25vdGlmaWNhdGlvbnMtcmVwbGFjZS5odG1sOiBSZW1vdmVkLgotICAgICAgICAqIGZh c3Qvbm90aWZpY2F0aW9ucy9ub3RpZmljYXRpb25zLXJ0bC1leHBlY3RlZC50eHQ6IFJlbW92ZWQu Ci0gICAgICAgICogZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlvbnMtcnRsLmh0bWw6IFJl bW92ZWQuCi0KIDIwMTAtMDUtMTkgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEu Y29tPgogCiAgICAgICAgIE5vdCByZXZpZXdlZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3Qvbm90aWZpY2F0aW9ucy9ub3RpZmljYXRpb25zLXJlcGxhY2UtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlvbnMtcmVwbGFjZS1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uYTRmN2ZjNDg3ZjczNWRjZTZlMWViODM0YzMzN2RkZmE2NzllZWE5 YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qvbm90aWZpY2F0aW9ucy9ub3Rp ZmljYXRpb25zLXJlcGxhY2UtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorREVTS1RPUCBO T1RJRklDQVRJT046IGljb24gZmlsZTovLy9lbWFpbC5wbmcsIHRpdGxlIE5ldyBFLW1haWwsIHRl eHQgTWVldCBtZSB0b25pZ2h0IGF0IDghCitERVNLVE9QIE5PVElGSUNBVElPTjogaWNvbiBmaWxl Oi8vL2FsYXJtLnBuZywgdGl0bGUgQWxhcm0sIHRleHQgSXQncyB0aW1lIHRvIHdha2UgdXAhCitS RVBMQUNJTkcgTk9USUZJQ0FUSU9OIE5ldyBFLW1haWwKK0RFU0tUT1AgTk9USUZJQ0FUSU9OOiBp Y29uIGZpbGU6Ly8vZW1haWwucG5nLCB0aXRsZSBOZXcgcmVwbHksIHRleHQgQ29ycmVjdGlvbiwg ODoxNQorU2hvd2luZyBub3RpZmljYXRpb25zIHdpdGggcmVwbGFjZSBJRC4uLgorCisKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvbm90aWZpY2F0aW9ucy9ub3RpZmljYXRpb25zLXJlcGxh Y2UuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvbm90aWZpY2F0aW9ucy9ub3RpZmljYXRpb25zLXJl cGxhY2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xMjAwY2M2YWY0ZmRjMjI3YzA3MTI5MDhlMTdkM2ZiOTA1 NGYxODc5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ub3RpZmljYXRpb25z L25vdGlmaWNhdGlvbnMtcmVwbGFjZS5odG1sCkBAIC0wLDAgKzEsMzkgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+ CisgICAgICAgIGZ1bmN0aW9uIGxvZyhtZXNzYWdlKQorICAgICAgICB7CisgICAgICAgICAgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0IikuaW5uZXJIVE1MICs9IG1lc3NhZ2UgKyAi PGJyPiI7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGZ1bmN0aW9uIHJ1blRlc3RzKCkK KyAgICAgICAgeworICAgICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikg eworICAgICAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmdyYW50RGVza3RvcE5vdGlm aWNhdGlvblBlcm1pc3Npb24oImZpbGU6Ly8iKTsKKyAgICAgICAgICAgICAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIGlm ICghd2luZG93LndlYmtpdE5vdGlmaWNhdGlvbnMpIHsKKyAgICAgICAgICAgICAgICBsb2coIkZB SUw6IE5vIHdlYmtpdE5vdGlmaWNhdGlvbnMgaW50ZXJmYWNlISIpOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgCisgICAgICAgICAgICB2YXIgTSA9IHdpbmRvdy53ZWJraXROb3RpZmljYXRp b25zLmNyZWF0ZU5vdGlmaWNhdGlvbigiL2VtYWlsLnBuZyIsICJOZXcgRS1tYWlsIiwgIk1lZXQg bWUgdG9uaWdodCBhdCA4ISIpOworICAgICAgICAgICAgTS5yZXBsYWNlSWQgPSAiTmV3TWFpbCI7 CisgICAgICAgICAgICBNLnNob3coKTsKKyAgICAgICAgICAgIHZhciBvdGhlciA9IHdpbmRvdy53 ZWJraXROb3RpZmljYXRpb25zLmNyZWF0ZU5vdGlmaWNhdGlvbigiL2FsYXJtLnBuZyIsICJBbGFy bSIsICJJdCdzIHRpbWUgdG8gd2FrZSB1cCEiKTsKKyAgICAgICAgICAgIG90aGVyLnNob3coKTsK KyAgICAgICAgICAgIHZhciBOID0gd2luZG93LndlYmtpdE5vdGlmaWNhdGlvbnMuY3JlYXRlTm90 aWZpY2F0aW9uKCIvZW1haWwucG5nIiwgIk5ldyByZXBseSIsICJDb3JyZWN0aW9uLCA4OjE1Iik7 CisgICAgICAgICAgICBOLnJlcGxhY2VJZCA9ICJOZXdNYWlsIjsKKyAgICAgICAgICAgIE4uc2hv dygpOyAgICAgICAgICAKKyAgICAgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+ Cis8cD5TaG93aW5nIG5vdGlmaWNhdGlvbnMgd2l0aCByZXBsYWNlIElELi4uPC9wPgorPGRpdiBp ZD0icmVzdWx0Ij48L2Rpdj4KKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK3J1blRl c3RzKCk7Cis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvbm90aWZpY2F0aW9ucy9ub3RpZmljYXRpb25zLXJ0bC1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9mYXN0L25vdGlmaWNhdGlvbnMvbm90aWZpY2F0aW9ucy1ydGwtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLmYyYjAxZmMxYmEwNTBlZTYyN2ZiYzNjNzQ2ZjkwYjA2MjQ0NGFlZTgK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L25vdGlmaWNhdGlvbnMvbm90aWZp Y2F0aW9ucy1ydGwtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNCBAQAorREVTS1RPUCBOT1RJRklD QVRJT046KFJUTCkgaWNvbiAsIHRpdGxlIE5ldyBFLW1haWwsIHRleHQgTWVldCBtZSB0b25pZ2h0 IGF0IDghCitTaG93aW5nIGEgbm90aWZpY2F0aW9uIHdpdGggZGlyZWN0aW9uICJydGwiLi4uCisK KwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlv bnMtcnRsLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L25vdGlmaWNhdGlvbnMvbm90aWZpY2F0aW9u cy1ydGwuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iN2MwNDhiMjhlMGI2YmQ4NThiZjUwMjM1OWE2N2NlNjZk MmM5YjZhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ub3RpZmljYXRpb25z L25vdGlmaWNhdGlvbnMtcnRsLmh0bWwKQEAgLTAsMCArMSwzNyBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAg ICAgICAgZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCisgICAgICAgIHsKKyAgICAgICAgICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1bHQiKS5pbm5lckhUTUwgKz0gbWVzc2FnZSArICI8YnI+ IjsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgZnVuY3Rpb24gcnVuVGVzdHMoKQorICAg ICAgICB7CisgICAgICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7Cisg ICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZ3JhbnREZXNrdG9wTm90aWZpY2F0 aW9uUGVybWlzc2lvbigiZmlsZTovLyIpOworICAgICAgICAgICAgICAgIGxheW91dFRlc3RDb250 cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgaWYgKCF3 aW5kb3cud2Via2l0Tm90aWZpY2F0aW9ucykgeworICAgICAgICAgICAgICAgIGxvZygiRkFJTDog Tm8gd2Via2l0Tm90aWZpY2F0aW9ucyBpbnRlcmZhY2UhIik7CisgICAgICAgICAgICB9CisgICAg ICAgICAgICAKKyAgICAgICAgICAgIHZhciBNID0gd2luZG93LndlYmtpdE5vdGlmaWNhdGlvbnMu Y3JlYXRlTm90aWZpY2F0aW9uKCIiLCAiTmV3IEUtbWFpbCIsICJNZWV0IG1lIHRvbmlnaHQgYXQg OCEiKTsKKyAgICAgICAgICAgIE0uZGlyID0gInJ0bCI7CisgICAgICAgICAgICBNLnNob3coKTsK KyAgICAgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cD5TaG93aW5nIGEg bm90aWZpY2F0aW9uIHdpdGggZGlyZWN0aW9uICJydGwiLi4uPC9wPgorICAgIAorPGRpdiBpZD0i cmVzdWx0Ij48L2Rpdj4KKyAgIAorPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorcnVu VGVzdHMoKTsKKzwvc2NyaXB0PgorCis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDM2OGM1ZDU4MDk0ZTNkZjIz ZThmYWIxYzQ2ZTRjYmExOTgxMmI0ZWMuLjU3NzUwMTQ3MTE4Zjg1ZDg2Zjc2NTBkMTBjMTI2Mzdm YjQyZTNmNDcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDUtMjQgIERpcmsgUHJhbmtlICA8ZHByYW5r ZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmUtY29tbWl0IHI1ODc2NSAtIGl0IGhhZCBiZWVuIHJvbGxlZCBvdXQgdG8gc2Vl IGlmIGl0IHdhcyBjYXVzaW5nCisgICAgICAgIGEgcGVyZiByZWdyZXNzaW9uIChpbiByNTk3ODcp LCBidXQgdGhhdCBkb2VzIG5vdCBzZWVtIHRvIGhhdmUgYmVlbgorICAgICAgICB0aGUgY2FzZS4K KworICAgICAgICBUZXN0czogZmFzdC9ub3RpZmljYXRpb25zL25vdGlmaWNhdGlvbnMtcmVwbGFj ZS5odG1sCisgICAgICAgICAgICAgICBmYXN0L25vdGlmaWNhdGlvbnMvbm90aWZpY2F0aW9ucy1y dGwuaHRtbAorCisgICAgICAgICogbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaDoKKyAgICAg ICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbjo6ZGlyKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlm aWNhdGlvbjo6c2V0RGlyKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbjo6cmVwbGFj ZUlkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vdGlmaWNhdGlvbjo6c2V0UmVwbGFjZUlkKToKKyAg ICAgICAgKiBub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5pZGw6CisKIDIwMTAtMDUtMjQgIFNo ZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJvbGxpbmcgb3V0IHI2MDA2OC4KQEAgLTI3ODUsMTggKzI4MDMsNiBAQAogICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Oik6CiAgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll cjo6aXNQYWdpbmF0ZWQpOgogCi0yMDEwLTA1LTE4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hy b21pdW0ub3JnPgotCi0gICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KLQotICAg ICAgICBBdHRlbXB0IHRvIHJldmVydCByNTg3NjUgdG8gc2VlIGlmIGl0IHdhcyBjYXVzaW5nIGEg cGVyZm9ybWFuY2UKLSAgICAgICAgcmVncmVzc2lvbi4KLQotICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkzMjgKLQotICAgICAgICAqIG5vdGlmaWNhdGlv bnMvTm90aWZpY2F0aW9uLmg6Ci0gICAgICAgICogbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24u aWRsOgotCiAyMDEwLTA1LTE5ICBLZXZpbiBXYXR0ZXJzICA8a2V2aW53YXR0ZXJzQGdtYWlsLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZXZpbiBPbGxpdmllci4KZGlmZiAtLWdpdCBhL1dl YkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uaCBiL1dlYkNvcmUvbm90aWZpY2F0aW9u cy9Ob3RpZmljYXRpb24uaAppbmRleCA5OGNiZmRmOWQ2NjVjNWJlNGQxZjYzYzFmZjdkMGY2MTFi YTY1OTMwLi40N2RlMmEyODRjNjYzZjUwNmM5ZWVkODk2ZDRmZjQ3ZWEwYTViNjJmIDEwMDY0NAot LS0gYS9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmgKKysrIGIvV2ViQ29yZS9u b3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5oCkBAIC02OCw2ICs2OCwxMSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIEtVUkwgaWNvblVSTCgpIHsgcmV0dXJuIG1fY29udGVudHMuaWNv bigpOyB9CiAgICAgICAgIE5vdGlmaWNhdGlvbkNvbnRlbnRzJiBjb250ZW50cygpIHsgcmV0dXJu IG1fY29udGVudHM7IH0KIAorICAgICAgICBTdHJpbmcgZGlyKCkgY29uc3QgeyByZXR1cm4gbV9k aXJlY3Rpb247IH0KKyAgICAgICAgdm9pZCBzZXREaXIoY29uc3QgU3RyaW5nJiBkaXIpIHsgbV9k aXJlY3Rpb24gPSBkaXI7IH0KKyAgICAgICAgU3RyaW5nIHJlcGxhY2VJZCgpIGNvbnN0IHsgcmV0 dXJuIG1fcmVwbGFjZUlkOyB9CisgICAgICAgIHZvaWQgc2V0UmVwbGFjZUlkKGNvbnN0IFN0cmlu ZyYgcmVwbGFjZUlkKSB7IG1fcmVwbGFjZUlkID0gcmVwbGFjZUlkOyB9CisKICAgICAgICAgREVG SU5FX0FUVFJJQlVURV9FVkVOVF9MSVNURU5FUihkaXNwbGF5KTsKICAgICAgICAgREVGSU5FX0FU VFJJQlVURV9FVkVOVF9MSVNURU5FUihlcnJvcik7CiAgICAgICAgIERFRklORV9BVFRSSUJVVEVf RVZFTlRfTElTVEVORVIoY2xvc2UpOwpAQCAtOTMsNiArOTgsOSBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgIEtVUkwgbV9ub3RpZmljYXRpb25VUkw7CiAgICAgICAgIE5vdGlmaWNhdGlv bkNvbnRlbnRzIG1fY29udGVudHM7CiAKKyAgICAgICAgU3RyaW5nIG1fZGlyZWN0aW9uOworICAg ICAgICBTdHJpbmcgbV9yZXBsYWNlSWQ7CisgICAgICAKICAgICAgICAgYm9vbCBtX2lzU2hvd2lu ZzsKIAogICAgICAgICBOb3RpZmljYXRpb25QcmVzZW50ZXIqIG1fcHJlc2VudGVyOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5pZGwgYi9XZWJDb3JlL25v dGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmlkbAppbmRleCA3ZjAxOGI3ZjZhNzc3ODEzNjQ2M2Q3 NGZmZWU1Yzg3NmQ4NTczNTE3Li41Y2E4NGE1ZGRlZjZkNzY0YWNiMTZmYWJjYWYwYTNjOTdhOTli MWJmIDEwMDY0NAotLS0gYS9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmlkbAor KysgYi9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmlkbApAQCAtNDIsNiArNDIs OSBAQCBtb2R1bGUgdGhyZWFkcyB7CiAgICAgICAgIGF0dHJpYnV0ZSBFdmVudExpc3RlbmVyIG9u ZXJyb3I7CiAgICAgICAgIGF0dHJpYnV0ZSBFdmVudExpc3RlbmVyIG9uY2xvc2U7CiAKKyAgICAg ICAgYXR0cmlidXRlIERPTVN0cmluZyBkaXI7CisgICAgICAgIGF0dHJpYnV0ZSBET01TdHJpbmcg cmVwbGFjZUlkOworCiAgICAgICAgIC8vIEV2ZW50VGFyZ2V0IGludGVyZmFjZQogICAgICAgICB2 b2lkIGFkZEV2ZW50TGlzdGVuZXIoaW4gRE9NU3RyaW5nIHR5cGUsIAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgaW4gRXZlbnRMaXN0ZW5lciBsaXN0ZW5lciwgCmRpZmYgLS1naXQgYS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRl eCAwN2U2ZWRiMmUxNjA1YzA1N2NhNTNlZjc0MzgwYjYzZGYwYTFjN2U1Li41ZTI0NzlmMjU2YmEw OWRlMGM3ODY4MjE2ZjU2YjY5ZDdiY2MyZTM0IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCisrKyBiL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAxMC0wNS0yNCAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZS1jb21taXQgcjU4 NzY1IC0gaXQgaGFkIGJlZW4gcm9sbGVkIG91dCB0byBzZWUgaWYgaXQgd2FzIGNhdXNpbmcKKyAg ICAgICAgYSBwZXJmIHJlZ3Jlc3Npb24gKGluIHI1OTc4NyBhbmQgcjU5Nzg5KSwgYnV0IHRoYXQg ZG9lcyBub3Qgc2VlbSB0bworICAgICAgICBoYXZlIGJlZW4gdGhlIGNhc2UuCisKKyAgICAgICAg KiBwdWJsaWMvV2ViTm90aWZpY2F0aW9uLmg6CisgICAgICAgICogc3JjL1dlYk5vdGlmaWNhdGlv bi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk5vdGlmaWNhdGlvbjo6ZGlyKToKKyAgICAgICAg KFdlYktpdDo6V2ViTm90aWZpY2F0aW9uOjpyZXBsYWNlSWQpOgorCiAyMDEwLTA1LTIxICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBW YWZhaS4KQEAgLTIyMSwxOCArMjM0LDYgQEAKICAgICAgICAgKFdlYktpdDo6V2ViTm90aWZpY2F0 aW9uOjpkaXIpOgogICAgICAgICAoV2ViS2l0OjpXZWJOb3RpZmljYXRpb246OnJlcGxhY2VJZCk6 CiAKLTIwMTAtMDUtMTggIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+Ci0KLSAg ICAgICAgUmV2aWV3ZWQgYnkgRGltaXRyaSBHbGF6a292LgotCi0gICAgICAgIEF0dGVtcHQgdG8g cmV2ZXJ0IHI1ODc2NSB0byBzZWUgaWYgaXQgd2FzIGNhdXNpbmcgYSBwZXJmb3JtYW5jZQotICAg ICAgICByZWdyZXNzaW9uLgotCi0gICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zOTMyOAotCi0gICAgICAgICogcHVibGljL1dlYk5vdGlmaWNhdGlvbi5oOgot ICAgICAgICAqIHNyYy9XZWJOb3RpZmljYXRpb24uY3BwOgotCiAyMDEwLTA1LTE5ICBKaWFuIExp ICA8amlhbmxpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBGaXNo ZXIuCmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk5vdGlmaWNhdGlvbi5o IGIvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJOb3RpZmljYXRpb24uaAppbmRleCA5ZDY0ZTJh NGIzOWQyYTFlMDg4YmE5NDdjNDNmYjI2YzQyOWMyY2I2Li5hYjc0N2UzNTA0YzYyMTk3NDVjYzY3 MjUxZGFiMjdjZDQyMDU5MjY2IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl Yk5vdGlmaWNhdGlvbi5oCisrKyBiL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTm90aWZpY2F0 aW9uLmgKQEAgLTc1LDYgKzc1LDkgQEAgcHVibGljOgogICAgIFdFQktJVF9BUEkgV2ViU3RyaW5n IHRpdGxlKCkgY29uc3Q7CiAgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgYm9keSgpIGNvbnN0Owog CisgICAgV0VCS0lUX0FQSSBXZWJTdHJpbmcgZGlyKCkgY29uc3Q7CisgICAgV0VCS0lUX0FQSSBX ZWJTdHJpbmcgcmVwbGFjZUlkKCkgY29uc3Q7CisKICAgICAvLyBDYWxsZWQgdG8gaW5kaWNhdGUg dGhlIG5vdGlmaWNhdGlvbiBoYXMgYmVlbiBkaXNwbGF5ZWQuCiAgICAgV0VCS0lUX0FQSSB2b2lk IGRpc3BhdGNoRGlzcGxheUV2ZW50KCk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViTm90aWZpY2F0aW9uLmNwcCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTm90aWZpY2F0 aW9uLmNwcAppbmRleCA1MjAwZDE3OWZlZDRhNjMwZDlmNzYzNGZjNTFiOGQwYWU4MDZhZmQwLi41 YWUxNTU3YzI1MzQ2NTg4YzYyNDU0YjI3ZDJhYjc2MDVmYzMyOGM3IDEwMDY0NAotLS0gYS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYk5vdGlmaWNhdGlvbi5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJOb3RpZmljYXRpb24uY3BwCkBAIC05NCw2ICs5NCwxNiBAQCBXZWJTdHJpbmcgV2Vi Tm90aWZpY2F0aW9uOjpib2R5KCkgY29uc3QKICAgICByZXR1cm4gbV9wcml2YXRlLT5jb250ZW50 cygpLmJvZHkoKTsKIH0KIAorV2ViU3RyaW5nIFdlYk5vdGlmaWNhdGlvbjo6ZGlyKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5kaXIoKTsKK30KKworV2ViU3RyaW5nIFdlYk5vdGlm aWNhdGlvbjo6cmVwbGFjZUlkKCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5yZXBs YWNlSWQoKTsKK30KKwogdm9pZCBXZWJOb3RpZmljYXRpb246OmRpc3BhdGNoRGlzcGxheUV2ZW50 KCkKIHsKICAgICBSZWZQdHI8RXZlbnQ+IGV2ZW50ID0gRXZlbnQ6OmNyZWF0ZSgiZGlzcGxheSIs IGZhbHNlLCB0cnVlKTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktp dFRvb2xzL0NoYW5nZUxvZwppbmRleCBmNDhlMDMxNzQwYzAzYzA3ODliNGU0ZDNkOTZiMzgwMzhi MTEwMzA5Li42Yjc3NDExZGJiZWY0MDVjODgyMzkzMjdjYjJlZWMyMTM4N2YwOWY5IDEwMDY0NAot LS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTAtMDUtMjQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmUtY29tbWl0IHI1ODc2NSAtIGl0IGhhZCBiZWVuIHJvbGxlZCBvdXQgdG8gc2VlIGlmIGl0IHdh cyBjYXVzaW5nCisgICAgICAgIGEgcGVyZiByZWdyZXNzaW9uIChpbiByNTk3ODcgYW5kIHI1OTc4 OSksIGJ1dCB0aGF0IGRvZXMgbm90IHNlZW0gdG8KKyAgICAgICAgaGF2ZSBiZWVuIHRoZSBjYXNl LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTm90aWZpY2F0aW9uUHJlc2Vu dGVyLmNwcDoKKyAgICAgICAgKE5vdGlmaWNhdGlvblByZXNlbnRlcjo6c2hvdyk6CisKIDIwMTAt MDUtMjQgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IENocmlzIEplcmRvbmVrLgpAQCAtNDcyLDEzICs0ODMsNiBAQAogCiAgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weToKIAotMjAx MC0wNS0xOSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KLQotICAgICAgICBV bnJldmlld2VkLCBidWlsZCBmaXguCi0KLSAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9jaHJvbWl1 bS9Ob3RpZmljYXRpb25QcmVzZW50ZXIuY3BwOgotICAgICAgICAoTm90aWZpY2F0aW9uUHJlc2Vu dGVyOjpzaG93KToKLQogMjAxMC0wNS0xOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL05vdGlmaWNhdGlvblByZXNlbnRlci5jcHAgYi9X ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9Ob3RpZmljYXRpb25QcmVzZW50ZXIu Y3BwCmluZGV4IDUwMWI1MTNiYzhhZjE5YTc0OTBiMjg3NmVhN2Q1OWQxYzM4MWZiZGEuLjg2OTAz YmUzNmIyOGJkMTU3NjhkN2Q0OGY4ZmU2MjQ3NDVjMWVjMjkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL05vdGlmaWNhdGlvblByZXNlbnRlci5jcHAKKysr IGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTm90aWZpY2F0aW9uUHJlc2Vu dGVyLmNwcApAQCAtNTIsMTEgKzUyLDIzIEBAIHZvaWQgTm90aWZpY2F0aW9uUHJlc2VudGVyOjpn cmFudFBlcm1pc3Npb24oY29uc3QgV2ViU3RyaW5nJiBvcmlnaW4pCiAvLyBUaGUgb3V0cHV0IGZy b20gYWxsIHRoZXNlIG1ldGhvZHMgbWF0Y2hlcyB3aGF0IER1bXBSZW5kZXJUcmVlIHByb2R1Y2Vz LgogYm9vbCBOb3RpZmljYXRpb25QcmVzZW50ZXI6OnNob3coY29uc3QgV2ViTm90aWZpY2F0aW9u JiBub3RpZmljYXRpb24pCiB7CisgICAgaWYgKCFub3RpZmljYXRpb24ucmVwbGFjZUlkKCkuaXNF bXB0eSgpKSB7CisgICAgICAgIFN0cmluZyByZXBsYWNlSWQobm90aWZpY2F0aW9uLnJlcGxhY2VJ ZCgpLmRhdGEoKSwgbm90aWZpY2F0aW9uLnJlcGxhY2VJZCgpLmxlbmd0aCgpKTsKKyAgICAgICAg aWYgKG1fcmVwbGFjZW1lbnRzLmZpbmQocmVwbGFjZUlkKSAhPSBtX3JlcGxhY2VtZW50cy5lbmQo KSkKKyAgICAgICAgICAgIHByaW50ZigiUkVQTEFDSU5HIE5PVElGSUNBVElPTiAlc1xuIiwKKyAg ICAgICAgICAgICAgICAgICBtX3JlcGxhY2VtZW50cy5maW5kKHJlcGxhY2VJZCktPnNlY29uZC51 dGY4KCkuZGF0YSgpKTsKKworICAgICAgICBXZWJTdHJpbmcgaWRlbnRpZmllciA9IG5vdGlmaWNh dGlvbi5pc0hUTUwoKSA/CisgICAgICAgICAgICBub3RpZmljYXRpb24udXJsKCkuc3BlYygpLnV0 ZjE2KCkgOiBub3RpZmljYXRpb24udGl0bGUoKTsKKyAgICAgICAgbV9yZXBsYWNlbWVudHMuc2V0 KHJlcGxhY2VJZCwgU3RyaW5nKGlkZW50aWZpZXIuZGF0YSgpLCBpZGVudGlmaWVyLmxlbmd0aCgp KSk7CisgICAgfQorCiAgICAgaWYgKG5vdGlmaWNhdGlvbi5pc0hUTUwoKSkgewogICAgICAgICBw cmludGYoIkRFU0tUT1AgTk9USUZJQ0FUSU9OOiBjb250ZW50cyBhdCAlc1xuIiwKICAgICAgICAg ICAgICAgIG5vdGlmaWNhdGlvbi51cmwoKS5zcGVjKCkuZGF0YSgpKTsKICAgICB9IGVsc2Ugewot ICAgICAgICBwcmludGYoIkRFU0tUT1AgTk9USUZJQ0FUSU9OOiBpY29uICVzLCB0aXRsZSAlcywg dGV4dCAlc1xuIiwKKyAgICAgICAgcHJpbnRmKCJERVNLVE9QIE5PVElGSUNBVElPTjolcyBpY29u ICVzLCB0aXRsZSAlcywgdGV4dCAlc1xuIiwKKyAgICAgICAgICAgICAgIG5vdGlmaWNhdGlvbi5k aXIoKSA9PSAicnRsIiA/ICIoUlRMKSIgOiAiIiwKICAgICAgICAgICAgICAgIG5vdGlmaWNhdGlv bi5pY29uVVJMKCkuaXNFbXB0eSgpID8gIiIgOgogICAgICAgICAgICAgICAgbm90aWZpY2F0aW9u Lmljb25VUkwoKS5zcGVjKCkuZGF0YSgpLAogICAgICAgICAgICAgICAgbm90aWZpY2F0aW9uLnRp dGxlKCkuaXNFbXB0eSgpID8gIiIgOgo=