49266 2010-11-09 11:30:44 -0800 Move the find page overlay code to FindController 2010-11-09 12:04:26 -0800 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 306894 0 andersca 2010-11-09 11:30:44 -0800 Move the find page overlay code to FindController 306897 1 73394 andersca 2010-11-09 11:32:08 -0800 Created attachment 73394 Patch 306900 2 73394 sullivan 2010-11-09 11:39:40 -0800 Comment on attachment 73394 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=73394&action=review > WebKit2/WebProcess/WebPage/FindController.h:63 > + // FIXME: This should be private. It's not clear what "This" is here. It's also worth mentioning why it can't currently be private. 306909 3 andersca 2010-11-09 12:04:26 -0800 Committed r71665: <http://trac.webkit.org/changeset/71665> 73394 2010-11-09 11:32:08 -0800 2010-11-09 11:39:40 -0800 Patch bug-49266-20101109113207.patch text/plain 14232 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZGM0ZDVlODQ2OTFhMjBmZmU5MzBlMzViMGI5N2UyYjMwMzBhMTJkNS4uZTUxNzJmNDM2NWEyYzQ3 MjgxN2M5MTg2MTQyYmJmZTIwYjA4MGI3YiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAxMC0xMS0wOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmUgdGhlIGZpbmQgcGFnZSBvdmVybGF5IGNv ZGUgdG8gRmluZENvbnRyb2xsZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ5MjY2CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENv bnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6fkZpbmRDb250 cm9sbGVyKToKKyAgICAgICAgKFdlYktpdDo6RmluZENvbnRyb2xsZXI6OnJlY3RzRm9yVGV4dE1h dGNoZXMpOgorICAgICAgICAoV2ViS2l0OjpvdmVybGF5QmFja2dyb3VuZENvbG9yKToKKyAgICAg ICAgKFdlYktpdDo6RmluZENvbnRyb2xsZXI6OmRyYXdSZWN0KToKKyAgICAgICAgKFdlYktpdDo6 RmluZENvbnRyb2xsZXI6Om1vdXNlRXZlbnQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9GaW5kQ29udHJvbGxlci5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kUGFn ZU92ZXJsYXkuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kUGFnZU92ZXJsYXk6OmRyYXdSZWN0 KToKKyAgICAgICAgKFdlYktpdDo6RmluZFBhZ2VPdmVybGF5Ojptb3VzZUV2ZW50KToKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZFBhZ2VPdmVybGF5Lmg6CisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZU92 ZXJsYXk6OmJvdW5kcyk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VPdmVybGF5OjpkcmF3UmVjdCk6 CisgICAgICAgIChXZWJLaXQ6OlBhZ2VPdmVybGF5Ojptb3VzZUV2ZW50KToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuaDoKKworMjAxMC0xMS0wOSAgQW5kZXJzIENh cmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IEpvaG4g U3VsbGl2YW4uCiAKICAgICAgICAgQWRkIGEgUGFnZU92ZXJsYXk6OkNsaWVudCBvYmplY3QgaW4g cHJlcGFyYXRpb24gb2Ygbm90IGFsbG93aW5nIHN1YmNsYXNzaW5nIG9mIFBhZ2VPdmVybGF5CmRp ZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKaW5kZXggNzc1 YjhiOGM2NGYwMGEwZTE4OTk3YzE0ZDRlNGI3MmIwZmI1NTRmMy4uN2I3NDdkY2FiMTYzNzEwYTFi ODM5MWMzNjIwODQzNmZkOGRmYTQ0MSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L0ZpbmRDb250cm9sbGVyLmNwcApAQCAtNDgsNiArNDgsMTAgQEAgRmluZENvbnRyb2xsZXI6OkZp bmRDb250cm9sbGVyKFdlYlBhZ2UqIHdlYlBhZ2UpCiB7CiB9CiAKK0ZpbmRDb250cm9sbGVyOjp+ RmluZENvbnRyb2xsZXIoKQoreworfQorCiB2b2lkIEZpbmRDb250cm9sbGVyOjpjb3VudFN0cmlu Z01hdGNoZXMoY29uc3QgU3RyaW5nJiBzdHJpbmcsIGJvb2wgY2FzZUluc2Vuc2l0aXZlLCB1bnNp Z25lZCBtYXhNYXRjaENvdW50KQogewogICAgIHVuc2lnbmVkIG1hdGNoQ291bnQgPSBtX3dlYlBh Z2UtPmNvcmVQYWdlKCktPm1hcmtBbGxNYXRjaGVzRm9yVGV4dChzdHJpbmcsIGNhc2VJbnNlbnNp dGl2ZSA/IFRleHRDYXNlSW5zZW5zaXRpdmUgOiBUZXh0Q2FzZVNlbnNpdGl2ZSwgZmFsc2UsIG1h eE1hdGNoQ291bnQpOwpAQCAtMTk1LDUgKzE5OSw5MSBAQCB2b2lkIEZpbmRDb250cm9sbGVyOjpo aWRlRmluZEluZGljYXRvcigpCiAgICAgbV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9yID0gZmFsc2U7 CiB9CiAKK1ZlY3RvcjxJbnRSZWN0PiBGaW5kQ29udHJvbGxlcjo6cmVjdHNGb3JUZXh0TWF0Y2hl cygpCit7CisgICAgVmVjdG9yPEludFJlY3Q+IHJlY3RzOworCisgICAgZm9yIChGcmFtZSogZnJh bWUgPSBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPm1haW5GcmFtZSgpOyBmcmFtZTsgZnJhbWUgPSBm cmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQoKSkgeworICAgICAgICBEb2N1bWVudCogZG9jdW1l bnQgPSBmcmFtZS0+ZG9jdW1lbnQoKTsKKyAgICAgICAgaWYgKCFkb2N1bWVudCkKKyAgICAgICAg ICAgIGNvbnRpbnVlOworCisgICAgICAgIEludFJlY3QgdmlzaWJsZVJlY3QgPSBmcmFtZS0+dmll dygpLT52aXNpYmxlQ29udGVudFJlY3QoKTsKKyAgICAgICAgVmVjdG9yPEludFJlY3Q+IGZyYW1l UmVjdHMgPSBkb2N1bWVudC0+bWFya2VycygpLT5yZW5kZXJlZFJlY3RzRm9yTWFya2VycyhEb2N1 bWVudE1hcmtlcjo6VGV4dE1hdGNoKTsKKyAgICAgICAgSW50UG9pbnQgZnJhbWVPZmZzZXQoLWZy YW1lLT52aWV3KCktPnNjcm9sbE9mZnNldCgpLndpZHRoKCksIC1mcmFtZS0+dmlldygpLT5zY3Jv bGxPZmZzZXQoKS5oZWlnaHQoKSk7CisgICAgICAgIGZyYW1lT2Zmc2V0ID0gZnJhbWUtPnZpZXco KS0+Y29udmVydFRvQ29udGFpbmluZ1dpbmRvdyhmcmFtZU9mZnNldCk7CisKKyAgICAgICAgZm9y IChWZWN0b3I8SW50UmVjdD46Oml0ZXJhdG9yIGl0ID0gZnJhbWVSZWN0cy5iZWdpbigpLCBlbmQg PSBmcmFtZVJlY3RzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgICAgIGl0LT5p bnRlcnNlY3QodmlzaWJsZVJlY3QpOworICAgICAgICAgICAgaXQtPm1vdmUoZnJhbWVPZmZzZXQu eCgpLCBmcmFtZU9mZnNldC55KCkpOworICAgICAgICAgICAgcmVjdHMuYXBwZW5kKCppdCk7Cisg ICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gcmVjdHM7Cit9CisKK3N0YXRpYyBjb25zdCBm bG9hdCBzaGFkb3dPZmZzZXRYID0gMC4wOworc3RhdGljIGNvbnN0IGZsb2F0IHNoYWRvd09mZnNl dFkgPSAxLjA7CitzdGF0aWMgY29uc3QgZmxvYXQgc2hhZG93Qmx1clJhZGl1cyA9IDIuMDsKK3N0 YXRpYyBjb25zdCBmbG9hdCB3aGl0ZUZyYW1lVGhpY2tuZXNzID0gMS4wOworCitzdGF0aWMgY29u c3QgaW50IG92ZXJsYXlCYWNrZ3JvdW5kUmVkID0gMjU7CitzdGF0aWMgY29uc3QgaW50IG92ZXJs YXlCYWNrZ3JvdW5kR3JlZW4gPSAyNTsKK3N0YXRpYyBjb25zdCBpbnQgb3ZlcmxheUJhY2tncm91 bmRCbHVlID0gMjU7CitzdGF0aWMgY29uc3QgaW50IG92ZXJsYXlCYWNrZ3JvdW5kQWxwaGEgPSA2 MzsKKworc3RhdGljIENvbG9yIG92ZXJsYXlCYWNrZ3JvdW5kQ29sb3IoKQoreworICAgIHJldHVy biBDb2xvcihvdmVybGF5QmFja2dyb3VuZFJlZCwgb3ZlcmxheUJhY2tncm91bmRHcmVlbiwgb3Zl cmxheUJhY2tncm91bmRCbHVlLCBvdmVybGF5QmFja2dyb3VuZEFscGhhKTsKK30KKwordm9pZCBG aW5kQ29udHJvbGxlcjo6ZHJhd1JlY3QoUGFnZU92ZXJsYXkqLCBHcmFwaGljc0NvbnRleHQmIGdy YXBoaWNzQ29udGV4dCwgY29uc3QgSW50UmVjdCYgZGlydHlSZWN0KQoreworICAgIFZlY3RvcjxJ bnRSZWN0PiByZWN0cyA9IHJlY3RzRm9yVGV4dE1hdGNoZXMoKTsKKyAgICBBU1NFUlQoIXJlY3Rz LmlzRW1wdHkoKSk7CisKKyAgICBncmFwaGljc0NvbnRleHQuYmVnaW5UcmFuc3BhcmVuY3lMYXll cigxKTsKKyAgICBncmFwaGljc0NvbnRleHQuc2V0Q29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0 ZUNvcHkpOworCisgICAgLy8gRHJhdyB0aGUgYmFja2dyb3VuZC4KKyAgICBncmFwaGljc0NvbnRl eHQuZmlsbFJlY3QoZGlydHlSZWN0LCBvdmVybGF5QmFja2dyb3VuZENvbG9yKCksIENvbG9yU3Bh Y2VTUkdCKTsKKworICAgIGdyYXBoaWNzQ29udGV4dC5zYXZlKCk7CisgICAgZ3JhcGhpY3NDb250 ZXh0LnNldFNoYWRvdyhGbG9hdFNpemUoc2hhZG93T2Zmc2V0WCwgc2hhZG93T2Zmc2V0WSksIHNo YWRvd0JsdXJSYWRpdXMsIENvbG9yOjpibGFjaywgQ29sb3JTcGFjZVNSR0IpOworCisgICAgZ3Jh cGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihDb2xvcjo6d2hpdGUsIENvbG9yU3BhY2VTUkdCKTsK KworICAgIC8vIERyYXcgd2hpdGUgZnJhbWVzIGFyb3VuZCB0aGUgaG9sZXMuCisgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCByZWN0cy5zaXplKCk7ICsraSkgeworICAgICAgICBJbnRSZWN0IHdo aXRlRnJhbWVSZWN0ID0gcmVjdHNbaV07CisgICAgICAgIHdoaXRlRnJhbWVSZWN0LmluZmxhdGUo MSk7CisKKyAgICAgICAgZ3JhcGhpY3NDb250ZXh0LmZpbGxSZWN0KHdoaXRlRnJhbWVSZWN0KTsK KyAgICB9CisKKyAgICBncmFwaGljc0NvbnRleHQucmVzdG9yZSgpOworCisgICAgZ3JhcGhpY3ND b250ZXh0LnNhdmUoKTsKKyAgICBncmFwaGljc0NvbnRleHQuc2V0RmlsbENvbG9yKENvbG9yOjp0 cmFuc3BhcmVudCwgQ29sb3JTcGFjZVNSR0IpOworCisgICAgLy8gQ2xlYXIgb3V0IHRoZSBob2xl cy4KKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHJlY3RzLnNpemUoKTsgKytpKQorICAgICAg ICBncmFwaGljc0NvbnRleHQuZmlsbFJlY3QocmVjdHNbaV0pOworCisgICAgZ3JhcGhpY3NDb250 ZXh0LnJlc3RvcmUoKTsKKyAgICBncmFwaGljc0NvbnRleHQuZW5kVHJhbnNwYXJlbmN5TGF5ZXIo KTsKK30KKworYm9vbCBGaW5kQ29udHJvbGxlcjo6bW91c2VFdmVudChQYWdlT3ZlcmxheSogcGFn ZU92ZXJsYXksIGNvbnN0IFdlYk1vdXNlRXZlbnQmIG1vdXNlRXZlbnQpCit7CisgICAgLy8gSWYg d2UgZ2V0IGEgbW91c2UgZG93biBldmVudCBpbnNpZGUgdGhlIHBhZ2Ugb3ZlcmxheSB3ZSBzaG91 bGQgaGlkZSB0aGUgZmluZCBVSS4KKyAgICBpZiAobW91c2VFdmVudC50eXBlKCkgPT0gV2ViRXZl bnQ6Ok1vdXNlRG93bikgeworICAgICAgICAvLyBEaXNtaXNzIHRoZSBvdmVybGF5LgorICAgICAg ICBoaWRlRmluZFVJKCk7CisgICAgfQorCisgICAgcmV0dXJuIGZhbHNlOworfQogCiB9IC8vIG5h bWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Zp bmRDb250cm9sbGVyLmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxl ci5oCmluZGV4IDdhNTRkMzQ5ZDgwMTAzNTM5Yzg3YWZmNjgwYzk0MGE5MGYzOWYzZTkuLjE4MDYy MTE1MDE3MWUwYzYwZmUxNWQ3MzI5OTMxNTM3YTQ5OTBlOTYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaApAQCAtMjcsMTEgKzI3LDE0IEBACiAjZGVmaW5l IEZpbmRDb250cm9sbGVyX2gKIAogI2luY2x1ZGUgIkZpbmRPcHRpb25zLmgiCisjaW5jbHVkZSAi UGFnZU92ZXJsYXkuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogI2luY2x1ZGUgPHd0Zi9O b25jb3B5YWJsZS5oPgorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgewogICAgIGNsYXNzIEZyYW1lOworICAgIGNsYXNzIEludFJlY3Q7CiB9CiAKIG5hbWVzcGFj ZSBXZWJLaXQgewpAQCAtNDQsNiArNDcsNyBAQCBjbGFzcyBGaW5kQ29udHJvbGxlciB7CiAKIHB1 YmxpYzoKICAgICBleHBsaWNpdCBGaW5kQ29udHJvbGxlcihXZWJQYWdlKik7CisgICAgdmlydHVh bCB+RmluZENvbnRyb2xsZXIoKTsKIAogICAgIHZvaWQgZmluZFN0cmluZyhjb25zdCBTdHJpbmcm LCBGaW5kRGlyZWN0aW9uLCBGaW5kT3B0aW9ucywgdW5zaWduZWQgbWF4TWF0Y2hDb3VudCk7CiAg ICAgdm9pZCBoaWRlRmluZFVJKCk7CkBAIC01NSw3ICs1OSwxNiBAQCBwdWJsaWM6CiAKIHByaXZh dGU6CiAgICAgYm9vbCB1cGRhdGVGaW5kSW5kaWNhdG9yKFdlYkNvcmU6OkZyYW1lKiBzZWxlY3Rl ZEZyYW1lLCBib29sIGlzU2hvd2luZ092ZXJsYXkpOwotICAgIAorCisgICAgLy8gRklYTUU6IFRo aXMgc2hvdWxkIGJlIHByaXZhdGUuCitwdWJsaWM6CisgICAgVmVjdG9yPFdlYkNvcmU6OkludFJl Y3Q+IHJlY3RzRm9yVGV4dE1hdGNoZXMoKTsKKworICAgIC8vIFBhZ2VPdmVybGF5OjpDbGllbnQu CisgICAgdmlydHVhbCBib29sIG1vdXNlRXZlbnQoUGFnZU92ZXJsYXkqLCBjb25zdCBXZWJNb3Vz ZUV2ZW50Jik7CisgICAgdmlydHVhbCB2b2lkIGRyYXdSZWN0KFBhZ2VPdmVybGF5KiwgV2ViQ29y ZTo6R3JhcGhpY3NDb250ZXh0JiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgZGlydHlSZWN0KTsK KworcHJpdmF0ZToKICAgICBXZWJQYWdlKiBtX3dlYlBhZ2U7CiAgICAgRmluZFBhZ2VPdmVybGF5 KiBtX2ZpbmRQYWdlT3ZlcmxheTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRmluZFBhZ2VPdmVybGF5LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Zp bmRQYWdlT3ZlcmxheS5jcHAKaW5kZXggYjE4Yzk0MDI5MTBkZGNkOGY4MDk0ZDdjODRhZTQ5YmVm ZjIyNGNiOC4uM2U1NzQ3M2E4YTIxYjQ2NTViZWE5YTNlZjVmODA4OGE3ZjRmMjA5NCAxMDA2NDQK LS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZFBhZ2VPdmVybGF5LmNwcAorKysg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kUGFnZU92ZXJsYXkuY3BwCkBAIC0zNiwx NiArMzYsNiBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKLXN0YXRpYyBjb25zdCBmbG9hdCBzaGFkb3dPZmZzZXRYID0gMC4wOwotc3RhdGljIGNvbnN0 IGZsb2F0IHNoYWRvd09mZnNldFkgPSAxLjA7Ci1zdGF0aWMgY29uc3QgZmxvYXQgc2hhZG93Qmx1 clJhZGl1cyA9IDIuMDsKLXN0YXRpYyBjb25zdCBmbG9hdCB3aGl0ZUZyYW1lVGhpY2tuZXNzID0g MS4wOwotCi1zdGF0aWMgY29uc3QgaW50IG92ZXJsYXlCYWNrZ3JvdW5kUmVkID0gMjU7Ci1zdGF0 aWMgY29uc3QgaW50IG92ZXJsYXlCYWNrZ3JvdW5kR3JlZW4gPSAyNTsKLXN0YXRpYyBjb25zdCBp bnQgb3ZlcmxheUJhY2tncm91bmRCbHVlID0gMjU7Ci1zdGF0aWMgY29uc3QgaW50IG92ZXJsYXlC YWNrZ3JvdW5kQWxwaGEgPSA2MzsKLQogUGFzc093blB0cjxGaW5kUGFnZU92ZXJsYXk+IEZpbmRQ YWdlT3ZlcmxheTo6Y3JlYXRlKEZpbmRDb250cm9sbGVyKiBmaW5kQ29udHJvbGxlcikKIHsKICAg ICByZXR1cm4gYWRvcHRQdHIobmV3IEZpbmRQYWdlT3ZlcmxheShmaW5kQ29udHJvbGxlcikpOwpA QCAtNjIsMTAwICs1MiwxNCBAQCBGaW5kUGFnZU92ZXJsYXk6On5GaW5kUGFnZU92ZXJsYXkoKQog ICAgIG1fZmluZENvbnRyb2xsZXItPmZpbmRQYWdlT3ZlcmxheURlc3Ryb3llZCgpOwogfQogCi1W ZWN0b3I8SW50UmVjdD4gRmluZFBhZ2VPdmVybGF5OjpyZWN0c0ZvclRleHRNYXRjaGVzKCkKLXsK LSAgICBWZWN0b3I8SW50UmVjdD4gcmVjdHM7Ci0KLSAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IHdl YlBhZ2UoKS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCk7IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50 cmVlKCktPnRyYXZlcnNlTmV4dCgpKSB7Ci0gICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZy YW1lLT5kb2N1bWVudCgpOwotICAgICAgICBpZiAoIWRvY3VtZW50KQotICAgICAgICAgICAgY29u dGludWU7Ci0KLSAgICAgICAgSW50UmVjdCB2aXNpYmxlUmVjdCA9IGZyYW1lLT52aWV3KCktPnZp c2libGVDb250ZW50UmVjdCgpOwotICAgICAgICBWZWN0b3I8SW50UmVjdD4gZnJhbWVSZWN0cyA9 IGRvY3VtZW50LT5tYXJrZXJzKCktPnJlbmRlcmVkUmVjdHNGb3JNYXJrZXJzKERvY3VtZW50TWFy a2VyOjpUZXh0TWF0Y2gpOwotICAgICAgICBJbnRQb2ludCBmcmFtZU9mZnNldCgtZnJhbWUtPnZp ZXcoKS0+c2Nyb2xsT2Zmc2V0KCkud2lkdGgoKSwgLWZyYW1lLT52aWV3KCktPnNjcm9sbE9mZnNl dCgpLmhlaWdodCgpKTsKLSAgICAgICAgZnJhbWVPZmZzZXQgPSBmcmFtZS0+dmlldygpLT5jb252 ZXJ0VG9Db250YWluaW5nV2luZG93KGZyYW1lT2Zmc2V0KTsKLQotICAgICAgICBmb3IgKFZlY3Rv cjxJbnRSZWN0Pjo6aXRlcmF0b3IgaXQgPSBmcmFtZVJlY3RzLmJlZ2luKCksIGVuZCA9IGZyYW1l UmVjdHMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICAgICAgaXQtPmludGVyc2Vj dCh2aXNpYmxlUmVjdCk7Ci0gICAgICAgICAgICBpdC0+bW92ZShmcmFtZU9mZnNldC54KCksIGZy YW1lT2Zmc2V0LnkoKSk7Ci0gICAgICAgICAgICByZWN0cy5hcHBlbmQoKml0KTsKLSAgICAgICAg fQotICAgIH0KLQotICAgIHJldHVybiByZWN0czsKLX0KLQotSW50UmVjdCBGaW5kUGFnZU92ZXJs YXk6OmJvdW5kcygpIGNvbnN0Ci17Ci0gICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSB3ZWJQYWdl KCktPmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLT52aWV3KCk7Ci0KLSAgICBpbnQgd2lkdGggPSBm cmFtZVZpZXctPndpZHRoKCk7Ci0gICAgaWYgKGZyYW1lVmlldy0+dmVydGljYWxTY3JvbGxiYXIo KSkKLSAgICAgICAgd2lkdGggLT0gZnJhbWVWaWV3LT52ZXJ0aWNhbFNjcm9sbGJhcigpLT53aWR0 aCgpOwotICAgIGludCBoZWlnaHQgPSBmcmFtZVZpZXctPmhlaWdodCgpOwotICAgIGlmIChmcmFt ZVZpZXctPmhvcml6b250YWxTY3JvbGxiYXIoKSkKLSAgICAgICAgaGVpZ2h0IC09IGZyYW1lVmll dy0+aG9yaXpvbnRhbFNjcm9sbGJhcigpLT5oZWlnaHQoKTsKLSAgICAKLSAgICByZXR1cm4gSW50 UmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KTsKLX0KLQotc3RhdGljIENvbG9yIG92ZXJsYXlCYWNr Z3JvdW5kQ29sb3IoKQotewotICAgIHJldHVybiBDb2xvcihvdmVybGF5QmFja2dyb3VuZFJlZCwg b3ZlcmxheUJhY2tncm91bmRHcmVlbiwgb3ZlcmxheUJhY2tncm91bmRCbHVlLCBvdmVybGF5QmFj a2dyb3VuZEFscGhhKTsKLX0KLQotdm9pZCBGaW5kUGFnZU92ZXJsYXk6OmRyYXdSZWN0KFBhZ2VP dmVybGF5KiwgR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIGNvbnN0IEludFJlY3Qm IGRpcnR5UmVjdCkKK3ZvaWQgRmluZFBhZ2VPdmVybGF5OjpkcmF3UmVjdChQYWdlT3ZlcmxheSog cGFnZU92ZXJsYXksIEdyYXBoaWNzQ29udGV4dCYgZ3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRS ZWN0JiBkaXJ0eVJlY3QpCiB7Ci0gICAgVmVjdG9yPEludFJlY3Q+IHJlY3RzID0gcmVjdHNGb3JU ZXh0TWF0Y2hlcygpOwotICAgIEFTU0VSVCghcmVjdHMuaXNFbXB0eSgpKTsKLQotICAgIEludFJl Y3QgcGFpbnRSZWN0ID0gaW50ZXJzZWN0aW9uKGRpcnR5UmVjdCwgYm91bmRzKCkpOwotICAgIGlm IChwYWludFJlY3QuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBncmFwaGljc0Nv bnRleHQuYmVnaW5UcmFuc3BhcmVuY3lMYXllcigxKTsKLSAgICBncmFwaGljc0NvbnRleHQuc2V0 Q29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0ZUNvcHkpOwotCi0gICAgLy8gRHJhdyB0aGUgYmFj a2dyb3VuZC4KLSAgICBncmFwaGljc0NvbnRleHQuZmlsbFJlY3QocGFpbnRSZWN0LCBvdmVybGF5 QmFja2dyb3VuZENvbG9yKCksIENvbG9yU3BhY2VTUkdCKTsKLQotICAgIGdyYXBoaWNzQ29udGV4 dC5zYXZlKCk7Ci0gICAgZ3JhcGhpY3NDb250ZXh0LnNldFNoYWRvdyhGbG9hdFNpemUoc2hhZG93 T2Zmc2V0WCwgc2hhZG93T2Zmc2V0WSksIHNoYWRvd0JsdXJSYWRpdXMsIENvbG9yOjpibGFjaywg Q29sb3JTcGFjZVNSR0IpOwotCi0gICAgZ3JhcGhpY3NDb250ZXh0LnNldEZpbGxDb2xvcihDb2xv cjo6d2hpdGUsIENvbG9yU3BhY2VTUkdCKTsKLQotICAgIC8vIERyYXcgd2hpdGUgZnJhbWVzIGFy b3VuZCB0aGUgaG9sZXMuCi0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCByZWN0cy5zaXplKCk7 ICsraSkgewotICAgICAgICBJbnRSZWN0IHdoaXRlRnJhbWVSZWN0ID0gcmVjdHNbaV07Ci0gICAg ICAgIHdoaXRlRnJhbWVSZWN0LmluZmxhdGUoMSk7Ci0KLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0 LmZpbGxSZWN0KHdoaXRlRnJhbWVSZWN0KTsKLSAgICB9Ci0KLSAgICBncmFwaGljc0NvbnRleHQu cmVzdG9yZSgpOwotCi0gICAgZ3JhcGhpY3NDb250ZXh0LnNhdmUoKTsKLSAgICBncmFwaGljc0Nv bnRleHQuc2V0RmlsbENvbG9yKENvbG9yOjp0cmFuc3BhcmVudCwgQ29sb3JTcGFjZVNSR0IpOwot Ci0gICAgLy8gQ2xlYXIgb3V0IHRoZSBob2xlcy4KLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IHJlY3RzLnNpemUoKTsgKytpKQotICAgICAgICBncmFwaGljc0NvbnRleHQuZmlsbFJlY3QocmVj dHNbaV0pOwotCi0gICAgZ3JhcGhpY3NDb250ZXh0LnJlc3RvcmUoKTsKLSAgICBncmFwaGljc0Nv bnRleHQuZW5kVHJhbnNwYXJlbmN5TGF5ZXIoKTsKKyAgICBtX2ZpbmRDb250cm9sbGVyLT5kcmF3 UmVjdChwYWdlT3ZlcmxheSwgZ3JhcGhpY3NDb250ZXh0LCBkaXJ0eVJlY3QpOwogfQogCi1ib29s IEZpbmRQYWdlT3ZlcmxheTo6bW91c2VFdmVudChQYWdlT3ZlcmxheSosIGNvbnN0IFdlYk1vdXNl RXZlbnQmIGV2ZW50KQorYm9vbCBGaW5kUGFnZU92ZXJsYXk6Om1vdXNlRXZlbnQoUGFnZU92ZXJs YXkqIHBhZ2VPdmVybGF5LCBjb25zdCBXZWJNb3VzZUV2ZW50JiBldmVudCkKIHsKLSAgICAvLyBJ ZiB3ZSBnZXQgYSBtb3VzZSBkb3duIGV2ZW50IGluc2lkZSB0aGUgcGFnZSBvdmVybGF5IHdlIHNo b3VsZCBoaWRlIHRoZSBmaW5kIFVJLgotICAgIGlmIChldmVudC50eXBlKCkgPT0gV2ViRXZlbnQ6 Ok1vdXNlRG93biAmJiBib3VuZHMoKS5jb250YWlucyhldmVudC5wb3NpdGlvbigpKSkgewotICAg ICAgICAvLyBEaXNtaXNzIHRoZSBvdmVybGF5LgotICAgICAgICBtX2ZpbmRDb250cm9sbGVyLT5o aWRlRmluZFVJKCk7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0KLSAgICByZXR1cm4g ZmFsc2U7CisgICAgcmV0dXJuIG1fZmluZENvbnRyb2xsZXItPm1vdXNlRXZlbnQocGFnZU92ZXJs YXksIGV2ZW50KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kUGFnZU92ZXJsYXkuaCBiL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0ZpbmRQYWdlT3ZlcmxheS5oCmluZGV4IDM2Y2VlMzIxYzQ5NjE2ODVhMDlj NzQyYTZmYjYyN2JkOWJhMTNjMTkuLjdjNjRjY2IwMzJkZjBkODVmZDIwMTk5NjhkYmE4YzJiMjQ2 NzM2NmIgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRQYWdlT3Zl cmxheS5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRQYWdlT3ZlcmxheS5o CkBAIC00Miw5ICs0Miw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgRmluZFBh Z2VPdmVybGF5KEZpbmRDb250cm9sbGVyKik7CiAKLSAgICBWZWN0b3I8V2ViQ29yZTo6SW50UmVj dD4gcmVjdHNGb3JUZXh0TWF0Y2hlcygpOwotICAgIFdlYkNvcmU6OkludFJlY3QgYm91bmRzKCkg Y29uc3Q7Ci0KICAgICAvLyBQYWdlT3ZlcmxheTo6Q2xpZW50LgogICAgIHZpcnR1YWwgdm9pZCBk cmF3UmVjdChQYWdlT3ZlcmxheSosIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYsIGNvbnN0IFdl YkNvcmU6OkludFJlY3QmIGRpcnR5UmVjdCk7CiAgICAgdmlydHVhbCBib29sIG1vdXNlRXZlbnQo UGFnZU92ZXJsYXkqLCBjb25zdCBXZWJNb3VzZUV2ZW50Jik7CmRpZmYgLS1naXQgYS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9QYWdlT3ZlcmxheS5jcHAKaW5kZXggZDQ3Yjg0MTY0ZTk0MWM4YTRmZjBlZTlkODUy ZmY2NTFhNWZjN2JkMi4uNGFhZDhiMmMyMTNjOTQwYzg3MzEyMmZmZjAyMDczNDJmN2JmYjMzZiAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvUGFnZU92ZXJsYXkuY3BwCisr KyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmNwcApAQCAtMjYsNiAr MjYsOSBAQAogI2luY2x1ZGUgIlBhZ2VPdmVybGF5LmgiCiAKICNpbmNsdWRlICJXZWJQYWdlLmgi CisjaW5jbHVkZSA8V2ViQ29yZS9GcmFtZS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRnJhbWVWaWV3 Lmg+CisjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwogCkBAIC00Niw2ICs0OSwyMCBAQCBQYWdlT3ZlcmxheTo6flBhZ2VPdmVybGF5KCkKIHsKIH0K IAorSW50UmVjdCBQYWdlT3ZlcmxheTo6Ym91bmRzKCkgY29uc3QKK3sKKyAgICBGcmFtZVZpZXcq IGZyYW1lVmlldyA9IHdlYlBhZ2UoKS0+Y29yZVBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKTsK KworICAgIGludCB3aWR0aCA9IGZyYW1lVmlldy0+d2lkdGgoKTsKKyAgICBpZiAoZnJhbWVWaWV3 LT52ZXJ0aWNhbFNjcm9sbGJhcigpKQorICAgICAgICB3aWR0aCAtPSBmcmFtZVZpZXctPnZlcnRp Y2FsU2Nyb2xsYmFyKCktPndpZHRoKCk7CisgICAgaW50IGhlaWdodCA9IGZyYW1lVmlldy0+aGVp Z2h0KCk7CisgICAgaWYgKGZyYW1lVmlldy0+aG9yaXpvbnRhbFNjcm9sbGJhcigpKQorICAgICAg ICBoZWlnaHQgLT0gZnJhbWVWaWV3LT5ob3Jpem9udGFsU2Nyb2xsYmFyKCktPmhlaWdodCgpOwor ICAgIAorICAgIHJldHVybiBJbnRSZWN0KDAsIDAsIHdpZHRoLCBoZWlnaHQpOworfQorCiB2b2lk IFBhZ2VPdmVybGF5OjpzZXRQYWdlKFdlYlBhZ2UqIHdlYlBhZ2UpCiB7CiAgICAgQVNTRVJUKCFt X3dlYlBhZ2UpOwpAQCAtNjEsMTEgKzc4LDIwIEBAIHZvaWQgUGFnZU92ZXJsYXk6OnNldE5lZWRz RGlzcGxheSgpCiAKIHZvaWQgUGFnZU92ZXJsYXk6OmRyYXdSZWN0KEdyYXBoaWNzQ29udGV4dCYg Z3JhcGhpY3NDb250ZXh0LCBjb25zdCBJbnRSZWN0JiBkaXJ0eVJlY3QpCiB7Ci0gICAgbV9jbGll bnQtPmRyYXdSZWN0KHRoaXMsIGdyYXBoaWNzQ29udGV4dCwgZGlydHlSZWN0KTsKKyAgICAvLyBJ ZiB0aGUgZGlydHkgcmVjdCBpcyBvdXRzaWRlIHRoZSBib3VuZHMsIGlnbm9yZSBpdC4KKyAgICBJ bnRSZWN0IHBhaW50UmVjdCA9IGludGVyc2VjdGlvbihkaXJ0eVJlY3QsIGJvdW5kcygpKTsKKyAg ICBpZiAocGFpbnRSZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAgIG1f Y2xpZW50LT5kcmF3UmVjdCh0aGlzLCBncmFwaGljc0NvbnRleHQsIHBhaW50UmVjdCk7CiB9CiAg ICAgCiBib29sIFBhZ2VPdmVybGF5Ojptb3VzZUV2ZW50KGNvbnN0IFdlYk1vdXNlRXZlbnQmIG1v dXNlRXZlbnQpCiB7CisgICAgLy8gSWdub3JlIGV2ZW50cyBvdXRzaWRlIHRoZSBib3VuZHMuCisg ICAgaWYgKCFib3VuZHMoKS5jb250YWlucyhtb3VzZUV2ZW50LnBvc2l0aW9uKCkpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKICAgICByZXR1cm4gbV9jbGllbnQtPm1vdXNlRXZlbnQodGhpcywg bW91c2VFdmVudCk7CiB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1BhZ2VPdmVybGF5LmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9QYWdlT3ZlcmxheS5o CmluZGV4IDA1YzVmNGZiOTM0ZmIyNzQ3ZDY2OTgxZTVhOTg0NDZiZDU1N2EyODAuLmY2OGQ1MDhh YTdlNDdmODlmZWRkYWU1ZWYyMDI2OGI4ZDc2M2YyNmMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1BhZ2VPdmVybGF5LmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvUGFnZU92ZXJsYXkuaApAQCAtNTIsNyArNTIsNyBAQCBwdWJsaWM6CiAKICAgICBzdGF0 aWMgUGFzc1JlZlB0cjxQYWdlT3ZlcmxheT4gY3JlYXRlKENsaWVudCopOwogICAgIHZpcnR1YWwg flBhZ2VPdmVybGF5KCk7Ci0gICAgCisKICAgICB2b2lkIHNldFBhZ2UoV2ViUGFnZSopOwogICAg IHZvaWQgc2V0TmVlZHNEaXNwbGF5KCk7CiAKQEAgLTY1LDYgKzY1LDggQEAgcHJvdGVjdGVkOgog ICAgIFdlYlBhZ2UqIHdlYlBhZ2UoKSBjb25zdCB7IHJldHVybiBtX3dlYlBhZ2U7IH0KIAogcHJp dmF0ZToKKyAgICBXZWJDb3JlOjpJbnRSZWN0IGJvdW5kcygpIGNvbnN0OworCiAgICAgQ2xpZW50 KiBtX2NsaWVudDsKIAogICAgIFdlYlBhZ2UqIG1fd2ViUGFnZTsK