62428 2011-06-09 22:09:13 -0700 ShadowContentElement should detach its inclusions before attach them. 2011-06-14 23:24:35 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 62202 1 morrita morrita dglazkov eric oldest_to_newest 418497 0 morrita 2011-06-09 22:09:13 -0700 This is a preparation for Bug 59802. 418521 1 96697 morrita 2011-06-09 23:05:50 -0700 Created attachment 96697 Patch 419439 2 96921 morrita 2011-06-12 22:57:13 -0700 Created attachment 96921 Updated to ToT 419932 3 96921 dglazkov 2011-06-13 15:13:41 -0700 Comment on attachment 96921 Updated to ToT View in context: https://bugs.webkit.org/attachment.cgi?id=96921&action=review > Source/WebCore/ChangeLog:5 > + ShadowContentElement should detach its inclusions before attach them. "before attaching them". > Source/WebCore/dom/ShadowContentElement.cpp:40 > + selector->selectIncludesion(m_inclusions); includesion is not a real word. Did you mean inclusion? 420225 4 97069 morrita 2011-06-13 22:45:44 -0700 Created attachment 97069 Patch 421042 5 morrita 2011-06-14 23:24:35 -0700 Committed r88908: <http://trac.webkit.org/changeset/88908> 96697 2011-06-09 23:05:50 -0700 2011-06-12 22:57:07 -0700 Patch bug-62428-20110610150548.patch text/plain 6844 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogODg1MTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjN2VlMjA0M2IxZjkxOWU2 NTc0N2JmZjM2OTY0NTFmYWRmYjlkYjMxLi4yYWNiYmU3OTAyZWQwMGJlNDM1NWE2NDlmMGZkMDRl NjA4N2E4ODBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDYtMDkgIE1PUklU QSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU2hhZG93Q29udGVudEVsZW1lbnQgc2hvdWxkIGRldGFj aCBpdHMgaW5jbHVzaW9ucyBiZWZvcmUgYXR0YWNoIHRoZW0uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjQyOAorCisgICAgICAgIC0gT24gU2hhZG93 Q29udGVudEVsZW1lbnQ6OmF0dGFjaCgpLCBjaGFuZ2VkIGluY2x1c2lvbiBhdHRhY2ggc2NoZW1l CisgICAgICAgICAgZnJvbSBwZXItbm9kZSByZWF0dGFjaCgpIHRvIGRldGFjaCgpLWFsbC1hbmQt YXR0YWNoKCktdGhlbS4gIFRoaXMKKyAgICAgICAgICBlbGltaW5hdGVzIGF0dGFjaCgpIG9yZGVy IHByb2JsZW1zIHdoaWNoIFNoYWRvd0NvbnRlbnRFbGVtZW50CisgICAgICAgICAgcG9zc2libHkg aGFzLgorICAgICAgICAtIENoYW5nZWQgU2hhZG93Q29udGVudEVsZW1lbnQgdG8gaGF2ZSBtX2lu Y2x1c2lvbnMgYXMgYSBtZW1iZXIgdmFyaWFibGUsCisgICAgICAgICAgd2hpY2ggd2lsbCBiZSB1 c2VkIGJ5IHVwY29taW5nIGNoYW5nZXMuCisgICAgICAgIC0gTW92ZWQgYXR0YWNoKCkgY29kZSBm cm9tIFNoYWRvd0NvbnRlbnRTZWxlY3RvciB0byBTaGFkb3dDb250ZW50RWxlbWVudAorICAgICAg ICAgIGJlY2F1c2UgdGhlIGVsZW1lbnQgbm93IG93bnMgdGhlIGluY2x1c2lvbiBsaXN0LgorICAg ICAgICAKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyB2aXNpYmxlIGJlaGF2aW9yYWwgY2hhbmdl IHlldC4KKworICAgICAgICAqIGRvbS9TaGFkb3dDb250ZW50RWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTaGFkb3dDb250ZW50RWxlbWVudDo6YXR0YWNoKToKKyAgICAgICAgKFdlYkNv cmU6OlNoYWRvd0NvbnRlbnRFbGVtZW50OjpkZXRhY2gpOiBBZGRlZC4KKyAgICAgICAgKiBkb20v U2hhZG93Q29udGVudEVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0NvbnRlbnRF bGVtZW50OjppbmNsdXNpb25BdCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6U2hhZG93Q29u dGVudEVsZW1lbnQ6OmluY2x1c2lvbkNvdW50KTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjp0 b1NoYWRvd0NvbnRlbnRFbGVtZW50KToKKyAgICAgICAgKiBkb20vU2hhZG93Q29udGVudFNlbGVj dG9yLmNwcDogUmVtb3ZlZCBhdHRhY2hDaGlsZHJlbkZvcigpCisgICAgICAgIChXZWJDb3JlOjpT aGFkb3dDb250ZW50U2VsZWN0b3I6OnNlbGVjdEluY2x1ZGVzaW9uKTogRXh0cmFjdGVkIGZyb20g YXR0YWNoQ2hpbGRyZW5Gb3IoKQorICAgICAgICAoV2ViQ29yZTo6U2hhZG93Q29udGVudFNlbGVj dG9yOjp3aWxsQXR0YWNoQ29udGVudEZvcik6IEV4dHJhY3RlZCBmcm9tIGF0dGFjaENoaWxkcmVu Rm9yKCkKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6ZGlkQXR0YWNo Q29udGVudCk6IEV4dHJhY3RlZCBmcm9tIGF0dGFjaENoaWxkcmVuRm9yKCkKKyAgICAgICAgKFdl YkNvcmU6OlNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6YWN0aXZlRWxlbWVudCk6CisgICAgICAgICog ZG9tL1NoYWRvd0NvbnRlbnRTZWxlY3Rvci5oOgorCiAyMDExLTA2LTA5ICBKaWFuIExpICA8amlh bmxpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dDb250ZW50RWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudEVsZW1lbnQuY3BwCmluZGV4IGYxODE3MTQ0 MmY4MThjOGI3MWMyYWNhZjQzNmYzYjA2Nzg0MjQ3MTUuLmEzMjJmNWEyZGFkODA4ZDRkZTRjZTNl NjZkYmQ0ZmFmNGQ1YTJlMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dD b250ZW50RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRF bGVtZW50LmNwcApAQCAtMzQsOSArMzQsMjIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdm9pZCBT aGFkb3dDb250ZW50RWxlbWVudDo6YXR0YWNoKCkKIHsKICAgICBBU1NFUlQoIWZpcnN0Q2hpbGQo KSk7IC8vIEN1cnJlbnRseSBkb2Vzbid0IHN1cHBvcnQgYW55IGxpZ2h0IGNoaWxkLgotICAgIEVs ZW1lbnQ6OmF0dGFjaCgpOwotICAgIGlmIChTaGFkb3dDb250ZW50U2VsZWN0b3IqIHNlbGVjdG9y ID0gU2hhZG93Q29udGVudFNlbGVjdG9yOjpjdXJyZW50SW5zdGFuY2UoKSkKLSAgICAgICAgc2Vs ZWN0b3ItPmF0dGFjaENoaWxkcmVuRm9yKHRoaXMpOworICAgIFN0eWxlZEVsZW1lbnQ6OmF0dGFj aCgpOworICAgIGlmIChTaGFkb3dDb250ZW50U2VsZWN0b3IqIHNlbGVjdG9yID0gU2hhZG93Q29u dGVudFNlbGVjdG9yOjpjdXJyZW50SW5zdGFuY2UoKSkgeworICAgICAgICBzZWxlY3Rvci0+d2ls bEF0dGFjaENvbnRlbnRGb3IodGhpcyk7CisgICAgICAgIHNlbGVjdG9yLT5zZWxlY3RJbmNsdWRl c2lvbihtX2luY2x1c2lvbnMpOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1faW5j bHVzaW9ucy5zaXplKCk7ICsraSkKKyAgICAgICAgICAgIG1faW5jbHVzaW9uc1tpXS0+ZGV0YWNo KCk7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9pbmNsdXNpb25zLnNpemUoKTsg KytpKQorICAgICAgICAgICAgbV9pbmNsdXNpb25zW2ldLT5hdHRhY2goKTsKKyAgICAgICAgc2Vs ZWN0b3ItPmRpZEF0dGFjaENvbnRlbnQoKTsKKyAgICB9Cit9CisKK3ZvaWQgU2hhZG93Q29udGVu dEVsZW1lbnQ6OmRldGFjaCgpCit7CisgICAgbV9pbmNsdXNpb25zLmNsZWFyKCk7CisgICAgU3R5 bGVkRWxlbWVudDo6ZGV0YWNoKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9TaGFkb3dDb250ZW50RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0Nv bnRlbnRFbGVtZW50LmgKaW5kZXggZmZmOGQ2N2JhNjNkNTYxMjcyNzViNzgzNTAxYWZjYTdhNWVk NGEwMC4uYWI2ZTVhMDBlYWJmODE0Njk5MzI2ODZkODdmM2U3MTIwODdhODY2OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRFbGVtZW50LmgKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRFbGVtZW50LmgKQEAgLTQ3LDEzICs0NywzNSBAQCBw dWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkSW5jbHVkZShOb2RlKikgPSAwOwogICAg IHZpcnR1YWwgdm9pZCBhdHRhY2goKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGV0YWNoKCk7CisKKyAg ICBOb2RlKiBpbmNsdXNpb25BdChzaXplX3QpIGNvbnN0OworICAgIHNpemVfdCBpbmNsdXNpb25D b3VudCgpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBpc0NvbnRlbnRFbGVt ZW50KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgYm9vbCByZW5kZXJlcklz TmVlZGVkKGNvbnN0IE5vZGVSZW5kZXJpbmdDb250ZXh0JikgeyByZXR1cm4gZmFsc2U7IH0KICAg ICB2aXJ0dWFsIFJlbmRlck9iamVjdCogY3JlYXRlUmVuZGVyZXIoUmVuZGVyQXJlbmEqLCBSZW5k ZXJTdHlsZSopIHsgcmV0dXJuIDA7IH0KKworICAgIFZlY3RvcjxSZWZQdHI8Tm9kZT4gPiBtX2lu Y2x1c2lvbnM7CiB9OwogCitpbmxpbmUgTm9kZSogU2hhZG93Q29udGVudEVsZW1lbnQ6OmluY2x1 c2lvbkF0KHNpemVfdCBpbmRleCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9pbmNsdXNpb25zLmF0 KGluZGV4KS5nZXQoKTsKK30KKworaW5saW5lIHNpemVfdCBTaGFkb3dDb250ZW50RWxlbWVudDo6 aW5jbHVzaW9uQ291bnQoKSBjb25zdAoreworICAgIHJldHVybiBtX2luY2x1c2lvbnMuc2l6ZSgp OworfQorCitpbmxpbmUgU2hhZG93Q29udGVudEVsZW1lbnQqIHRvU2hhZG93Q29udGVudEVsZW1l bnQoTm9kZSogbm9kZSkKK3sKKyAgICBBU1NFUlQoIW5vZGUgfHwgbm9kZS0+aXNDb250ZW50RWxl bWVudCgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U2hhZG93Q29udGVudEVsZW1lbnQqPihu b2RlKTsKK30KKwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9T aGFkb3dDb250ZW50U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRl bnRTZWxlY3Rvci5jcHAKaW5kZXggYTJjMzJjZmI5ZGFkYzk3NDJlOGZjYzdlZGM2ZGIzMjdkZjc1 MGVlNi4uNDJmMWIzNTNiNTNlOWMyZWVkYTU4ZGNlODFhNTdmNzhhYTIyMDQxYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRTZWxlY3Rvci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRTZWxlY3Rvci5jcHAKQEAgLTUxLDIyICs1MSwz NyBAQCBTaGFkb3dDb250ZW50U2VsZWN0b3I6On5TaGFkb3dDb250ZW50U2VsZWN0b3IoKQogICAg IHNfY3VycmVudEluc3RhbmNlID0gbV9wYXJlbnQ7CiB9CiAKLXZvaWQgU2hhZG93Q29udGVudFNl bGVjdG9yOjphdHRhY2hDaGlsZHJlbkZvcihTaGFkb3dDb250ZW50RWxlbWVudCogY29udGVudEVs ZW1lbnQpCit2b2lkIFNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6c2VsZWN0SW5jbHVkZXNpb24oVmVj dG9yPFJlZlB0cjxOb2RlPiA+JiBpbmNsdXNpb25zKQogewotICAgIG1fYWN0aXZlRWxlbWVudCA9 IGNvbnRlbnRFbGVtZW50OworICAgIGluY2x1c2lvbnMuY2xlYXIoKTsKIAogICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgbV9jaGlsZHJlbi5zaXplKCk7ICsraSkgewogICAgICAgICBOb2RlKiBj aGlsZCA9IG1fY2hpbGRyZW5baV0uZ2V0KCk7CiAgICAgICAgIGlmICghY2hpbGQpCiAgICAgICAg ICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKCFjb250ZW50RWxlbWVudC0+c2hvdWxkSW5jbHVk ZShjaGlsZCkpCisgICAgICAgIGlmICghbV9hY3RpdmVFbGVtZW50LT5zaG91bGRJbmNsdWRlKGNo aWxkKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGNoaWxkLT5yZWF0dGFjaCgp OworICAgICAgICBpbmNsdXNpb25zLmFwcGVuZChjaGlsZCk7CiAgICAgICAgIG1fY2hpbGRyZW5b aV0gPSAwOwogICAgIH0KK30KKwordm9pZCBTaGFkb3dDb250ZW50U2VsZWN0b3I6OndpbGxBdHRh Y2hDb250ZW50Rm9yKFNoYWRvd0NvbnRlbnRFbGVtZW50KiBlbGVtZW50KQoreworICAgIEFTU0VS VCghbV9hY3RpdmVFbGVtZW50KTsKKyAgICBtX2FjdGl2ZUVsZW1lbnQgPSBlbGVtZW50OworfQog Cit2b2lkIFNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6ZGlkQXR0YWNoQ29udGVudCgpCit7CisgICAg QVNTRVJUKG1fYWN0aXZlRWxlbWVudCk7CiAgICAgbV9hY3RpdmVFbGVtZW50ID0gMDsKIH0KIAor RWxlbWVudCogU2hhZG93Q29udGVudFNlbGVjdG9yOjphY3RpdmVFbGVtZW50KCkgY29uc3QKK3sK KyAgICByZXR1cm4gbV9hY3RpdmVFbGVtZW50OworfQorCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9kb20vU2hhZG93Q29udGVudFNlbGVjdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v U2hhZG93Q29udGVudFNlbGVjdG9yLmgKaW5kZXggZjk3MWYzZDY3NTMzNTg4MmM1MTJiMjgzYzQy NzdkZGNhNmJiYWU2ZS4uMTNmYjhjNmM4MTA5Yjk1YTU4NTY2MzAxNWZiNzc5ZGIwM2Q3NDZmMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRTZWxlY3Rvci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dDb250ZW50U2VsZWN0b3IuaApAQCAtNDcsMTYg KzQ3LDE5IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBTaGFkb3dDb250ZW50U2VsZWN0b3IoU2hh ZG93Um9vdCopOwogICAgIH5TaGFkb3dDb250ZW50U2VsZWN0b3IoKTsKIAotICAgIHZvaWQgYXR0 YWNoQ2hpbGRyZW5Gb3IoU2hhZG93Q29udGVudEVsZW1lbnQqKTsKKyAgICB2b2lkIHdpbGxBdHRh Y2hDb250ZW50Rm9yKFNoYWRvd0NvbnRlbnRFbGVtZW50Kik7CisgICAgdm9pZCBkaWRBdHRhY2hD b250ZW50KCk7CisgICAgdm9pZCBzZWxlY3RJbmNsdWRlc2lvbihWZWN0b3I8UmVmUHRyPE5vZGU+ ID4mIGluY2x1c2lvbnMpOworCiAgICAgU2hhZG93Um9vdCogc2hhZG93Um9vdCgpIGNvbnN0IHsg cmV0dXJuIG1fc2hhZG93Um9vdDsgfQotICAgIEVsZW1lbnQqIGFjdGl2ZUVsZW1lbnQoKSBjb25z dCB7IHJldHVybiBtX2FjdGl2ZUVsZW1lbnQ7IH0KKyAgICBFbGVtZW50KiBhY3RpdmVFbGVtZW50 KCkgY29uc3Q7CiAKICAgICBzdGF0aWMgU2hhZG93Q29udGVudFNlbGVjdG9yKiBjdXJyZW50SW5z dGFuY2UoKSB7IHJldHVybiBzX2N1cnJlbnRJbnN0YW5jZTsgfQogCiBwcml2YXRlOgogICAgIFNo YWRvd0NvbnRlbnRTZWxlY3RvciogbV9wYXJlbnQ7CiAgICAgU2hhZG93Um9vdCogbV9zaGFkb3dS b290OwotICAgIEVsZW1lbnQqIG1fYWN0aXZlRWxlbWVudDsKKyAgICBTaGFkb3dDb250ZW50RWxl bWVudCogbV9hY3RpdmVFbGVtZW50OwogICAgIFZlY3RvcjxSZWZQdHI8Tm9kZT4gPiBtX2NoaWxk cmVuOwogCiAgICAgc3RhdGljIFNoYWRvd0NvbnRlbnRTZWxlY3Rvciogc19jdXJyZW50SW5zdGFu Y2U7Cg== 96921 2011-06-12 22:57:13 -0700 2011-06-13 22:45:38 -0700 Updated to ToT bug-62428-20110613145711.patch text/plain 6853 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogODg2MjgKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5YzM3YjYzNDNkM2ZkM2Nk OWE1MWFkNDRhMjg4YTZhN2E2MjAzMDhiLi4xNTlkZGI4YjgwY2Q2ZTIwYWFlNzJhYTQ2N2U4YTcy NWFlMjUyNWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDYtMDkgIE1PUklU QSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU2hhZG93Q29udGVudEVsZW1lbnQgc2hvdWxkIGRldGFj aCBpdHMgaW5jbHVzaW9ucyBiZWZvcmUgYXR0YWNoIHRoZW0uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjQyOAorCisgICAgICAgIC0gT24gU2hhZG93 Q29udGVudEVsZW1lbnQ6OmF0dGFjaCgpLCBjaGFuZ2VkIGluY2x1c2lvbiBhdHRhY2ggc2NoZW1l CisgICAgICAgICAgZnJvbSBwZXItbm9kZSByZWF0dGFjaCgpIHRvIGRldGFjaCgpLWFsbC1hbmQt YXR0YWNoKCktdGhlbS4gIFRoaXMKKyAgICAgICAgICBlbGltaW5hdGVzIGF0dGFjaCgpIG9yZGVy IHByb2JsZW1zIHdoaWNoIFNoYWRvd0NvbnRlbnRFbGVtZW50CisgICAgICAgICAgcG9zc2libHkg aGFzLgorICAgICAgICAtIENoYW5nZWQgU2hhZG93Q29udGVudEVsZW1lbnQgdG8gaGF2ZSBtX2lu Y2x1c2lvbnMgYXMgYSBtZW1iZXIgdmFyaWFibGUsCisgICAgICAgICAgd2hpY2ggd2lsbCBiZSB1 c2VkIGJ5IHVwY29taW5nIGNoYW5nZXMuCisgICAgICAgIC0gTW92ZWQgYXR0YWNoKCkgY29kZSBm cm9tIFNoYWRvd0NvbnRlbnRTZWxlY3RvciB0byBTaGFkb3dDb250ZW50RWxlbWVudAorICAgICAg ICAgIGJlY2F1c2UgdGhlIGVsZW1lbnQgbm93IG93bnMgdGhlIGluY2x1c2lvbiBsaXN0LgorICAg ICAgICAKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyB2aXNpYmxlIGJlaGF2aW9yYWwgY2hhbmdl IHlldC4KKworICAgICAgICAqIGRvbS9TaGFkb3dDb250ZW50RWxlbWVudC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpTaGFkb3dDb250ZW50RWxlbWVudDo6YXR0YWNoKToKKyAgICAgICAgKFdlYkNv cmU6OlNoYWRvd0NvbnRlbnRFbGVtZW50OjpkZXRhY2gpOiBBZGRlZC4KKyAgICAgICAgKiBkb20v U2hhZG93Q29udGVudEVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0NvbnRlbnRF bGVtZW50OjppbmNsdXNpb25BdCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6U2hhZG93Q29u dGVudEVsZW1lbnQ6OmluY2x1c2lvbkNvdW50KTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjp0 b1NoYWRvd0NvbnRlbnRFbGVtZW50KToKKyAgICAgICAgKiBkb20vU2hhZG93Q29udGVudFNlbGVj dG9yLmNwcDogUmVtb3ZlZCBhdHRhY2hDaGlsZHJlbkZvcigpCisgICAgICAgIChXZWJDb3JlOjpT aGFkb3dDb250ZW50U2VsZWN0b3I6OnNlbGVjdEluY2x1ZGVzaW9uKTogRXh0cmFjdGVkIGZyb20g YXR0YWNoQ2hpbGRyZW5Gb3IoKQorICAgICAgICAoV2ViQ29yZTo6U2hhZG93Q29udGVudFNlbGVj dG9yOjp3aWxsQXR0YWNoQ29udGVudEZvcik6IEV4dHJhY3RlZCBmcm9tIGF0dGFjaENoaWxkcmVu Rm9yKCkKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6ZGlkQXR0YWNo Q29udGVudCk6IEV4dHJhY3RlZCBmcm9tIGF0dGFjaENoaWxkcmVuRm9yKCkKKyAgICAgICAgKFdl YkNvcmU6OlNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6YWN0aXZlRWxlbWVudCk6CisgICAgICAgICog ZG9tL1NoYWRvd0NvbnRlbnRTZWxlY3Rvci5oOgorCiAyMDExLTA2LTEyICBBZGFtIEJhcnRoICA8 YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5 YWtvdi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dDb250ZW50RWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudEVsZW1lbnQuY3BwCmluZGV4 IGYxODE3MTQ0MmY4MThjOGI3MWMyYWNhZjQzNmYzYjA2Nzg0MjQ3MTUuLmEzMjJmNWEyZGFkODA4 ZDRkZTRjZTNlNjZkYmQ0ZmFmNGQ1YTJlMDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9TaGFkb3dDb250ZW50RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRv d0NvbnRlbnRFbGVtZW50LmNwcApAQCAtMzQsOSArMzQsMjIgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogdm9pZCBTaGFkb3dDb250ZW50RWxlbWVudDo6YXR0YWNoKCkKIHsKICAgICBBU1NFUlQoIWZp cnN0Q2hpbGQoKSk7IC8vIEN1cnJlbnRseSBkb2Vzbid0IHN1cHBvcnQgYW55IGxpZ2h0IGNoaWxk LgotICAgIEVsZW1lbnQ6OmF0dGFjaCgpOwotICAgIGlmIChTaGFkb3dDb250ZW50U2VsZWN0b3Iq IHNlbGVjdG9yID0gU2hhZG93Q29udGVudFNlbGVjdG9yOjpjdXJyZW50SW5zdGFuY2UoKSkKLSAg ICAgICAgc2VsZWN0b3ItPmF0dGFjaENoaWxkcmVuRm9yKHRoaXMpOworICAgIFN0eWxlZEVsZW1l bnQ6OmF0dGFjaCgpOworICAgIGlmIChTaGFkb3dDb250ZW50U2VsZWN0b3IqIHNlbGVjdG9yID0g U2hhZG93Q29udGVudFNlbGVjdG9yOjpjdXJyZW50SW5zdGFuY2UoKSkgeworICAgICAgICBzZWxl Y3Rvci0+d2lsbEF0dGFjaENvbnRlbnRGb3IodGhpcyk7CisgICAgICAgIHNlbGVjdG9yLT5zZWxl Y3RJbmNsdWRlc2lvbihtX2luY2x1c2lvbnMpOworICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IG1faW5jbHVzaW9ucy5zaXplKCk7ICsraSkKKyAgICAgICAgICAgIG1faW5jbHVzaW9uc1tp XS0+ZGV0YWNoKCk7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9pbmNsdXNpb25z LnNpemUoKTsgKytpKQorICAgICAgICAgICAgbV9pbmNsdXNpb25zW2ldLT5hdHRhY2goKTsKKyAg ICAgICAgc2VsZWN0b3ItPmRpZEF0dGFjaENvbnRlbnQoKTsKKyAgICB9Cit9CisKK3ZvaWQgU2hh ZG93Q29udGVudEVsZW1lbnQ6OmRldGFjaCgpCit7CisgICAgbV9pbmNsdXNpb25zLmNsZWFyKCk7 CisgICAgU3R5bGVkRWxlbWVudDo6ZGV0YWNoKCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9TaGFkb3dDb250ZW50RWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9t L1NoYWRvd0NvbnRlbnRFbGVtZW50LmgKaW5kZXggZmZmOGQ2N2JhNjNkNTYxMjcyNzViNzgzNTAx YWZjYTdhNWVkNGEwMC4uYWI2ZTVhMDBlYWJmODE0Njk5MzI2ODZkODdmM2U3MTIwODdhODY2OSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRFbGVtZW50LmgKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRFbGVtZW50LmgKQEAgLTQ3LDEzICs0 NywzNSBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkSW5jbHVkZShOb2RlKikg PSAwOwogICAgIHZpcnR1YWwgdm9pZCBhdHRhY2goKTsKKyAgICB2aXJ0dWFsIHZvaWQgZGV0YWNo KCk7CisKKyAgICBOb2RlKiBpbmNsdXNpb25BdChzaXplX3QpIGNvbnN0OworICAgIHNpemVfdCBp bmNsdXNpb25Db3VudCgpIGNvbnN0OwogCiBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBpc0Nv bnRlbnRFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZpcnR1YWwgYm9vbCBy ZW5kZXJlcklzTmVlZGVkKGNvbnN0IE5vZGVSZW5kZXJpbmdDb250ZXh0JikgeyByZXR1cm4gZmFs c2U7IH0KICAgICB2aXJ0dWFsIFJlbmRlck9iamVjdCogY3JlYXRlUmVuZGVyZXIoUmVuZGVyQXJl bmEqLCBSZW5kZXJTdHlsZSopIHsgcmV0dXJuIDA7IH0KKworICAgIFZlY3RvcjxSZWZQdHI8Tm9k ZT4gPiBtX2luY2x1c2lvbnM7CiB9OwogCitpbmxpbmUgTm9kZSogU2hhZG93Q29udGVudEVsZW1l bnQ6OmluY2x1c2lvbkF0KHNpemVfdCBpbmRleCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9pbmNs dXNpb25zLmF0KGluZGV4KS5nZXQoKTsKK30KKworaW5saW5lIHNpemVfdCBTaGFkb3dDb250ZW50 RWxlbWVudDo6aW5jbHVzaW9uQ291bnQoKSBjb25zdAoreworICAgIHJldHVybiBtX2luY2x1c2lv bnMuc2l6ZSgpOworfQorCitpbmxpbmUgU2hhZG93Q29udGVudEVsZW1lbnQqIHRvU2hhZG93Q29u dGVudEVsZW1lbnQoTm9kZSogbm9kZSkKK3sKKyAgICBBU1NFUlQoIW5vZGUgfHwgbm9kZS0+aXND b250ZW50RWxlbWVudCgpKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U2hhZG93Q29udGVudEVs ZW1lbnQqPihub2RlKTsKK30KKwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9TaGFkb3dDb250ZW50U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1No YWRvd0NvbnRlbnRTZWxlY3Rvci5jcHAKaW5kZXggYTJjMzJjZmI5ZGFkYzk3NDJlOGZjYzdlZGM2 ZGIzMjdkZjc1MGVlNi4uNDJmMWIzNTNiNTNlOWMyZWVkYTU4ZGNlODFhNTdmNzhhYTIyMDQxYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRTZWxlY3Rvci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRTZWxlY3Rvci5jcHAKQEAgLTUx LDIyICs1MSwzNyBAQCBTaGFkb3dDb250ZW50U2VsZWN0b3I6On5TaGFkb3dDb250ZW50U2VsZWN0 b3IoKQogICAgIHNfY3VycmVudEluc3RhbmNlID0gbV9wYXJlbnQ7CiB9CiAKLXZvaWQgU2hhZG93 Q29udGVudFNlbGVjdG9yOjphdHRhY2hDaGlsZHJlbkZvcihTaGFkb3dDb250ZW50RWxlbWVudCog Y29udGVudEVsZW1lbnQpCit2b2lkIFNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6c2VsZWN0SW5jbHVk ZXNpb24oVmVjdG9yPFJlZlB0cjxOb2RlPiA+JiBpbmNsdXNpb25zKQogewotICAgIG1fYWN0aXZl RWxlbWVudCA9IGNvbnRlbnRFbGVtZW50OworICAgIGluY2x1c2lvbnMuY2xlYXIoKTsKIAogICAg IGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9jaGlsZHJlbi5zaXplKCk7ICsraSkgewogICAgICAg ICBOb2RlKiBjaGlsZCA9IG1fY2hpbGRyZW5baV0uZ2V0KCk7CiAgICAgICAgIGlmICghY2hpbGQp CiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKCFjb250ZW50RWxlbWVudC0+c2hv dWxkSW5jbHVkZShjaGlsZCkpCisgICAgICAgIGlmICghbV9hY3RpdmVFbGVtZW50LT5zaG91bGRJ bmNsdWRlKGNoaWxkKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGNoaWxkLT5y ZWF0dGFjaCgpOworICAgICAgICBpbmNsdXNpb25zLmFwcGVuZChjaGlsZCk7CiAgICAgICAgIG1f Y2hpbGRyZW5baV0gPSAwOwogICAgIH0KK30KKwordm9pZCBTaGFkb3dDb250ZW50U2VsZWN0b3I6 OndpbGxBdHRhY2hDb250ZW50Rm9yKFNoYWRvd0NvbnRlbnRFbGVtZW50KiBlbGVtZW50KQorewor ICAgIEFTU0VSVCghbV9hY3RpdmVFbGVtZW50KTsKKyAgICBtX2FjdGl2ZUVsZW1lbnQgPSBlbGVt ZW50OworfQogCit2b2lkIFNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6ZGlkQXR0YWNoQ29udGVudCgp Cit7CisgICAgQVNTRVJUKG1fYWN0aXZlRWxlbWVudCk7CiAgICAgbV9hY3RpdmVFbGVtZW50ID0g MDsKIH0KIAorRWxlbWVudCogU2hhZG93Q29udGVudFNlbGVjdG9yOjphY3RpdmVFbGVtZW50KCkg Y29uc3QKK3sKKyAgICByZXR1cm4gbV9hY3RpdmVFbGVtZW50OworfQorCiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudFNlbGVjdG9yLmggYi9Tb3VyY2UvV2Vi Q29yZS9kb20vU2hhZG93Q29udGVudFNlbGVjdG9yLmgKaW5kZXggZjk3MWYzZDY3NTMzNTg4MmM1 MTJiMjgzYzQyNzdkZGNhNmJiYWU2ZS4uMTNmYjhjNmM4MTA5Yjk1YTU4NTY2MzAxNWZiNzc5ZGIw M2Q3NDZmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRTZWxl Y3Rvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dDb250ZW50U2VsZWN0b3IuaApA QCAtNDcsMTYgKzQ3LDE5IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBTaGFkb3dDb250ZW50U2Vs ZWN0b3IoU2hhZG93Um9vdCopOwogICAgIH5TaGFkb3dDb250ZW50U2VsZWN0b3IoKTsKIAotICAg IHZvaWQgYXR0YWNoQ2hpbGRyZW5Gb3IoU2hhZG93Q29udGVudEVsZW1lbnQqKTsKKyAgICB2b2lk IHdpbGxBdHRhY2hDb250ZW50Rm9yKFNoYWRvd0NvbnRlbnRFbGVtZW50Kik7CisgICAgdm9pZCBk aWRBdHRhY2hDb250ZW50KCk7CisgICAgdm9pZCBzZWxlY3RJbmNsdWRlc2lvbihWZWN0b3I8UmVm UHRyPE5vZGU+ID4mIGluY2x1c2lvbnMpOworCiAgICAgU2hhZG93Um9vdCogc2hhZG93Um9vdCgp IGNvbnN0IHsgcmV0dXJuIG1fc2hhZG93Um9vdDsgfQotICAgIEVsZW1lbnQqIGFjdGl2ZUVsZW1l bnQoKSBjb25zdCB7IHJldHVybiBtX2FjdGl2ZUVsZW1lbnQ7IH0KKyAgICBFbGVtZW50KiBhY3Rp dmVFbGVtZW50KCkgY29uc3Q7CiAKICAgICBzdGF0aWMgU2hhZG93Q29udGVudFNlbGVjdG9yKiBj dXJyZW50SW5zdGFuY2UoKSB7IHJldHVybiBzX2N1cnJlbnRJbnN0YW5jZTsgfQogCiBwcml2YXRl OgogICAgIFNoYWRvd0NvbnRlbnRTZWxlY3RvciogbV9wYXJlbnQ7CiAgICAgU2hhZG93Um9vdCog bV9zaGFkb3dSb290OwotICAgIEVsZW1lbnQqIG1fYWN0aXZlRWxlbWVudDsKKyAgICBTaGFkb3dD b250ZW50RWxlbWVudCogbV9hY3RpdmVFbGVtZW50OwogICAgIFZlY3RvcjxSZWZQdHI8Tm9kZT4g PiBtX2NoaWxkcmVuOwogCiAgICAgc3RhdGljIFNoYWRvd0NvbnRlbnRTZWxlY3Rvciogc19jdXJy ZW50SW5zdGFuY2U7Cg== 97069 2011-06-13 22:45:44 -0700 2011-06-14 10:43:27 -0700 Patch bug-62428-20110614144543.patch text/plain 6860 morrita U3VidmVyc2lvbiBSZXZpc2lvbjogODg3NzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ODVjZmQyYTk3N2RhOTRl NjRhNDg2OWQ2MTYwMmMyYjZlYzE0N2RkLi5kM2MxYzZhZTQxNDIzYTg1OGMwZDRmMzlhNDg1ZDVk NWYyM2Q0MzQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDYtMDkgIE1PUklU QSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU2hhZG93Q29udGVudEVsZW1lbnQgc2hvdWxkIGRldGFj aCBpdHMgaW5jbHVzaW9ucyBiZWZvcmUgYXR0YWNoaW5nIHRoZW0uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MjQyOAorCisgICAgICAgIC0gT24gU2hh ZG93Q29udGVudEVsZW1lbnQ6OmF0dGFjaCgpLCBjaGFuZ2VkIGluY2x1c2lvbiBhdHRhY2ggc2No ZW1lCisgICAgICAgICAgZnJvbSBwZXItbm9kZSByZWF0dGFjaCgpIHRvIGRldGFjaCgpLWFsbC1h bmQtYXR0YWNoKCktdGhlbS4gIFRoaXMKKyAgICAgICAgICBlbGltaW5hdGVzIGF0dGFjaCgpIG9y ZGVyIHByb2JsZW1zIHdoaWNoIFNoYWRvd0NvbnRlbnRFbGVtZW50CisgICAgICAgICAgcG9zc2li bHkgaGFzLgorICAgICAgICAtIENoYW5nZWQgU2hhZG93Q29udGVudEVsZW1lbnQgdG8gaGF2ZSBt X2luY2x1c2lvbnMgYXMgYSBtZW1iZXIgdmFyaWFibGUsCisgICAgICAgICAgd2hpY2ggd2lsbCBi ZSB1c2VkIGJ5IHVwY29taW5nIGNoYW5nZXMuCisgICAgICAgIC0gTW92ZWQgYXR0YWNoKCkgY29k ZSBmcm9tIFNoYWRvd0NvbnRlbnRTZWxlY3RvciB0byBTaGFkb3dDb250ZW50RWxlbWVudAorICAg ICAgICAgIGJlY2F1c2UgdGhlIGVsZW1lbnQgbm93IG93bnMgdGhlIGluY2x1c2lvbiBsaXN0Lgor ICAgICAgICAKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBObyB2aXNpYmxlIGJlaGF2aW9yYWwgY2hh bmdlIHlldC4KKworICAgICAgICAqIGRvbS9TaGFkb3dDb250ZW50RWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTaGFkb3dDb250ZW50RWxlbWVudDo6YXR0YWNoKToKKyAgICAgICAgKFdl YkNvcmU6OlNoYWRvd0NvbnRlbnRFbGVtZW50OjpkZXRhY2gpOiBBZGRlZC4KKyAgICAgICAgKiBk b20vU2hhZG93Q29udGVudEVsZW1lbnQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0NvbnRl bnRFbGVtZW50OjppbmNsdXNpb25BdCk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6U2hhZG93 Q29udGVudEVsZW1lbnQ6OmluY2x1c2lvbkNvdW50KTogQWRkZWQuCisgICAgICAgIChXZWJDb3Jl Ojp0b1NoYWRvd0NvbnRlbnRFbGVtZW50KToKKyAgICAgICAgKiBkb20vU2hhZG93Q29udGVudFNl bGVjdG9yLmNwcDogUmVtb3ZlZCBhdHRhY2hDaGlsZHJlbkZvcigpCisgICAgICAgIChXZWJDb3Jl OjpTaGFkb3dDb250ZW50U2VsZWN0b3I6OnNlbGVjdEluY2x1c2lvbik6IEV4dHJhY3RlZCBmcm9t IGF0dGFjaENoaWxkcmVuRm9yKCkKKyAgICAgICAgKFdlYkNvcmU6OlNoYWRvd0NvbnRlbnRTZWxl Y3Rvcjo6d2lsbEF0dGFjaENvbnRlbnRGb3IpOiBFeHRyYWN0ZWQgZnJvbSBhdHRhY2hDaGlsZHJl bkZvcigpCisgICAgICAgIChXZWJDb3JlOjpTaGFkb3dDb250ZW50U2VsZWN0b3I6OmRpZEF0dGFj aENvbnRlbnQpOiBFeHRyYWN0ZWQgZnJvbSBhdHRhY2hDaGlsZHJlbkZvcigpCisgICAgICAgIChX ZWJDb3JlOjpTaGFkb3dDb250ZW50U2VsZWN0b3I6OmFjdGl2ZUVsZW1lbnQpOgorICAgICAgICAq IGRvbS9TaGFkb3dDb250ZW50U2VsZWN0b3IuaDoKKwogMjAxMS0wNi0xMyAgS2VudCBUYW11cmEg IDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0VGTF0gVGhlIHNlY29uZCB0cnkgdG8g Zml4IGEgYnVpbGQgYnJlYWsuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93 Q29udGVudEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRFbGVt ZW50LmNwcAppbmRleCBmMTgxNzE0NDJmODE4YzhiNzFjMmFjYWY0MzZmM2IwNjc4NDI0NzE1Li5j ODY2NTQ3MThiM2RlOTQ4ZGUwNjkzNDM5NjIyMjE3MTVmN2YyZGVkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TaGFkb3dDb250ZW50RWxlbWVudC5jcHAKQEAgLTM0LDkgKzM0LDIyIEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIHZvaWQgU2hhZG93Q29udGVudEVsZW1lbnQ6OmF0dGFjaCgpCiB7CiAg ICAgQVNTRVJUKCFmaXJzdENoaWxkKCkpOyAvLyBDdXJyZW50bHkgZG9lc24ndCBzdXBwb3J0IGFu eSBsaWdodCBjaGlsZC4KLSAgICBFbGVtZW50OjphdHRhY2goKTsKLSAgICBpZiAoU2hhZG93Q29u dGVudFNlbGVjdG9yKiBzZWxlY3RvciA9IFNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6Y3VycmVudElu c3RhbmNlKCkpCi0gICAgICAgIHNlbGVjdG9yLT5hdHRhY2hDaGlsZHJlbkZvcih0aGlzKTsKKyAg ICBTdHlsZWRFbGVtZW50OjphdHRhY2goKTsKKyAgICBpZiAoU2hhZG93Q29udGVudFNlbGVjdG9y KiBzZWxlY3RvciA9IFNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6Y3VycmVudEluc3RhbmNlKCkpIHsK KyAgICAgICAgc2VsZWN0b3ItPndpbGxBdHRhY2hDb250ZW50Rm9yKHRoaXMpOworICAgICAgICBz ZWxlY3Rvci0+c2VsZWN0SW5jbHVzaW9uKG1faW5jbHVzaW9ucyk7CisgICAgICAgIGZvciAoc2l6 ZV90IGkgPSAwOyBpIDwgbV9pbmNsdXNpb25zLnNpemUoKTsgKytpKQorICAgICAgICAgICAgbV9p bmNsdXNpb25zW2ldLT5kZXRhY2goKTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBt X2luY2x1c2lvbnMuc2l6ZSgpOyArK2kpCisgICAgICAgICAgICBtX2luY2x1c2lvbnNbaV0tPmF0 dGFjaCgpOworICAgICAgICBzZWxlY3Rvci0+ZGlkQXR0YWNoQ29udGVudCgpOworICAgIH0KK30K Kwordm9pZCBTaGFkb3dDb250ZW50RWxlbWVudDo6ZGV0YWNoKCkKK3sKKyAgICBtX2luY2x1c2lv bnMuY2xlYXIoKTsKKyAgICBTdHlsZWRFbGVtZW50OjpkZXRhY2goKTsKIH0KIAogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRFbGVtZW50LmggYi9Tb3VyY2Uv V2ViQ29yZS9kb20vU2hhZG93Q29udGVudEVsZW1lbnQuaAppbmRleCBmZmY4ZDY3YmE2M2Q1NjEy NzI3NWI3ODM1MDFhZmNhN2E1ZWQ0YTAwLi5hYjZlNWEwMGVhYmY4MTQ2OTkzMjY4NmQ4N2YzZTcx MjA4N2E4NjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudEVs ZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudEVsZW1lbnQuaApA QCAtNDcsMTMgKzQ3LDM1IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgYm9vbCBzaG91bGRJbmNs dWRlKE5vZGUqKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGF0dGFjaCgpOworICAgIHZpcnR1YWwg dm9pZCBkZXRhY2goKTsKKworICAgIE5vZGUqIGluY2x1c2lvbkF0KHNpemVfdCkgY29uc3Q7Cisg ICAgc2l6ZV90IGluY2x1c2lvbkNvdW50KCkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgdmlydHVh bCBib29sIGlzQ29udGVudEVsZW1lbnQoKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAgICAgdmly dHVhbCBib29sIHJlbmRlcmVySXNOZWVkZWQoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRleHQmKSB7 IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgUmVuZGVyT2JqZWN0KiBjcmVhdGVSZW5kZXJl cihSZW5kZXJBcmVuYSosIFJlbmRlclN0eWxlKikgeyByZXR1cm4gMDsgfQorCisgICAgVmVjdG9y PFJlZlB0cjxOb2RlPiA+IG1faW5jbHVzaW9uczsKIH07CiAKK2lubGluZSBOb2RlKiBTaGFkb3dD b250ZW50RWxlbWVudDo6aW5jbHVzaW9uQXQoc2l6ZV90IGluZGV4KSBjb25zdAoreworICAgIHJl dHVybiBtX2luY2x1c2lvbnMuYXQoaW5kZXgpLmdldCgpOworfQorCitpbmxpbmUgc2l6ZV90IFNo YWRvd0NvbnRlbnRFbGVtZW50OjppbmNsdXNpb25Db3VudCgpIGNvbnN0Cit7CisgICAgcmV0dXJu IG1faW5jbHVzaW9ucy5zaXplKCk7Cit9CisKK2lubGluZSBTaGFkb3dDb250ZW50RWxlbWVudCog dG9TaGFkb3dDb250ZW50RWxlbWVudChOb2RlKiBub2RlKQoreworICAgIEFTU0VSVCghbm9kZSB8 fCBub2RlLT5pc0NvbnRlbnRFbGVtZW50KCkpOworICAgIHJldHVybiBzdGF0aWNfY2FzdDxTaGFk b3dDb250ZW50RWxlbWVudCo+KG5vZGUpOworfQorCiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0NvbnRlbnRTZWxlY3Rvci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vU2hhZG93Q29udGVudFNlbGVjdG9yLmNwcAppbmRleCBhMmMzMmNmYjlkYWRjOTc0 MmU4ZmNjN2VkYzZkYjMyN2RmNzUwZWU2Li44MjNmMWU4MzViMDRkNjMyMGFjZTk1N2Y0NjgwZWZh N2EwODcxYTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudFNl bGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudFNlbGVjdG9y LmNwcApAQCAtNTEsMjIgKzUxLDM3IEBAIFNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6flNoYWRvd0Nv bnRlbnRTZWxlY3RvcigpCiAgICAgc19jdXJyZW50SW5zdGFuY2UgPSBtX3BhcmVudDsKIH0KIAot dm9pZCBTaGFkb3dDb250ZW50U2VsZWN0b3I6OmF0dGFjaENoaWxkcmVuRm9yKFNoYWRvd0NvbnRl bnRFbGVtZW50KiBjb250ZW50RWxlbWVudCkKK3ZvaWQgU2hhZG93Q29udGVudFNlbGVjdG9yOjpz ZWxlY3RJbmNsdXNpb24oVmVjdG9yPFJlZlB0cjxOb2RlPiA+JiBpbmNsdXNpb25zKQogewotICAg IG1fYWN0aXZlRWxlbWVudCA9IGNvbnRlbnRFbGVtZW50OworICAgIGluY2x1c2lvbnMuY2xlYXIo KTsKIAogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9jaGlsZHJlbi5zaXplKCk7ICsraSkg ewogICAgICAgICBOb2RlKiBjaGlsZCA9IG1fY2hpbGRyZW5baV0uZ2V0KCk7CiAgICAgICAgIGlm ICghY2hpbGQpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgaWYgKCFjb250ZW50RWxl bWVudC0+c2hvdWxkSW5jbHVkZShjaGlsZCkpCisgICAgICAgIGlmICghbV9hY3RpdmVFbGVtZW50 LT5zaG91bGRJbmNsdWRlKGNoaWxkKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAg IGNoaWxkLT5yZWF0dGFjaCgpOworICAgICAgICBpbmNsdXNpb25zLmFwcGVuZChjaGlsZCk7CiAg ICAgICAgIG1fY2hpbGRyZW5baV0gPSAwOwogICAgIH0KK30KKwordm9pZCBTaGFkb3dDb250ZW50 U2VsZWN0b3I6OndpbGxBdHRhY2hDb250ZW50Rm9yKFNoYWRvd0NvbnRlbnRFbGVtZW50KiBlbGVt ZW50KQoreworICAgIEFTU0VSVCghbV9hY3RpdmVFbGVtZW50KTsKKyAgICBtX2FjdGl2ZUVsZW1l bnQgPSBlbGVtZW50OworfQogCit2b2lkIFNoYWRvd0NvbnRlbnRTZWxlY3Rvcjo6ZGlkQXR0YWNo Q29udGVudCgpCit7CisgICAgQVNTRVJUKG1fYWN0aXZlRWxlbWVudCk7CiAgICAgbV9hY3RpdmVF bGVtZW50ID0gMDsKIH0KIAorRWxlbWVudCogU2hhZG93Q29udGVudFNlbGVjdG9yOjphY3RpdmVF bGVtZW50KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9hY3RpdmVFbGVtZW50OworfQorCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudFNlbGVjdG9yLmggYi9T b3VyY2UvV2ViQ29yZS9kb20vU2hhZG93Q29udGVudFNlbGVjdG9yLmgKaW5kZXggZjk3MWYzZDY3 NTMzNTg4MmM1MTJiMjgzYzQyNzdkZGNhNmJiYWU2ZS4uYjM3Y2I4NjJiZDEwMzgwODY1MzY2NjRm NzNjMmY4Zjc3OTRiYzE2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NoYWRvd0Nv bnRlbnRTZWxlY3Rvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TaGFkb3dDb250ZW50U2Vs ZWN0b3IuaApAQCAtNDcsMTYgKzQ3LDE5IEBAIHB1YmxpYzoKICAgICBleHBsaWNpdCBTaGFkb3dD b250ZW50U2VsZWN0b3IoU2hhZG93Um9vdCopOwogICAgIH5TaGFkb3dDb250ZW50U2VsZWN0b3Io KTsKIAotICAgIHZvaWQgYXR0YWNoQ2hpbGRyZW5Gb3IoU2hhZG93Q29udGVudEVsZW1lbnQqKTsK KyAgICB2b2lkIHdpbGxBdHRhY2hDb250ZW50Rm9yKFNoYWRvd0NvbnRlbnRFbGVtZW50Kik7Cisg ICAgdm9pZCBkaWRBdHRhY2hDb250ZW50KCk7CisgICAgdm9pZCBzZWxlY3RJbmNsdXNpb24oVmVj dG9yPFJlZlB0cjxOb2RlPiA+JiBpbmNsdXNpb25zKTsKKwogICAgIFNoYWRvd1Jvb3QqIHNoYWRv d1Jvb3QoKSBjb25zdCB7IHJldHVybiBtX3NoYWRvd1Jvb3Q7IH0KLSAgICBFbGVtZW50KiBhY3Rp dmVFbGVtZW50KCkgY29uc3QgeyByZXR1cm4gbV9hY3RpdmVFbGVtZW50OyB9CisgICAgRWxlbWVu dCogYWN0aXZlRWxlbWVudCgpIGNvbnN0OwogCiAgICAgc3RhdGljIFNoYWRvd0NvbnRlbnRTZWxl Y3RvciogY3VycmVudEluc3RhbmNlKCkgeyByZXR1cm4gc19jdXJyZW50SW5zdGFuY2U7IH0KIAog cHJpdmF0ZToKICAgICBTaGFkb3dDb250ZW50U2VsZWN0b3IqIG1fcGFyZW50OwogICAgIFNoYWRv d1Jvb3QqIG1fc2hhZG93Um9vdDsKLSAgICBFbGVtZW50KiBtX2FjdGl2ZUVsZW1lbnQ7CisgICAg U2hhZG93Q29udGVudEVsZW1lbnQqIG1fYWN0aXZlRWxlbWVudDsKICAgICBWZWN0b3I8UmVmUHRy PE5vZGU+ID4gbV9jaGlsZHJlbjsKIAogICAgIHN0YXRpYyBTaGFkb3dDb250ZW50U2VsZWN0b3Iq IHNfY3VycmVudEluc3RhbmNlOwo=