47565 2010-10-12 17:43:55 -0700 Paint the find overlay background 2010-10-12 18:06:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 293222 0 andersca 2010-10-12 17:43:55 -0700 Paint the find overlay background 293224 1 70577 andersca 2010-10-12 17:46:00 -0700 Created attachment 70577 Patch 293233 2 andersca 2010-10-12 18:06:06 -0700 Committed r69625: <http://trac.webkit.org/changeset/69625> 70577 2010-10-12 17:46:00 -0700 2010-10-12 18:01:28 -0700 Patch bug-47565-20101012174558.patch text/plain 9201 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NmE1OWFhZmVkODBjMWQxOTMxZWRiMjA5NjhlMGJhOWQyODgwYTk1MC4uNTg4YjlhNmEyNTBmNjZm YjJjYjJmMzEyMDQ4N2Y5ODNlOTZkZGU2MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0xMC0xMiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhaW50IHRoZSBmaW5kIG92ZXJsYXkgYmFja2dy b3VuZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc1 NjUKKworICAgICAgICBFeHBvcnQgc3ltYm9scyByZXF1aXJlZCBieSBXZWJLaXQyLgorCisgICAg ICAgICogV2ViQ29yZS5leHAuaW46CisKIDIwMTAtMTAtMTIgIEppYW4gTGkgIDxqaWFubGlAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXgg ZTM4MmExYmM0MGE0Mjk0ZTRkZGEyNDY4OWNjZmI1ZjM1NTI1MzQ4ZS4uOGIxNTk2ODJiYTM3YzI2 YWIxMGRlZmM5OGM4MDAzM2YwNjE5MGUyZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9XZWJDb3JlLmV4 cC5pbgorKysgYi9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0zNDYsOCArMzQ2LDEyIEBAIF9f Wk43V2ViQ29yZTE1Rm9jdXNDb250cm9sbGVyMTVzZXRGb2N1c2VkRnJhbWVFTjNXVEYxMFBhc3NS ZWZQdHJJTlNfNUZyYW1lRUVFCiBfX1pON1dlYkNvcmUxNUZvY3VzQ29udHJvbGxlcjE1c2V0SW5p dGlhbEZvY3VzRU5TXzE0Rm9jdXNEaXJlY3Rpb25FUE5TXzEzS2V5Ym9hcmRFdmVudEUKIF9fWk43 V2ViQ29yZTE1Rm9jdXNDb250cm9sbGVyOXNldEFjdGl2ZUViCiBfX1pON1dlYkNvcmUxNUdyYXBo aWNzQ29udGV4dDEyc2V0RmlsbENvbG9yRVJLTlNfNUNvbG9yRU5TXzEwQ29sb3JTcGFjZUUKK19f Wk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0MjBlbmRUcmFuc3BhcmVuY3lMYXllckV2CitfX1pO N1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dDIxc2V0Q29tcG9zaXRlT3BlcmF0aW9uRU5TXzE3Q29t cG9zaXRlT3BlcmF0b3JFCitfX1pON1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dDIyYmVnaW5UcmFu c3BhcmVuY3lMYXllckVmCiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dDRjbGlwRVJLTlNf OUZsb2F0UmVjdEUKIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0NHNhdmVFdgorX19aTjdX ZWJDb3JlMTVHcmFwaGljc0NvbnRleHQ4ZmlsbFJlY3RFUktOU185RmxvYXRSZWN0RVJLTlNfNUNv bG9yRU5TXzEwQ29sb3JTcGFjZUUKIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0N3Jlc3Rv cmVFdgogX19aTjdXZWJDb3JlMTVHcmFwaGljc0NvbnRleHQ5dHJhbnNsYXRlRWZmCiBfX1pON1dl YkNvcmUxNUdyYXBoaWNzQ29udGV4dEMxRVA5Q0dDb250ZXh0CkBAIC0xMDU4LDYgKzEwNjIsNyBA QCBfX1pOSzdXZWJDb3JlNldpZGdldDIzY29udmVydFRvQ29udGFpbmluZ1ZpZXdFUktOU184SW50 UG9pbnRFCiBfX1pOSzdXZWJDb3JlNldpZGdldDI1Y29udmVydEZyb21Db250YWluaW5nVmlld0VS S05TXzdJbnRSZWN0RQogX19aTks3V2ViQ29yZTZXaWRnZXQyNWNvbnZlcnRGcm9tQ29udGFpbmlu Z1ZpZXdFUktOU184SW50UG9pbnRFCiBfX1pOSzdXZWJDb3JlNldpZGdldDI1Y29udmVydFRvQ29u dGFpbmluZ1dpbmRvd0VSS05TXzdJbnRSZWN0RQorX19aTks3V2ViQ29yZTZXaWRnZXQyNWNvbnZl cnRUb0NvbnRhaW5pbmdXaW5kb3dFUktOU184SW50UG9pbnRFCiBfX1pOSzdXZWJDb3JlNldpZGdl dDlmcmFtZVJlY3RFdgogX19aTks3V2ViQ29yZTdFbGVtZW50MTJnZXRBdHRyaWJ1dGVFUktOU18x M1F1YWxpZmllZE5hbWVFCiBfX1pOSzdXZWJDb3JlN0VsZW1lbnQ5aW5uZXJUZXh0RXYKZGlmZiAt LWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYmY5YjU3 ZWE0ZWEyMThjZThmNDUxM2NjMzhjMDE5MTA3MzgzNzU2OC4uYTQwZGVkYTAwYTJiZGZmZjc0M2Rj OGMxZDZmYWRhOTVmMzJlOGM1ZCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAxMC0xMC0xMiAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFBhaW50IHRoZSBmaW5kIG92ZXJsYXkgYmFja2dyb3VuZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDc1NjUKKwor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAg IChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKToKKyAgICAgICAgRG9uJ3Qgc2hv dyB0aGUgb3ZlcmxheSBpZiB3ZSBoYXZlIHRvbyBtYW55IG1hdGNoZXMuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvRmluZFBhZ2VPdmVybGF5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 RmluZFBhZ2VPdmVybGF5OjpyZWN0c0ZvclRleHRNYXRjaGVzKToKKyAgICAgICAgR2V0IHRoZSBy ZWN0cyBmb3IgYWxsIHRleHQgbWF0Y2hlcy4KKworICAgICAgICAoV2ViS2l0OjpGaW5kUGFnZU92 ZXJsYXk6OmRyYXdSZWN0KToKKyAgICAgICAgQXNzZXJ0IHRoYXQgd2UncmUgb25seSBiZWluZyBj YWxsZWQgaWYgdGhlcmUgYXJlIGFueSB0ZXh0IG1hdGNoZXMuCisgICAgICAgIFBhaW50IHRoZSBi YWNrZ3JvdW5kLgorCisyMDEwLTEwLTEyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KIAogICAgICAgICBTdGFy dCBmbGVzaGluZyBvdXQgZmluZCBwYWdlIG92ZXJsYXlzCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKaW5kZXggY2ZjYzA0NDVlMTA5ZmNjODM3ZmU3YTg0 ZTJmOTcxMTMwZGEzMmM3Yy4uZmE4ZmViOTNkNDIzMjI2OTkzMjBmMTk2NTQzZGUxODZhNmU2NWRl OSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIu Y3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcApA QCAtNTIsNyArNTIsOCBAQCBzdGF0aWMgRnJhbWUqIGZyYW1lV2l0aFNlbGVjdGlvbihQYWdlKiBw YWdlKQogCiB2b2lkIEZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYgc3Ry aW5nLCBGaW5kRGlyZWN0aW9uIGZpbmREaXJlY3Rpb24sIEZpbmRPcHRpb25zIGZpbmRPcHRpb25z LCB1bnNpZ25lZCBtYXhOdW1NYXRjaGVzKQogewotICAgIGJvb2wgZm91bmQgPSBtX3dlYlBhZ2Ut PmNvcmVQYWdlKCktPmZpbmRTdHJpbmcoc3RyaW5nLCAoZmluZE9wdGlvbnMgJiBGaW5kT3B0aW9u c0Nhc2VJbnNlbnNpdGl2ZSkgPyBUZXh0Q2FzZUluc2Vuc2l0aXZlIDogVGV4dENhc2VTZW5zaXRp dmUsCisgICAgVGV4dENhc2VTZW5zaXRpdml0eSBjYXNlU2Vuc2l0aXZpdHkgPSBmaW5kT3B0aW9u cyAmIEZpbmRPcHRpb25zQ2FzZUluc2Vuc2l0aXZlID8gVGV4dENhc2VJbnNlbnNpdGl2ZSA6IFRl eHRDYXNlU2Vuc2l0aXZlOworICAgIGJvb2wgZm91bmQgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCkt PmZpbmRTdHJpbmcoc3RyaW5nLCBjYXNlU2Vuc2l0aXZpdHksCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmaW5kRGlyZWN0aW9uID09IEZpbmREaXJl Y3Rpb25Gb3J3YXJkID8gV2ViQ29yZTo6RmluZERpcmVjdGlvbkZvcndhcmQgOiBXZWJDb3JlOjpG aW5kRGlyZWN0aW9uQmFja3dhcmQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBmaW5kT3B0aW9ucyAmIEZpbmRPcHRpb25zV3JhcEFyb3VuZCk7CiAK QEAgLTY4LDEyICs2OSwxOSBAQCB2b2lkIEZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKGNvbnN0 IFN0cmluZyYgc3RyaW5nLCBGaW5kRGlyZWN0aW9uIGZpbmREaXJlY3RpbwogICAgICAgICBpZiAo c2VsZWN0ZWRGcmFtZSkKICAgICAgICAgICAgIHNlbGVjdGVkRnJhbWUtPnNlbGVjdGlvbigpLT5j bGVhcigpOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIHNob3cg dGhlIGZpbmQgaW5kaWNhdG9yIGhlcmUuCi0KICAgICAgICAgc2hvdWxkU2hvd092ZXJsYXkgPSBm aW5kT3B0aW9ucyAmIEZpbmRPcHRpb25zU2hvd092ZXJsYXk7CisKKyAgICAgICAgaWYgKHNob3Vs ZFNob3dPdmVybGF5KSB7CisgICAgICAgICAgICB1bnNpZ25lZCBudW1NYXRjaGVzID0gbV93ZWJQ YWdlLT5jb3JlUGFnZSgpLT5tYXJrQWxsTWF0Y2hlc0ZvclRleHQoc3RyaW5nLCBjYXNlU2Vuc2l0 aXZpdHksIGZhbHNlLCBtYXhOdW1NYXRjaGVzKTsKKworICAgICAgICAgICAgLy8gQ2hlY2sgaWYg d2UgaGF2ZSBtb3JlIG1hdGNoZXMgdGhhbiBhbGxvd2VkLgorICAgICAgICAgICAgaWYgKG51bU1h dGNoZXMgPiBtYXhOdW1NYXRjaGVzKQorICAgICAgICAgICAgICAgIHNob3VsZFNob3dPdmVybGF5 ID0gZmFsc2U7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoIXNob3VsZFNob3dPdmVybGF5 KSB7CisKICAgICAgICAgaWYgKG1fZmluZFBhZ2VPdmVybGF5KSB7CiAgICAgICAgICAgICAvLyBH ZXQgcmlkIG9mIHRoZSBvdmVybGF5LgogICAgICAgICAgICAgbV93ZWJQYWdlLT51bmluc3RhbGxQ YWdlT3ZlcmxheSgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmlu ZFBhZ2VPdmVybGF5LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRQYWdlT3Zl cmxheS5jcHAKaW5kZXggZjY5NDhkZDk2MWI0MTQ5OWI3YjBlM2YxZjU2YTQ2ODMwOTNkMDQyNC4u YTVjNTcwNWU2N2EwZDliZDkzNWFiZDJiMmI3NDI0MTU0YzBiYzEyMiAxMDA2NDQKLS0tIGEvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZFBhZ2VPdmVybGF5LmNwcAorKysgYi9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kUGFnZU92ZXJsYXkuY3BwCkBAIC0yNiw3ICsyNiwxMSBA QAogI2luY2x1ZGUgIkZpbmRQYWdlT3ZlcmxheS5oIgogCiAjaW5jbHVkZSAiRmluZENvbnRyb2xs ZXIuaCIKKyNpbmNsdWRlICJXZWJQYWdlLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPgor I2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVWaWV3Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9HcmFwaGlj c0NvbnRleHQuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KIAogdXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CiAKQEAgLTQ3LDEwICs1MSw2NyBAQCBGaW5kUGFnZU92ZXJsYXk6On5GaW5kUGFn ZU92ZXJsYXkoKQogICAgIG1fZmluZENvbnRyb2xsZXItPmZpbmRQYWdlT3ZlcmxheURlc3Ryb3ll ZCgpOwogfQogCi12b2lkIEZpbmRQYWdlT3ZlcmxheTo6ZHJhd1JlY3QoR3JhcGhpY3NDb250ZXh0 JiBncmFwaGljc0NvbnRleHQsIGNvbnN0IEludFJlY3QmIGRpcnR5UmVjdCkKK1ZlY3RvcjxJbnRS ZWN0PiBGaW5kUGFnZU92ZXJsYXk6OnJlY3RzRm9yVGV4dE1hdGNoZXMoKQoreworICAgIFZlY3Rv cjxJbnRSZWN0PiByZWN0czsKKworICAgIGZvciAoRnJhbWUqIGZyYW1lID0gd2ViUGFnZSgpLT5j b3JlUGFnZSgpLT5tYWluRnJhbWUoKTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJh dmVyc2VOZXh0KCkpIHsKKyAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gZnJhbWUtPmRvY3Vt ZW50KCk7CisgICAgICAgIGlmICghZG9jdW1lbnQpCisgICAgICAgICAgICBjb250aW51ZTsKKwor ICAgICAgICBJbnRSZWN0IHZpc2libGVSZWN0ID0gZnJhbWUtPnZpZXcoKS0+dmlzaWJsZUNvbnRl bnRSZWN0KCk7CisgICAgICAgIFZlY3RvcjxJbnRSZWN0PiBmcmFtZVJlY3RzID0gZG9jdW1lbnQt Pm1hcmtlcnMoKS0+cmVuZGVyZWRSZWN0c0Zvck1hcmtlcnMoRG9jdW1lbnRNYXJrZXI6OlRleHRN YXRjaCk7CisgICAgICAgIEludFBvaW50IGZyYW1lT2Zmc2V0KC1mcmFtZS0+dmlldygpLT5zY3Jv bGxPZmZzZXQoKS53aWR0aCgpLCAtZnJhbWUtPnZpZXcoKS0+c2Nyb2xsT2Zmc2V0KCkuaGVpZ2h0 KCkpOworICAgICAgICBmcmFtZU9mZnNldCA9IGZyYW1lLT52aWV3KCktPmNvbnZlcnRUb0NvbnRh aW5pbmdXaW5kb3coZnJhbWVPZmZzZXQpOworCisgICAgICAgIGZvciAoVmVjdG9yPEludFJlY3Q+ OjppdGVyYXRvciBpdCA9IGZyYW1lUmVjdHMuYmVnaW4oKSwgZW5kID0gZnJhbWVSZWN0cy5lbmQo KTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgICAgICBpdC0+aW50ZXJzZWN0KHZpc2libGVS ZWN0KTsKKyAgICAgICAgICAgIGl0LT5tb3ZlKGZyYW1lT2Zmc2V0LngoKSwgZnJhbWVPZmZzZXQu eSgpKTsKKyAgICAgICAgICAgIHJlY3RzLmFwcGVuZCgqaXQpOworICAgICAgICB9CisgICAgfQor CisgICAgcmV0dXJuIHJlY3RzOworfQorCitzdGF0aWMgY29uc3QgaW50IG92ZXJsYXlCYWNrZ3Jv dW5kUmVkID0gMjU7CitzdGF0aWMgY29uc3QgaW50IG92ZXJsYXlCYWNrZ3JvdW5kR3JlZW4gPSAy NTsKK3N0YXRpYyBjb25zdCBpbnQgb3ZlcmxheUJhY2tncm91bmRCbHVlID0gMjU7CitzdGF0aWMg Y29uc3QgaW50IG92ZXJsYXlCYWNrZ3JvdW5kQWxwaGEgPSA2MzsKKyAgICAKK3N0YXRpYyBDb2xv ciBvdmVybGF5QmFja2dyb3VuZENvbG9yKCkKIHsKLSAgICAvLyBGSVhNRTogRHJhdyBzb21ldGhp bmcuCisgICAgcmV0dXJuIENvbG9yKG92ZXJsYXlCYWNrZ3JvdW5kUmVkLCBvdmVybGF5QmFja2dy b3VuZEdyZWVuLCBvdmVybGF5QmFja2dyb3VuZEJsdWUsIG92ZXJsYXlCYWNrZ3JvdW5kQWxwaGEp OwogfQorICAgIAordm9pZCBGaW5kUGFnZU92ZXJsYXk6OmRyYXdSZWN0KEdyYXBoaWNzQ29udGV4 dCYgZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCit7CisgICAgVmVj dG9yPEludFJlY3Q+IHJlY3RzID0gcmVjdHNGb3JUZXh0TWF0Y2hlcygpOworICAgIEFTU0VSVCgh cmVjdHMuaXNFbXB0eSgpKTsKKworICAgIEZyYW1lVmlldyogZnJhbWVWaWV3ID0gd2ViUGFnZSgp LT5jb3JlUGFnZSgpLT5tYWluRnJhbWUoKS0+dmlldygpOworCisgICAgaW50IHdpZHRoID0gZnJh bWVWaWV3LT53aWR0aCgpOworICAgIGlmIChmcmFtZVZpZXctPnZlcnRpY2FsU2Nyb2xsYmFyKCkp CisgICAgICAgIHdpZHRoIC09IGZyYW1lVmlldy0+dmVydGljYWxTY3JvbGxiYXIoKS0+d2lkdGgo KTsKKyAgICBpbnQgaGVpZ2h0ID0gZnJhbWVWaWV3LT5oZWlnaHQoKTsKKyAgICBpZiAoZnJhbWVW aWV3LT5ob3Jpem9udGFsU2Nyb2xsYmFyKCkpCisgICAgICAgIGhlaWdodCAtPSBmcmFtZVZpZXct Pmhvcml6b250YWxTY3JvbGxiYXIoKS0+aGVpZ2h0KCk7CisgICAgCisgICAgSW50UmVjdCBwYWlu dFJlY3QgPSBpbnRlcnNlY3Rpb24oZGlydHlSZWN0LCBJbnRSZWN0KDAsIDAsIHdpZHRoLCBoZWln aHQpKTsKKyAgICBpZiAocGFpbnRSZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOwogCisg ICAgZ3JhcGhpY3NDb250ZXh0LmJlZ2luVHJhbnNwYXJlbmN5TGF5ZXIoMSk7CisgICAgZ3JhcGhp Y3NDb250ZXh0LnNldENvbXBvc2l0ZU9wZXJhdGlvbihDb21wb3NpdGVDb3B5KTsKKworICAgIC8v IERyYXcgdGhlIGJhY2tncm91bmQuCisgICAgZ3JhcGhpY3NDb250ZXh0LmZpbGxSZWN0KHBhaW50 UmVjdCwgb3ZlcmxheUJhY2tncm91bmRDb2xvcigpLCBzUkdCQ29sb3JTcGFjZSk7CisKKyAgICAv LyBGSVhNRTogRHJhdyB0aGUgaG9sZXMuCisKKyAgICBncmFwaGljc0NvbnRleHQuZW5kVHJhbnNw YXJlbmN5TGF5ZXIoKTsKK30KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kUGFnZU92ZXJsYXkuaCBiL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL0ZpbmRQYWdlT3ZlcmxheS5oCmluZGV4IDVjOTliZTM2M2ExNWU1NDFk YzQxNDQxZWY4OTIxMWVlOTViNzQ5OTQuLmY1YmU4NjRlMDRmMTExOTE0OGFmZDJiMjM2ZWNiODAx NDViZGZmMjIgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRQYWdl T3ZlcmxheS5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRQYWdlT3Zlcmxh eS5oCkBAIC0yOCw2ICsyOCw3IEBACiAKICNpbmNsdWRlICJQYWdlT3ZlcmxheS5oIgogI2luY2x1 ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIApAQCAtNDEsNiArNDIsOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4 cGxpY2l0IEZpbmRQYWdlT3ZlcmxheShGaW5kQ29udHJvbGxlciopOwogCisgICAgVmVjdG9yPFdl YkNvcmU6OkludFJlY3Q+IHJlY3RzRm9yVGV4dE1hdGNoZXMoKTsKKwogICAgIC8vIFBhZ2VPdmVy bGF5LgogICAgIHZpcnR1YWwgdm9pZCBkcmF3UmVjdChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQm LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBkaXJ0eVJlY3QpOwogCmRpZmYgLS1naXQgYS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvUGFnZU92ZXJsYXkuaAppbmRleCA2OWM0NzgzNzJiZjM1ODZiZDhmOTMzMWJlOTll YmMzZjNhYTU2NTIwLi45ODQ0YzNhOWYzMDIxYzYwM2M0YjMyMWRlNGYyMTJmYTUyY2EwMDViIDEw MDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5oCisrKyBi L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmgKQEAgLTUwLDYgKzUwLDgg QEAgcHVibGljOgogcHJvdGVjdGVkOgogICAgIFBhZ2VPdmVybGF5KCk7CiAKKyAgICBXZWJQYWdl KiB3ZWJQYWdlKCkgY29uc3QgeyByZXR1cm4gbV93ZWJQYWdlOyB9CisKIHByaXZhdGU6CiAgICAg V2ViUGFnZSogbV93ZWJQYWdlOwogfTsK