47612 2010-10-13 12:24:26 -0700 Send over find indicator information to the UI process 2010-10-13 13:18:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit-ews oldest_to_newest 293595 0 andersca 2010-10-13 12:24:26 -0700 Send over find indicator information to the UI process 293623 1 70647 andersca 2010-10-13 12:28:12 -0700 Created attachment 70647 Patch 293631 2 webkit-ews 2010-10-13 12:41:18 -0700 Attachment 70647 did not build on qt: Build output: http://queues.webkit.org/results/4403010 293654 3 70650 andersca 2010-10-13 13:07:58 -0700 Created attachment 70650 Patch 293667 4 andersca 2010-10-13 13:18:45 -0700 Committed r69689: <http://trac.webkit.org/changeset/69689> 70647 2010-10-13 12:28:12 -0700 2010-10-13 13:07:55 -0700 Patch bug-47612-20101013122811.patch text/plain 11314 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yjg5MGI2YTc4NGU0NWRiZTQyNGZiZWY4NzRkNmUxMGU2YjJkOTgyNC4uMWRhOWY0ZGU0YzIxZDU0 YWJlOGRjYTNjODdjMzU3MDhhN2FlOTgzNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0xMC0xMyAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlbmQgb3ZlciBmaW5kIGluZGljYXRvciBpbmZv cm1hdGlvbiB0byB0aGUgVUkgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDc2MTIKKworICAgICAgICBFeHBvcnQgc3ltYm9scyBuZWVkZWQg YnkgV2ViS2l0Mi4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorCiAyMDEwLTEwLTEzICBT dGV2ZSBCbG9jayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk IGZpeApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbiBiL1dlYkNvcmUvV2ViQ29y ZS5leHAuaW4KaW5kZXggOGIxNTk2ODJiYTM3YzI2YWIxMGRlZmM5OGM4MDAzM2YwNjE5MGUyZS4u MjlmMjI0YTAyZmEyOWI4NDNiMmYwZWVlYTk2OGNhYmE4YWYxY2MyMyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0zNTEs OCArMzUxLDggQEAgX19aTjdXZWJDb3JlMTVHcmFwaGljc0NvbnRleHQyMXNldENvbXBvc2l0ZU9w ZXJhdGlvbkVOU18xN0NvbXBvc2l0ZU9wZXJhdG9yRQogX19aTjdXZWJDb3JlMTVHcmFwaGljc0Nv bnRleHQyMmJlZ2luVHJhbnNwYXJlbmN5TGF5ZXJFZgogX19aTjdXZWJDb3JlMTVHcmFwaGljc0Nv bnRleHQ0Y2xpcEVSS05TXzlGbG9hdFJlY3RFCiBfX1pON1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4 dDRzYXZlRXYKLV9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0OGZpbGxSZWN0RVJLTlNfOUZs b2F0UmVjdEVSS05TXzVDb2xvckVOU18xMENvbG9yU3BhY2VFCiBfX1pON1dlYkNvcmUxNUdyYXBo aWNzQ29udGV4dDdyZXN0b3JlRXYKK19fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0OGZpbGxS ZWN0RVJLTlNfOUZsb2F0UmVjdEVSS05TXzVDb2xvckVOU18xMENvbG9yU3BhY2VFCiBfX1pON1dl YkNvcmUxNUdyYXBoaWNzQ29udGV4dDl0cmFuc2xhdGVFZmYKIF9fWk43V2ViQ29yZTE1R3JhcGhp Y3NDb250ZXh0QzFFUDlDR0NvbnRleHQKIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0RDFF dgpAQCAtNDA3LDYgKzQwNyw3IEBAIF9fWk43V2ViQ29yZTE2Y29sb3JGcm9tTlNDb2xvckVQN05T Q29sb3IKIF9fWk43V2ViQ29yZTE2Y3JlYXRlRnVsbE1hcmt1cEVQS05TXzROb2RlRQogX19aTjdX ZWJDb3JlMTZjcmVhdGVGdWxsTWFya3VwRVBLTlNfNVJhbmdlRQogX19aTjdXZWJDb3JlMTZlbmNs b3NpbmdJbnRSZWN0RVJLN19OU1JlY3QKK19fWk43V2ViQ29yZTE2ZW5jbG9zaW5nSW50UmVjdEVS S05TXzlGbG9hdFJlY3RFCiBfX1pON1dlYkNvcmUxNmlzRW5kT2ZQYXJhZ3JhcGhFUktOU18xNVZp c2libGVQb3NpdGlvbkUKIF9fWk43V2ViQ29yZTE2anNTdHJpbmdTbG93Q2FzZUVQTjNKU0M5RXhl Y1N0YXRlRVJOUzBfOVdlYWtHQ01hcElQTjNXVEYxMFN0cmluZ0ltcGxFUE5TMF84SlNTdHJpbmdF RUVTNl8KIF9fWk43V2ViQ29yZTE3Q3JlZGVudGlhbFN0b3JhZ2UzZ2V0RVJLTlNfMTVQcm90ZWN0 aW9uU3BhY2VFCkBAIC01NDksOSArNTUwLDkgQEAgX19aTjdXZWJDb3JlNDZjb250ZXh0TWVudUl0 ZW1UYWdDb3JyZWN0U3BlbGxpbmdBdXRvbWF0aWNhbGx5RXYKIF9fWk43V2ViQ29yZTRGb250MTFz ZXRDb2RlUGF0aEVOUzBfOENvZGVQYXRoRQogX19aTjdXZWJDb3JlNEZvbnQxOHNob3VsZFVzZVNt b290aGluZ0V2CiBfX1pON1dlYkNvcmU0Rm9udDIxc2V0U2hvdWxkVXNlU21vb3RoaW5nRWIKLV9f Wk43V2ViQ29yZTRGb250YVNFUktTMF8KIF9fWk43V2ViQ29yZTRGb250QzFFUktOU18xNkZvbnRQ bGF0Zm9ybURhdGFFYk5TXzE3Rm9udFNtb290aGluZ01vZGVFCiBfX1pON1dlYkNvcmU0Rm9udEMx RXYKK19fWk43V2ViQ29yZTRGb250YVNFUktTMF8KIF9fWk43V2ViQ29yZTRJY29uMThjcmVhdGVJ Y29uRm9yRmlsZXNFUktOM1dURjZWZWN0b3JJTlMxXzZTdHJpbmdFTG0wRUVFCiBfX1pON1dlYkNv cmU0SWNvbkQxRXYKIF9fWk43V2ViQ29yZTRLVVJMMTBpbnZhbGlkYXRlRXYKQEAgLTY4Niw2ICs2 ODcsNyBAQCBfX1pON1dlYkNvcmU3SW50U2l6ZUMxRVJLN19OU1NpemUKIF9fWk43V2ViQ29yZTdj b29raWVzRVBLTlNfOERvY3VtZW50RVJLTlNfNEtVUkxFCiBfX1pON1dlYkNvcmU3bnNDb2xvckVS S05TXzVDb2xvckUKIF9fWk43V2ViQ29yZThEb2N1bWVudDExY3JlYXRlUmFuZ2VFdgorX19aTjdX ZWJDb3JlOERvY3VtZW50MTJ1cGRhdGVMYXlvdXRFdgogX19aTjdXZWJDb3JlOERvY3VtZW50MTNz dmdFeHRlbnNpb25zRXYKIF9fWk43V2ViQ29yZThEb2N1bWVudDE0c2V0Rm9jdXNlZE5vZGVFTjNX VEYxMFBhc3NSZWZQdHJJTlNfNE5vZGVFRUUKIF9fWk43V2ViQ29yZThEb2N1bWVudDE2aXNQYWdl Qm94VmlzaWJsZUVpCmRpZmYgLS1naXQgYS9XZWJLaXQyL0NoYW5nZUxvZyBiL1dlYktpdDIvQ2hh bmdlTG9nCmluZGV4IGRiMTgzZGUwMzA1ZDkwNTRmM2ZlOWI1ZTlmNmI2N2JiYmRkYTEzYjkuLjQw MGVkMDE5MzA5MzU3OWMyMmMxOGRmYWU1OGNlN2UzZmVjNTQ5MDYgMTAwNjQ0Ci0tLSBhL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzMgQEAKIDIw MTAtMTAtMTMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAorICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZW5kIG92ZXIgZmluZCBp bmRpY2F0b3IgaW5mb3JtYXRpb24gdG8gdGhlIFVJIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ3NjEyCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZXRG aW5kSW5kaWNhdG9yKToKKyAgICAgICAgQWRkIHN0dWIuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICBBZGQgU2V0RmluZEluZGljYXRvci4K KworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6OkZpbmRDb250cm9sbGVyOjpGaW5kQ29udHJvbGxlcik6CisgICAgICAgIElu aXRpYWxpemUgbV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9yLgorCisgICAgICAgIChXZWJLaXQ6OkZp bmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKToKKyAgICAgICAgVXBkYXRlIHRoZSBmaW5kIGluZGlj YXRvciBpZiBuZWVkZWQuCisKKyAgICAgICAgKFdlYktpdDo6RmluZENvbnRyb2xsZXI6OnVwZGF0 ZUZpbmRJbmRpY2F0b3IpOgorICAgICAgICBDb21wdXRlIGZpbmQgaW5kaWNhdG9yIGluZm9ybWF0 aW9uLCBwYWludCB0aGUgZmluZCBpbmRpY2F0b3IgdGV4dCBpbnRvIGEgCisgICAgICAgIGJhY2tp bmcgc3RvcmUgYW5kIHNlbmQgaXQgb3Zlci4KKworICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJv bGxlcjo6cmVzZXRGaW5kSW5kaWNhdG9yKToKKyAgICAgICAgU2VuZCBhIFNldEZpbmRJbmRpY2F0 b3IgbWVzc2FnZSB3aXRoIGEgbnVsbCBiYWNraW5nIHN0b3JlLgorCisyMDEwLTEwLTEzICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkg U2FtIFdlaW5pZy4KIAogICAgICAgICBBbGxvdyBhbGwgc2lnbmFscyB0byBiZSBkZWxpdmVyZWQg dG8gdGhlIHdlYiBwcm9jZXNzCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBmNWUy ZmE5YWQ5YmNhY2I5ZWI4YjRmYWU4ZTY3OGQ0NGRkOTQxZTQ5Li41ODE5ZTA5OTYyMTg4NzQwODY3 NjNjOTY2YjkzYjQwZTJkMDg0NWJhIDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAg LTk1Niw2ICs5NTYsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZENvdW50U3RyaW5nTWF0Y2hl cyhjb25zdCBTdHJpbmcmIHN0cmluZywgdWludDMyX3QgbnVtTWF0Y2gKICAgICBtX2ZpbmRDbGll bnQuZGlkQ291bnRTdHJpbmdNYXRjaGVzKHRoaXMsIHN0cmluZywgbnVtTWF0Y2hlcyk7CiB9CiAK K3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRGaW5kSW5kaWNhdG9yKGNvbnN0IEZsb2F0UmVjdCYgc2Vs ZWN0aW9uUmVjdCwgY29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mIHRleHRSZWN0cywgY29uc3QgU2hh cmVkTWVtb3J5OjpIYW5kbGUmIGNvbnRlbnRJbWFnZUhhbmRsZSkKK3sKKyAgICAvLyBGSVhNRTog SW1wbGVtZW50LgorfQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6cmVnaXN0ZXJFZGl0Q29tbWFuZChQ YXNzUmVmUHRyPFdlYkVkaXRDb21tYW5kUHJveHk+IGNvbW1hbmRQcm94eSwgVW5kb09yUmVkbyB1 bmRvT3JSZWRvKQogewogICAgIG1fcGFnZUNsaWVudC0+cmVnaXN0ZXJFZGl0Q29tbWFuZChjb21t YW5kUHJveHksIHVuZG9PclJlZG8pOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA1MWQ4 NjcxYzZhNjcyOGQ3YmM5ZjljZjY0ZGZjNjM4ZjQwMTUxZGU4Li41YTUzNzhmMWYzYzAxNmIzOWMz MzljZGY0ODYxYTAyZTRjMTRkYmQ5IDEwMDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuaAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMzAs NiArMzAsNyBAQAogI2luY2x1ZGUgIkRyYXdpbmdBcmVhUHJveHkuaCIKICNpbmNsdWRlICJGaW5k T3B0aW9ucy5oIgogI2luY2x1ZGUgIkdlbmVyaWNDYWxsYmFjay5oIgorI2luY2x1ZGUgIlNoYXJl ZE1lbW9yeS5oIgogI2luY2x1ZGUgIldLQmFzZS5oIgogI2luY2x1ZGUgIldlYkV2ZW50LmgiCiAj aW5jbHVkZSAiV2ViRmluZENsaWVudC5oIgpAQCAtMjgxLDYgKzI4Miw3IEBAIHByaXZhdGU6CiAK ICAgICAvLyBGaW5kLgogICAgIHZvaWQgZGlkQ291bnRTdHJpbmdNYXRjaGVzKGNvbnN0IFN0cmlu ZyYsIHVpbnQzMl90IG51bU1hdGNoZXMpOworICAgIHZvaWQgc2V0RmluZEluZGljYXRvcihjb25z dCBXZWJDb3JlOjpGbG9hdFJlY3QmIHNlbGVjdGlvblJlY3QsIGNvbnN0IFZlY3RvcjxXZWJDb3Jl OjpGbG9hdFJlY3Q+JiB0ZXh0UmVjdHMsIGNvbnN0IFNoYXJlZE1lbW9yeTo6SGFuZGxlJiBjb250 ZW50SW1hZ2VIYW5kbGUpOwogCiAgICAgdm9pZCB0YWtlRm9jdXMoYm9vbCBkaXJlY3Rpb24pOwog ICAgIHZvaWQgc2V0VG9vbFRpcChjb25zdCBTdHJpbmcmKTsKZGlmZiAtLWdpdCBhL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbiBiL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5tZXNzYWdlcy5pbgppbmRleCBiMDE1NjBhNmNjM2NiNWYwZmY3YzZmN2QyYzc1 OTRjZDc5ZGEzYjZiLi4wMjhmYjhhMjM1Yzg1ODEwMjMzZjU4MTdlNGYwNDMyNWQ4NDA0MTA4IDEw MDY0NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KKysr IGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC05Myw2ICs5 Myw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAKICAgICAjIEZpbmQuCiAgICAgRGlk Q291bnRTdHJpbmdNYXRjaGVzKFdURjo6U3RyaW5nIHN0cmluZywgdWludDMyX3QgbnVtTWF0Y2hl cykKKyAgICBTZXRGaW5kSW5kaWNhdG9yKFdlYkNvcmU6OkZsb2F0UmVjdCBzZWxlY3Rpb25SZWN0 LCBWZWN0b3I8V2ViQ29yZTo6RmxvYXRSZWN0PiB0ZXh0UmVjdHMsIFdlYktpdDo6U2hhcmVkTWVt b3J5OjpIYW5kbGUgY29udGVudEltYWdlSGFuZGxlKQogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NP TVBPU0lUSU5HKQogICAgICMgQWNjZWxlcmF0ZWQgY29tcHNpdGluZyBtZXNzYWdlcy4KZGlmZiAt LWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcCBiL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAppbmRleCAyYzAyNzJj MzIwYjQzZmM1MDJjNmUyMzE4OTk5MjIxNmY5NDRkZjg5Li5mMjMwMDIzMGMyZTJjZGE4NzMyMTQy YWNkMjk3ZDEwNTM1MzUzYjNkIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9GaW5kQ29udHJvbGxlci5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmlu ZENvbnRyb2xsZXIuY3BwCkBAIC0yNSw5ICsyNSwxNCBAQAogCiAjaW5jbHVkZSAiRmluZENvbnRy b2xsZXIuaCIKIAorI2luY2x1ZGUgIkJhY2tpbmdTdG9yZS5oIgogI2luY2x1ZGUgIkZpbmRQYWdl T3ZlcmxheS5oIgogI2luY2x1ZGUgIldlYlBhZ2UuaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJveHlN ZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3MuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0Zy YW1lLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZVZpZXcuaD4KKyNpbmNsdWRlIDxXZWJDb3Jl L0dyYXBoaWNzQ29udGV4dC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgogCiB1c2luZyBu YW1lc3BhY2UgV2ViQ29yZTsKQEAgLTM3LDYgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBG aW5kQ29udHJvbGxlcjo6RmluZENvbnRyb2xsZXIoV2ViUGFnZSogd2ViUGFnZSkKICAgICA6IG1f d2ViUGFnZSh3ZWJQYWdlKQogICAgICwgbV9maW5kUGFnZU92ZXJsYXkoMCkKKyAgICAsIG1faXNT aG93aW5nRmluZEluZGljYXRvcihmYWxzZSkKIHsKIH0KIApAQCAtNjgsNiArNzQsOCBAQCB2b2lk IEZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBGaW5kRGly ZWN0aW9uIGZpbmREaXJlY3RpbwogICAgICAgICAvLyBBbmQgY2xlYXIgdGhlIHNlbGVjdGlvbi4K ICAgICAgICAgaWYgKHNlbGVjdGVkRnJhbWUpCiAgICAgICAgICAgICBzZWxlY3RlZEZyYW1lLT5z ZWxlY3Rpb24oKS0+Y2xlYXIoKTsKKworICAgICAgICByZXNldEZpbmRJbmRpY2F0b3IoKTsKICAg ICB9IGVsc2UgewogICAgICAgICBzaG91bGRTaG93T3ZlcmxheSA9IGZpbmRPcHRpb25zICYgRmlu ZE9wdGlvbnNTaG93T3ZlcmxheTsKIApAQCAtNzgsNiArODYsMTEgQEAgdm9pZCBGaW5kQ29udHJv bGxlcjo6ZmluZFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZywgRmluZERpcmVjdGlvbiBmaW5k RGlyZWN0aW8KICAgICAgICAgICAgIGlmIChudW1NYXRjaGVzID4gbWF4TnVtTWF0Y2hlcykKICAg ICAgICAgICAgICAgICBzaG91bGRTaG93T3ZlcmxheSA9IGZhbHNlOwogICAgICAgICB9CisKKyAg ICAgICAgaWYgKCEoZmluZE9wdGlvbnMgJiBGaW5kT3B0aW9uc1Nob3dGaW5kSW5kaWNhdG9yKSB8 fCAhdXBkYXRlRmluZEluZGljYXRvcihzZWxlY3RlZEZyYW1lKSkgeworICAgICAgICAgICAgLy8g RWl0aGVyIHdlIHNob3VsZG4ndCBzaG93IHRoZSBmaW5kIGluZGljYXRvciwgb3Igd2UgY291bGRu J3QgdXBkYXRlIGl0LgorICAgICAgICAgICAgcmVzZXRGaW5kSW5kaWNhdG9yKCk7CisgICAgICAg IH0KICAgICB9CiAKICAgICBpZiAoIXNob3VsZFNob3dPdmVybGF5KSB7CkBAIC0xMTEsNCArMTI0 LDU5IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmZpbmRQYWdlT3ZlcmxheURlc3Ryb3llZCgpCiAg ICAgbV9maW5kUGFnZU92ZXJsYXkgPSAwOwogfQogCitib29sIEZpbmRDb250cm9sbGVyOjp1cGRh dGVGaW5kSW5kaWNhdG9yKEZyYW1lKiBzZWxlY3RlZEZyYW1lKQoreworICAgIGlmICghc2VsZWN0 ZWRGcmFtZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgSW50UmVjdCBzZWxlY3Rpb25S ZWN0ID0gZW5jbG9zaW5nSW50UmVjdChzZWxlY3RlZEZyYW1lLT5zZWxlY3Rpb24oKS0+Ym91bmRz KCkpOworICAgIFZlY3RvcjxGbG9hdFJlY3Q+IHRleHRSZWN0czsKKyAgICBzZWxlY3RlZEZyYW1l LT5zZWxlY3Rpb24oKS0+Z2V0Q2xpcHBlZFZpc2libGVUZXh0UmVjdGFuZ2xlcyh0ZXh0UmVjdHMp OworCisgICAgLy8gQ3JlYXRlIGEgYmFja2luZyBzdG9yZSBhbmQgcGFpbnQgdGhlIGZpbmQgaW5k aWNhdG9yIHRleHQgaW50byBpdC4KKyAgICBSZWZQdHI8QmFja2luZ1N0b3JlPiBmaW5kSW5kaWNh dG9yVGV4dEJhY2tpbmdTdG9yZSA9IEJhY2tpbmdTdG9yZTo6Y3JlYXRlU2hhcmFibGUoc2VsZWN0 aW9uUmVjdC5zaXplKCkpOworICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQ+IGdyYXBoaWNzQ29u dGV4dCA9IGZpbmRJbmRpY2F0b3JUZXh0QmFja2luZ1N0b3JlLT5jcmVhdGVHcmFwaGljc0NvbnRl eHQoKTsKKworICAgIGdyYXBoaWNzQ29udGV4dC0+dHJhbnNsYXRlKC1zZWxlY3Rpb25SZWN0Lngo KSwgLXNlbGVjdGlvblJlY3QueSgpKTsKKyAgICBzZWxlY3RlZEZyYW1lLT52aWV3KCktPnNldFBh aW50QmVoYXZpb3IoUGFpbnRCZWhhdmlvclNlbGVjdGlvbk9ubHkgfCBQYWludEJlaGF2aW9yRm9y Y2VCbGFja1RleHQgfCBQYWludEJlaGF2aW9yRmxhdHRlbkNvbXBvc2l0aW5nTGF5ZXJzKTsKKyAg ICBzZWxlY3RlZEZyYW1lLT5kb2N1bWVudCgpLT51cGRhdGVMYXlvdXQoKTsKKyAgICAKKyAgICBn cmFwaGljc0NvbnRleHQtPmNsaXAoc2VsZWN0aW9uUmVjdCk7CisgICAgc2VsZWN0ZWRGcmFtZS0+ dmlldygpLT5wYWludChncmFwaGljc0NvbnRleHQuZ2V0KCksIHNlbGVjdGlvblJlY3QpOworICAg IHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihQYWludEJlaGF2aW9yTm9y bWFsKTsKKyAgICAKKyAgICBTaGFyZWRNZW1vcnk6OkhhbmRsZSBoYW5kbGU7CisgICAgaWYgKCFm aW5kSW5kaWNhdG9yVGV4dEJhY2tpbmdTdG9yZS0+Y3JlYXRlSGFuZGxlKGhhbmRsZSkpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKworICAgIC8vIFdlIHdhbnQgdGhlIHNlbGVjdGlvbiByZWN0IGlu IHdpbmRvdyBjb29yZGluYXRlcy4KKyAgICBJbnRSZWN0IHNlbGVjdGlvblJlY3RJbldpbmRvd0Nv b3JkaW5hdGVzID0gc2VsZWN0ZWRGcmFtZS0+dmlldygpLT5jb250ZW50c1RvV2luZG93KHNlbGVj dGlvblJlY3QpOworCisgICAgLy8gV2Ugd2FudCB0aGUgdGV4dCByZWN0cyBpbiBzZWxlY3Rpb24g cmVjdCBjb29yZGluYXRlcy4KKyAgICBWZWN0b3I8RmxvYXRSZWN0PiB0ZXh0UmVjdHNJblNlbGVj dGlvblJlY3RDb29yZGluYXRlczsKKyAgICAKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHRl eHRSZWN0cy5zaXplKCk7ICsraSkgeworICAgICAgICBJbnRSZWN0IHRleHRSZWN0SW5TZWxlY3Rp b25SZWN0Q29vcmRpbmF0ZXMgPSBzZWxlY3RlZEZyYW1lLT52aWV3KCktPmNvbnRlbnRzVG9XaW5k b3coZW5jbG9zaW5nSW50UmVjdCh0ZXh0UmVjdHNbaV0pKTsKKyAgICAgICAgdGV4dFJlY3RJblNl bGVjdGlvblJlY3RDb29yZGluYXRlcy5tb3ZlKC1zZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGlu YXRlcy54KCksIC1zZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcy55KCkpOworCisgICAg ICAgIHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzLmFwcGVuZCh0ZXh0UmVjdElu U2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzKTsKKyAgICB9ICAgICAgICAgICAgCisgICAgCisgICAg V2ViUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6OlNldEZpbmRJbmRpY2F0b3Ioc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMs IHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVzLCBoYW5kbGUpLCBtX3dlYlBhZ2Ut PnBhZ2VJRCgpKTsKKyAgICBtX2lzU2hvd2luZ0ZpbmRJbmRpY2F0b3IgPSB0cnVlOworCisgICAg cmV0dXJuIHRydWU7Cit9CisKK3ZvaWQgRmluZENvbnRyb2xsZXI6OnJlc2V0RmluZEluZGljYXRv cigpCit7CisgICAgaWYgKCFtX2lzU2hvd2luZ0ZpbmRJbmRpY2F0b3IpCisgICAgICAgIHJldHVy bjsKKworICAgIFNoYXJlZE1lbW9yeTo6SGFuZGxlIGhhbmRsZTsKKyAgICBXZWJQcm9jZXNzOjpz aGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0Rmlu ZEluZGljYXRvcihGbG9hdFJlY3QoKSwgVmVjdG9yPEZsb2F0UmVjdD4oKSwgaGFuZGxlKSwgbV93 ZWJQYWdlLT5wYWdlSUQoKSk7CisgICAgbV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9yID0gZmFsc2U7 Cit9CisKKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5oIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvRmluZENvbnRyb2xsZXIuaAppbmRleCAxNjc4ZmM2NDllZmYxNDE0MTc0ODQwMzRmODZjOTVl ZDQ3ZDE1NmUxLi42MjBhMGMyODExZWU1MTNhMzg0NmI2NmRmY2I3ZjA3MzBiZjcxZmE0IDEwMDY0 NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5oCisrKyBi L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmgKQEAgLTUxLDggKzUx LDE1IEBAIHB1YmxpYzoKICAgICB2b2lkIGZpbmRQYWdlT3ZlcmxheURlc3Ryb3llZCgpOwogCiBw cml2YXRlOgorICAgIGJvb2wgdXBkYXRlRmluZEluZGljYXRvcihXZWJDb3JlOjpGcmFtZSogc2Vs ZWN0ZWRGcmFtZSk7CisgICAgdm9pZCByZXNldEZpbmRJbmRpY2F0b3IoKTsKKyAgICAKICAgICBX ZWJQYWdlKiBtX3dlYlBhZ2U7CiAgICAgRmluZFBhZ2VPdmVybGF5KiBtX2ZpbmRQYWdlT3Zlcmxh eTsKKworICAgIC8vIFdoZXRoZXIgdGhlIFVJIHByb2Nlc3MgaXMgc2hvd2luZyB0aGUgZmluZCBp bmRpY2F0b3IuIE5vdGUgdGhhdCB0aGlzIGNhbiBiZSB0cnVlIGV2ZW4gaWYKKyAgICAvLyB0aGUg ZmluZCBpbmRpY2F0b3IgaXNuJ3Qgc2hvd2luZywgYnV0IGl0IHdpbGwgbmV2ZXIgYmUgZmFsc2Ug d2hlbiBpdCBpcyBzaG93aW5nLgorICAgIGJvb2wgbV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9yOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg== 70650 2010-10-13 13:07:58 -0700 2010-10-13 13:14:40 -0700 Patch bug-47612-20101013130756.patch text/plain 11352 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2JmOGFjNWFmYTk3MWE5OGIxYjdlNmZkNTQ4MjlmNTJjMmFkN2UxOS4uYzMxMzJiZWQ1MTQyY2Nj NGYxZWFmNjg1MTBlNjRiMDQwNmJjZTU5ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0xMC0xMyAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNlbmQgb3ZlciBmaW5kIGluZGljYXRvciBpbmZv cm1hdGlvbiB0byB0aGUgVUkgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDc2MTIKKworICAgICAgICBFeHBvcnQgc3ltYm9scyBuZWVkZWQg YnkgV2ViS2l0Mi4KKworICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorCiAyMDEwLTEwLTEzICBH YXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4g Yi9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4IDhiMTU5NjgyYmEzN2MyNmFiMTBkZWZjOThj ODAwMzNmMDYxOTBlMmUuLjI5ZjIyNGEwMmZhMjliODQzYjJmMGVlZWE5NjhjYWJhOGFmMWNjMjMg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgpAQCAtMzUxLDggKzM1MSw4IEBAIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0 MjFzZXRDb21wb3NpdGVPcGVyYXRpb25FTlNfMTdDb21wb3NpdGVPcGVyYXRvckUKIF9fWk43V2Vi Q29yZTE1R3JhcGhpY3NDb250ZXh0MjJiZWdpblRyYW5zcGFyZW5jeUxheWVyRWYKIF9fWk43V2Vi Q29yZTE1R3JhcGhpY3NDb250ZXh0NGNsaXBFUktOU185RmxvYXRSZWN0RQogX19aTjdXZWJDb3Jl MTVHcmFwaGljc0NvbnRleHQ0c2F2ZUV2Ci1fX1pON1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dDhm aWxsUmVjdEVSS05TXzlGbG9hdFJlY3RFUktOU181Q29sb3JFTlNfMTBDb2xvclNwYWNlRQogX19a TjdXZWJDb3JlMTVHcmFwaGljc0NvbnRleHQ3cmVzdG9yZUV2CitfX1pON1dlYkNvcmUxNUdyYXBo aWNzQ29udGV4dDhmaWxsUmVjdEVSS05TXzlGbG9hdFJlY3RFUktOU181Q29sb3JFTlNfMTBDb2xv clNwYWNlRQogX19aTjdXZWJDb3JlMTVHcmFwaGljc0NvbnRleHQ5dHJhbnNsYXRlRWZmCiBfX1pO N1dlYkNvcmUxNUdyYXBoaWNzQ29udGV4dEMxRVA5Q0dDb250ZXh0CiBfX1pON1dlYkNvcmUxNUdy YXBoaWNzQ29udGV4dEQxRXYKQEAgLTQwNyw2ICs0MDcsNyBAQCBfX1pON1dlYkNvcmUxNmNvbG9y RnJvbU5TQ29sb3JFUDdOU0NvbG9yCiBfX1pON1dlYkNvcmUxNmNyZWF0ZUZ1bGxNYXJrdXBFUEtO U180Tm9kZUUKIF9fWk43V2ViQ29yZTE2Y3JlYXRlRnVsbE1hcmt1cEVQS05TXzVSYW5nZUUKIF9f Wk43V2ViQ29yZTE2ZW5jbG9zaW5nSW50UmVjdEVSSzdfTlNSZWN0CitfX1pON1dlYkNvcmUxNmVu Y2xvc2luZ0ludFJlY3RFUktOU185RmxvYXRSZWN0RQogX19aTjdXZWJDb3JlMTZpc0VuZE9mUGFy YWdyYXBoRVJLTlNfMTVWaXNpYmxlUG9zaXRpb25FCiBfX1pON1dlYkNvcmUxNmpzU3RyaW5nU2xv d0Nhc2VFUE4zSlNDOUV4ZWNTdGF0ZUVSTlMwXzlXZWFrR0NNYXBJUE4zV1RGMTBTdHJpbmdJbXBs RVBOUzBfOEpTU3RyaW5nRUVFUzZfCiBfX1pON1dlYkNvcmUxN0NyZWRlbnRpYWxTdG9yYWdlM2dl dEVSS05TXzE1UHJvdGVjdGlvblNwYWNlRQpAQCAtNTQ5LDkgKzU1MCw5IEBAIF9fWk43V2ViQ29y ZTQ2Y29udGV4dE1lbnVJdGVtVGFnQ29ycmVjdFNwZWxsaW5nQXV0b21hdGljYWxseUV2CiBfX1pO N1dlYkNvcmU0Rm9udDExc2V0Q29kZVBhdGhFTlMwXzhDb2RlUGF0aEUKIF9fWk43V2ViQ29yZTRG b250MThzaG91bGRVc2VTbW9vdGhpbmdFdgogX19aTjdXZWJDb3JlNEZvbnQyMXNldFNob3VsZFVz ZVNtb290aGluZ0ViCi1fX1pON1dlYkNvcmU0Rm9udGFTRVJLUzBfCiBfX1pON1dlYkNvcmU0Rm9u dEMxRVJLTlNfMTZGb250UGxhdGZvcm1EYXRhRWJOU18xN0ZvbnRTbW9vdGhpbmdNb2RlRQogX19a TjdXZWJDb3JlNEZvbnRDMUV2CitfX1pON1dlYkNvcmU0Rm9udGFTRVJLUzBfCiBfX1pON1dlYkNv cmU0SWNvbjE4Y3JlYXRlSWNvbkZvckZpbGVzRVJLTjNXVEY2VmVjdG9ySU5TMV82U3RyaW5nRUxt MEVFRQogX19aTjdXZWJDb3JlNEljb25EMUV2CiBfX1pON1dlYkNvcmU0S1VSTDEwaW52YWxpZGF0 ZUV2CkBAIC02ODYsNiArNjg3LDcgQEAgX19aTjdXZWJDb3JlN0ludFNpemVDMUVSSzdfTlNTaXpl CiBfX1pON1dlYkNvcmU3Y29va2llc0VQS05TXzhEb2N1bWVudEVSS05TXzRLVVJMRQogX19aTjdX ZWJDb3JlN25zQ29sb3JFUktOU181Q29sb3JFCiBfX1pON1dlYkNvcmU4RG9jdW1lbnQxMWNyZWF0 ZVJhbmdlRXYKK19fWk43V2ViQ29yZThEb2N1bWVudDEydXBkYXRlTGF5b3V0RXYKIF9fWk43V2Vi Q29yZThEb2N1bWVudDEzc3ZnRXh0ZW5zaW9uc0V2CiBfX1pON1dlYkNvcmU4RG9jdW1lbnQxNHNl dEZvY3VzZWROb2RlRU4zV1RGMTBQYXNzUmVmUHRySU5TXzROb2RlRUVFCiBfX1pON1dlYkNvcmU4 RG9jdW1lbnQxNmlzUGFnZUJveFZpc2libGVFaQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9DaGFuZ2VM b2cgYi9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjNmRiN2JmN2QwODYxNWU2NTAxN2UxM2M3YWE0 OWRmM2JlMzY3MTYxLi5iOThmNjY1ZWFkMjc2ZTI3OTc2MmUyOWJlMzg0N2JjY2MyYmE1NDg4IDEw MDY0NAotLS0gYS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9XZWJLaXQyL0NoYW5nZUxvZwpAQCAt MSw1ICsxLDMzIEBACiAyMDEwLTEwLTEzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBs ZS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg U2VuZCBvdmVyIGZpbmQgaW5kaWNhdG9yIGluZm9ybWF0aW9uIHRvIHRoZSBVSSBwcm9jZXNzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzYxMgorCisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6c2V0RmluZEluZGljYXRvcik6CisgICAgICAgIEFkZCBzdHViLgorCisgICAg ICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgQWRkIFNl dEZpbmRJbmRpY2F0b3IuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRy b2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6RmluZENvbnRyb2xs ZXIpOgorICAgICAgICBJbml0aWFsaXplIG1faXNTaG93aW5nRmluZEluZGljYXRvci4KKworICAg ICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6ZmluZFN0cmluZyk6CisgICAgICAgIFVwZGF0 ZSB0aGUgZmluZCBpbmRpY2F0b3IgaWYgbmVlZGVkLgorCisgICAgICAgIChXZWJLaXQ6OkZpbmRD b250cm9sbGVyOjp1cGRhdGVGaW5kSW5kaWNhdG9yKToKKyAgICAgICAgQ29tcHV0ZSBmaW5kIGlu ZGljYXRvciBpbmZvcm1hdGlvbiwgcGFpbnQgdGhlIGZpbmQgaW5kaWNhdG9yIHRleHQgaW50byBh IAorICAgICAgICBiYWNraW5nIHN0b3JlIGFuZCBzZW5kIGl0IG92ZXIuCisKKyAgICAgICAgKFdl YktpdDo6RmluZENvbnRyb2xsZXI6OnJlc2V0RmluZEluZGljYXRvcik6CisgICAgICAgIFNlbmQg YSBTZXRGaW5kSW5kaWNhdG9yIG1lc3NhZ2Ugd2l0aCBhIG51bGwgYmFja2luZyBzdG9yZS4KKwor MjAxMC0xMC0xMyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAg ICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCiAKICAgICAgICAgQWRkIEJhY2tpbmdTdG9yZVF0 LmNwcCBmaWxlIHdpdGggc3R1YmJlZCBvdXQgQmFja2luZ1N0b3JlIG1lbWJlciBmdW5jdGlvbnMK ZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGY1ZTJmYTlhZDliY2FjYjllYjhiNGZh ZThlNjc4ZDQ0ZGQ5NDFlNDkuLjU4MTllMDk5NjIxODg3NDA4Njc2M2M5NjZiOTNiNDBlMmQwODQ1 YmEgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtOTU2LDYgKzk1NiwxMSBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ291bnRTdHJpbmdNYXRjaGVzKGNvbnN0IFN0cmluZyYgc3Ry aW5nLCB1aW50MzJfdCBudW1NYXRjaAogICAgIG1fZmluZENsaWVudC5kaWRDb3VudFN0cmluZ01h dGNoZXModGhpcywgc3RyaW5nLCBudW1NYXRjaGVzKTsKIH0KIAordm9pZCBXZWJQYWdlUHJveHk6 OnNldEZpbmRJbmRpY2F0b3IoY29uc3QgRmxvYXRSZWN0JiBzZWxlY3Rpb25SZWN0LCBjb25zdCBW ZWN0b3I8RmxvYXRSZWN0PiYgdGV4dFJlY3RzLCBjb25zdCBTaGFyZWRNZW1vcnk6OkhhbmRsZSYg Y29udGVudEltYWdlSGFuZGxlKQoreworICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCit9CisKIHZv aWQgV2ViUGFnZVByb3h5OjpyZWdpc3RlckVkaXRDb21tYW5kKFBhc3NSZWZQdHI8V2ViRWRpdENv bW1hbmRQcm94eT4gY29tbWFuZFByb3h5LCBVbmRvT3JSZWRvIHVuZG9PclJlZG8pCiB7CiAgICAg bV9wYWdlQ2xpZW50LT5yZWdpc3RlckVkaXRDb21tYW5kKGNvbW1hbmRQcm94eSwgdW5kb09yUmVk byk7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDUxZDg2NzFjNmE2NzI4ZDdiYzlmOWNm NjRkZmM2MzhmNDAxNTFkZTguLjVhNTM3OGYxZjNjMDE2YjM5YzMzOWNkZjQ4NjFhMDJlNGMxNGRi ZDkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVk ZSAiRHJhd2luZ0FyZWFQcm94eS5oIgogI2luY2x1ZGUgIkZpbmRPcHRpb25zLmgiCiAjaW5jbHVk ZSAiR2VuZXJpY0NhbGxiYWNrLmgiCisjaW5jbHVkZSAiU2hhcmVkTWVtb3J5LmgiCiAjaW5jbHVk ZSAiV0tCYXNlLmgiCiAjaW5jbHVkZSAiV2ViRXZlbnQuaCIKICNpbmNsdWRlICJXZWJGaW5kQ2xp ZW50LmgiCkBAIC0yODEsNiArMjgyLDcgQEAgcHJpdmF0ZToKIAogICAgIC8vIEZpbmQuCiAgICAg dm9pZCBkaWRDb3VudFN0cmluZ01hdGNoZXMoY29uc3QgU3RyaW5nJiwgdWludDMyX3QgbnVtTWF0 Y2hlcyk7CisgICAgdm9pZCBzZXRGaW5kSW5kaWNhdG9yKGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVj dCYgc2VsZWN0aW9uUmVjdCwgY29uc3QgVmVjdG9yPFdlYkNvcmU6OkZsb2F0UmVjdD4mIHRleHRS ZWN0cywgY29uc3QgU2hhcmVkTWVtb3J5OjpIYW5kbGUmIGNvbnRlbnRJbWFnZUhhbmRsZSk7CiAK ICAgICB2b2lkIHRha2VGb2N1cyhib29sIGRpcmVjdGlvbik7CiAgICAgdm9pZCBzZXRUb29sVGlw KGNvbnN0IFN0cmluZyYpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lm1lc3NhZ2VzLmluIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2Vz LmluCmluZGV4IGIwMTU2MGE2Y2MzY2I1ZjBmZjdjNmY3ZDJjNzU5NGNkNzlkYTNiNmIuLjAyOGZi OGEyMzVjODU4MTAyMzNmNTgxN2U0ZjA0MzI1ZDg0MDQxMDggMTAwNjQ0Ci0tLSBhL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KQEAgLTkzLDYgKzkzLDcgQEAgbWVzc2FnZXMgLT4g V2ViUGFnZVByb3h5IHsKIAogICAgICMgRmluZC4KICAgICBEaWRDb3VudFN0cmluZ01hdGNoZXMo V1RGOjpTdHJpbmcgc3RyaW5nLCB1aW50MzJfdCBudW1NYXRjaGVzKQorICAgIFNldEZpbmRJbmRp Y2F0b3IoV2ViQ29yZTo6RmxvYXRSZWN0IHNlbGVjdGlvblJlY3QsIFZlY3RvcjxXZWJDb3JlOjpG bG9hdFJlY3Q+IHRleHRSZWN0cywgV2ViS2l0OjpTaGFyZWRNZW1vcnk6OkhhbmRsZSBjb250ZW50 SW1hZ2VIYW5kbGUpCiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgIyBB Y2NlbGVyYXRlZCBjb21wc2l0aW5nIG1lc3NhZ2VzLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCmluZGV4IDJjMDI3MmMzMjBiNDNmYzUwMmM2ZTIzMTg5 OTkyMjE2Zjk0NGRmODkuLmYyMzAwMjMwYzJlMmNkYTg3MzIxNDJhY2QyOTdkMTA1MzUzNTNiM2Qg MTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNw cAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKQEAg LTI1LDkgKzI1LDE0IEBACiAKICNpbmNsdWRlICJGaW5kQ29udHJvbGxlci5oIgogCisjaW5jbHVk ZSAiQmFja2luZ1N0b3JlLmgiCiAjaW5jbHVkZSAiRmluZFBhZ2VPdmVybGF5LmgiCiAjaW5jbHVk ZSAiV2ViUGFnZS5oIgorI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3NhZ2VzLmgiCisjaW5jbHVk ZSAiV2ViUHJvY2Vzcy5oIgogI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWUuaD4KKyNpbmNsdWRlIDxX ZWJDb3JlL0ZyYW1lVmlldy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpA QCAtMzcsNiArNDIsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIEZpbmRDb250cm9sbGVyOjpGaW5k Q29udHJvbGxlcihXZWJQYWdlKiB3ZWJQYWdlKQogICAgIDogbV93ZWJQYWdlKHdlYlBhZ2UpCiAg ICAgLCBtX2ZpbmRQYWdlT3ZlcmxheSgwKQorICAgICwgbV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9y KGZhbHNlKQogewogfQogCkBAIC02OCw2ICs3NCw4IEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmZp bmRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEZpbmREaXJlY3Rpb24gZmluZERpcmVjdGlv CiAgICAgICAgIC8vIEFuZCBjbGVhciB0aGUgc2VsZWN0aW9uLgogICAgICAgICBpZiAoc2VsZWN0 ZWRGcmFtZSkKICAgICAgICAgICAgIHNlbGVjdGVkRnJhbWUtPnNlbGVjdGlvbigpLT5jbGVhcigp OworCisgICAgICAgIHJlc2V0RmluZEluZGljYXRvcigpOwogICAgIH0gZWxzZSB7CiAgICAgICAg IHNob3VsZFNob3dPdmVybGF5ID0gZmluZE9wdGlvbnMgJiBGaW5kT3B0aW9uc1Nob3dPdmVybGF5 OwogCkBAIC03OCw2ICs4NiwxMSBAQCB2b2lkIEZpbmRDb250cm9sbGVyOjpmaW5kU3RyaW5nKGNv bnN0IFN0cmluZyYgc3RyaW5nLCBGaW5kRGlyZWN0aW9uIGZpbmREaXJlY3RpbwogICAgICAgICAg ICAgaWYgKG51bU1hdGNoZXMgPiBtYXhOdW1NYXRjaGVzKQogICAgICAgICAgICAgICAgIHNob3Vs ZFNob3dPdmVybGF5ID0gZmFsc2U7CiAgICAgICAgIH0KKworICAgICAgICBpZiAoIShmaW5kT3B0 aW9ucyAmIEZpbmRPcHRpb25zU2hvd0ZpbmRJbmRpY2F0b3IpIHx8ICF1cGRhdGVGaW5kSW5kaWNh dG9yKHNlbGVjdGVkRnJhbWUpKSB7CisgICAgICAgICAgICAvLyBFaXRoZXIgd2Ugc2hvdWxkbid0 IHNob3cgdGhlIGZpbmQgaW5kaWNhdG9yLCBvciB3ZSBjb3VsZG4ndCB1cGRhdGUgaXQuCisgICAg ICAgICAgICByZXNldEZpbmRJbmRpY2F0b3IoKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGlm ICghc2hvdWxkU2hvd092ZXJsYXkpIHsKQEAgLTExMSw0ICsxMjQsNTkgQEAgdm9pZCBGaW5kQ29u dHJvbGxlcjo6ZmluZFBhZ2VPdmVybGF5RGVzdHJveWVkKCkKICAgICBtX2ZpbmRQYWdlT3Zlcmxh eSA9IDA7CiB9CiAKK2Jvb2wgRmluZENvbnRyb2xsZXI6OnVwZGF0ZUZpbmRJbmRpY2F0b3IoRnJh bWUqIHNlbGVjdGVkRnJhbWUpCit7CisgICAgaWYgKCFzZWxlY3RlZEZyYW1lKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBJbnRSZWN0IHNlbGVjdGlvblJlY3QgPSBlbmNsb3NpbmdJbnRS ZWN0KHNlbGVjdGVkRnJhbWUtPnNlbGVjdGlvbigpLT5ib3VuZHMoKSk7CisgICAgVmVjdG9yPEZs b2F0UmVjdD4gdGV4dFJlY3RzOworICAgIHNlbGVjdGVkRnJhbWUtPnNlbGVjdGlvbigpLT5nZXRD bGlwcGVkVmlzaWJsZVRleHRSZWN0YW5nbGVzKHRleHRSZWN0cyk7CisKKyAgICAvLyBDcmVhdGUg YSBiYWNraW5nIHN0b3JlIGFuZCBwYWludCB0aGUgZmluZCBpbmRpY2F0b3IgdGV4dCBpbnRvIGl0 LgorICAgIFJlZlB0cjxCYWNraW5nU3RvcmU+IGZpbmRJbmRpY2F0b3JUZXh0QmFja2luZ1N0b3Jl ID0gQmFja2luZ1N0b3JlOjpjcmVhdGVTaGFyYWJsZShzZWxlY3Rpb25SZWN0LnNpemUoKSk7Cisg ICAgT3duUHRyPEdyYXBoaWNzQ29udGV4dD4gZ3JhcGhpY3NDb250ZXh0ID0gZmluZEluZGljYXRv clRleHRCYWNraW5nU3RvcmUtPmNyZWF0ZUdyYXBoaWNzQ29udGV4dCgpOworCisgICAgZ3JhcGhp Y3NDb250ZXh0LT50cmFuc2xhdGUoLXNlbGVjdGlvblJlY3QueCgpLCAtc2VsZWN0aW9uUmVjdC55 KCkpOworICAgIHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+c2V0UGFpbnRCZWhhdmlvcihQYWludEJl aGF2aW9yU2VsZWN0aW9uT25seSB8IFBhaW50QmVoYXZpb3JGb3JjZUJsYWNrVGV4dCB8IFBhaW50 QmVoYXZpb3JGbGF0dGVuQ29tcG9zaXRpbmdMYXllcnMpOworICAgIHNlbGVjdGVkRnJhbWUtPmRv Y3VtZW50KCktPnVwZGF0ZUxheW91dCgpOworICAgIAorICAgIGdyYXBoaWNzQ29udGV4dC0+Y2xp cChzZWxlY3Rpb25SZWN0KTsKKyAgICBzZWxlY3RlZEZyYW1lLT52aWV3KCktPnBhaW50KGdyYXBo aWNzQ29udGV4dC5nZXQoKSwgc2VsZWN0aW9uUmVjdCk7CisgICAgc2VsZWN0ZWRGcmFtZS0+dmll dygpLT5zZXRQYWludEJlaGF2aW9yKFBhaW50QmVoYXZpb3JOb3JtYWwpOworICAgIAorICAgIFNo YXJlZE1lbW9yeTo6SGFuZGxlIGhhbmRsZTsKKyAgICBpZiAoIWZpbmRJbmRpY2F0b3JUZXh0QmFj a2luZ1N0b3JlLT5jcmVhdGVIYW5kbGUoaGFuZGxlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgLy8gV2Ugd2FudCB0aGUgc2VsZWN0aW9uIHJlY3QgaW4gd2luZG93IGNvb3JkaW5hdGVz LgorICAgIEludFJlY3Qgc2VsZWN0aW9uUmVjdEluV2luZG93Q29vcmRpbmF0ZXMgPSBzZWxlY3Rl ZEZyYW1lLT52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3coc2VsZWN0aW9uUmVjdCk7CisKKyAgICAv LyBXZSB3YW50IHRoZSB0ZXh0IHJlY3RzIGluIHNlbGVjdGlvbiByZWN0IGNvb3JkaW5hdGVzLgor ICAgIFZlY3RvcjxGbG9hdFJlY3Q+IHRleHRSZWN0c0luU2VsZWN0aW9uUmVjdENvb3JkaW5hdGVz OworICAgIAorICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdGV4dFJlY3RzLnNpemUoKTsgKytp KSB7CisgICAgICAgIEludFJlY3QgdGV4dFJlY3RJblNlbGVjdGlvblJlY3RDb29yZGluYXRlcyA9 IHNlbGVjdGVkRnJhbWUtPnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhlbmNsb3NpbmdJbnRSZWN0 KHRleHRSZWN0c1tpXSkpOworICAgICAgICB0ZXh0UmVjdEluU2VsZWN0aW9uUmVjdENvb3JkaW5h dGVzLm1vdmUoLXNlbGVjdGlvblJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLngoKSwgLXNlbGVjdGlv blJlY3RJbldpbmRvd0Nvb3JkaW5hdGVzLnkoKSk7CisKKyAgICAgICAgdGV4dFJlY3RzSW5TZWxl Y3Rpb25SZWN0Q29vcmRpbmF0ZXMuYXBwZW5kKHRleHRSZWN0SW5TZWxlY3Rpb25SZWN0Q29vcmRp bmF0ZXMpOworICAgIH0gICAgICAgICAgICAKKyAgICAKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQo KS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0RmluZEluZGlj YXRvcihzZWxlY3Rpb25SZWN0SW5XaW5kb3dDb29yZGluYXRlcywgdGV4dFJlY3RzSW5TZWxlY3Rp b25SZWN0Q29vcmRpbmF0ZXMsIGhhbmRsZSksIG1fd2ViUGFnZS0+cGFnZUlEKCkpOworICAgIG1f aXNTaG93aW5nRmluZEluZGljYXRvciA9IHRydWU7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwor dm9pZCBGaW5kQ29udHJvbGxlcjo6cmVzZXRGaW5kSW5kaWNhdG9yKCkKK3sKKyAgICBpZiAoIW1f aXNTaG93aW5nRmluZEluZGljYXRvcikKKyAgICAgICAgcmV0dXJuOworCisgICAgU2hhcmVkTWVt b3J5OjpIYW5kbGUgaGFuZGxlOworICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24o KS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTZXRGaW5kSW5kaWNhdG9yKEZsb2F0UmVj dCgpLCBWZWN0b3I8RmxvYXRSZWN0PigpLCBoYW5kbGUpLCBtX3dlYlBhZ2UtPnBhZ2VJRCgpKTsK KyAgICBtX2lzU2hvd2luZ0ZpbmRJbmRpY2F0b3IgPSBmYWxzZTsKK30KKworCiB9IC8vIG5hbWVz cGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRD b250cm9sbGVyLmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5o CmluZGV4IDE2NzhmYzY0OWVmZjE0MTQxNzQ4NDAzNGY4NmM5NWVkNDdkMTU2ZTEuLjYyMGEwYzI4 MTFlZTUxM2EzODQ2YjY2ZGZjYjdmMDczMGJmNzFmYTQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaApAQCAtNTEsOCArNTEsMTUgQEAgcHVibGljOgogICAg IHZvaWQgZmluZFBhZ2VPdmVybGF5RGVzdHJveWVkKCk7CiAKIHByaXZhdGU6CisgICAgYm9vbCB1 cGRhdGVGaW5kSW5kaWNhdG9yKFdlYkNvcmU6OkZyYW1lKiBzZWxlY3RlZEZyYW1lKTsKKyAgICB2 b2lkIHJlc2V0RmluZEluZGljYXRvcigpOworICAgIAogICAgIFdlYlBhZ2UqIG1fd2ViUGFnZTsK ICAgICBGaW5kUGFnZU92ZXJsYXkqIG1fZmluZFBhZ2VPdmVybGF5OworCisgICAgLy8gV2hldGhl ciB0aGUgVUkgcHJvY2VzcyBpcyBzaG93aW5nIHRoZSBmaW5kIGluZGljYXRvci4gTm90ZSB0aGF0 IHRoaXMgY2FuIGJlIHRydWUgZXZlbiBpZgorICAgIC8vIHRoZSBmaW5kIGluZGljYXRvciBpc24n dCBzaG93aW5nLCBidXQgaXQgd2lsbCBuZXZlciBiZSBmYWxzZSB3aGVuIGl0IGlzIHNob3dpbmcu CisgICAgYm9vbCBtX2lzU2hvd2luZ0ZpbmRJbmRpY2F0b3I7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQK